Report closest ancestor in overrides, not farthest, matching document…

…ation. (#187)
aws · Aug 17, 2018 · 62a2e9f · 62a2e9f
1 parent ecbe6ed
commit 62a2e9f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 33 deletions.
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -208,7 +208,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -1569,7 +1569,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -1662,7 +1662,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -2745,7 +2745,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -2838,5 +2838,5 @@
     }
   },
   "version": "0.6.4",
-  "fingerprint": "w6KwhZtZH4/dMIvQlPb9nAIbic1GnqUVTSxVuf7TKbU="
+  "fingerprint": "J/33pyDX7y9AI1Vizdu+HEO/87ED05WoSxg41CSYHtw="
 }
diff --git a/...es/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/...es/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii
@@ -208,7 +208,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -1569,7 +1569,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -1662,7 +1662,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -2745,7 +2745,7 @@
           },
           "name": "toString",
           "overrides": {
-            "fqn": "@scope/jsii-calc-lib.Value"
+            "fqn": "@scope/jsii-calc-lib.Operation"
           },
           "returns": {
             "primitive": "string"
@@ -2838,5 +2838,5 @@
     }
   },
   "version": "0.6.4",
-  "fingerprint": "w6KwhZtZH4/dMIvQlPb9nAIbic1GnqUVTSxVuf7TKbU="
+  "fingerprint": "J/33pyDX7y9AI1Vizdu+HEO/87ED05WoSxg41CSYHtw="
 }
diff --git a/packages/jsii-runtime/package-lock.json b/packages/jsii-runtime/package-lock.json
diff --git a/packages/jsii/lib/compiler.ts b/packages/jsii/lib/compiler.ts
@@ -1358,7 +1358,10 @@ function validateOverriddenSignatures(mod: spec.Assembly, externalTypes: Map<str
                     throw new Error(`${where}: parameter ${i + 1} type changed from ${orig} (in ${ancestorFqn}) to ${cur}`);
                 }
             }
-            if (currentFqn !== ancestorFqn) { currentMethod.overrides = { fqn: ancestorFqn }; }
+            // Register the closest ancestor that is being overridden
+            if (!currentMethod.overrides && currentFqn !== ancestorFqn) {
+                currentMethod.overrides = { fqn: ancestorFqn };
+            }
         }
 
         function validateProperty(currentProperty: spec.Property, ancestorProperty: spec.Property) {
@@ -1368,7 +1371,10 @@ function validateOverriddenSignatures(mod: spec.Assembly, externalTypes: Map<str
 
                 throw new Error(`${currentFqn}.${currentProperty.name}: type changed from ${orig} (in ${ancestorFqn}) to ${cur}`);
             }
-            if (currentFqn !== ancestorFqn) { currentProperty.overrides = { fqn: ancestorFqn }; }
+            // Register the closest ancestor that is being overridden
+            if (!currentProperty.overrides && currentFqn !== ancestorFqn) {
+                currentProperty.overrides = { fqn: ancestorFqn };
+            }
         }
     }