feat(jsii): Erase un-exported base interfaces

The previous version of interface erasure simply replaced un-exported interfaces with whatever their exported bases were (if any), but did not merge declarations of un-exported types into the exported ones. This merges declarations from the erased interfaces into the exported interface, and ignores any re-declaration that is hidden by an existing declaration in the exported type, or another erased interface. Fixes #417
aws · Apr 3, 2019 · dc341ed · dc341ed
1 parent 84b2793
commit dc341ed
Show file tree

Hide file tree

Showing 34 changed files with 888 additions and 216 deletions.
diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
@@ -1464,8 +1464,8 @@ export class InternalClass {
 /**
  * @internal
  */
-export interface IInternalInterface {
-    prop: string;
+export interface InternalInterface {
+    readonly prop: string;
 }
 
 /**
@@ -1516,19 +1516,19 @@ interface IPrivateInterface {
     private: string;
 }
 
-export interface ExtendsInternalInterface extends IInternalInterface {
+export interface ExtendsInternalInterface extends InternalInterface {
     readonly boom: boolean
 }
 
-export class ImplementInternalInterface implements IInternalInterface {
+export class ImplementInternalInterface implements InternalInterface {
     prop = 'implement me'
 }
 
 export class ImplementsPrivateInterface implements IPrivateInterface {
     public private = 'i came from private into the light'
 }
 
-export interface ExtendsPrivateInterface extends IPrivateInterface {
+export interface IExtendsPrivateInterface extends IPrivateInterface {
     readonly moreThings: string[];
 }
 

diff --git a/packages/jsii-calc/lib/erasures.ts b/packages/jsii-calc/lib/erasures.ts
@@ -23,3 +23,17 @@ export class JSII417Derived extends JSII417PrivateBase {
   }
   public baz() { return; }
 }
+// Same thing with interfaces
+interface IJSII417PrivateRoot {
+  readonly hasRoot: boolean;
+}
+export interface IJSII417PublicBaseOfBase extends IJSII417PrivateRoot {
+  foo(): void;
+}
+interface IJSII417PrivateBase extends IJSII417PublicBaseOfBase {
+  readonly property: string;
+  bar(): void;
+}
+export interface IJSII417Derived extends IJSII417PrivateBase {
+  baz(): void;
+}
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
@@ -30,7 +30,8 @@
   "scripts": {
     "build": "jsii",
     "watch": "jsii -w",
-    "test": "node test/test.calc.js && diff-test test/assembly.jsii .jsii"
+    "test": "node test/test.calc.js && diff-test test/assembly.jsii .jsii",
+    "test:update": "npm run build && UPDATE_DIFF=1 npm run test"
   },
   "bundledDependencies": [
     "jsii-calc-bundled"

diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -1133,6 +1133,9 @@
         },
         {
           "name": "b",
+          "overrides": {
+            "fqn": "jsii-calc.INonInternalInterface"
+          },
           "type": {
             "primitive": "string"
           }
@@ -1179,6 +1182,9 @@
         },
         {
           "name": "b",
+          "overrides": {
+            "fqn": "jsii-calc.INonInternalInterface"
+          },
           "type": {
             "primitive": "string"
           }
@@ -1846,27 +1852,13 @@
           "type": {
             "primitive": "boolean"
           }
-        }
-      ]
-    },
-    "jsii-calc.ExtendsPrivateInterface": {
-      "assembly": "jsii-calc",
-      "datatype": true,
-      "fqn": "jsii-calc.ExtendsPrivateInterface",
-      "kind": "interface",
-      "name": "ExtendsPrivateInterface",
-      "properties": [
+        },
         {
           "abstract": true,
           "immutable": true,
-          "name": "moreThings",
+          "name": "prop",
           "type": {
-            "collection": {
-              "elementtype": {
-                "primitive": "string"
-              },
-              "kind": "array"
-            }
+            "primitive": "string"
           }
         }
       ]
@@ -1982,6 +1974,34 @@
         }
       ]
     },
+    "jsii-calc.IExtendsPrivateInterface": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.IExtendsPrivateInterface",
+      "kind": "interface",
+      "name": "IExtendsPrivateInterface",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "name": "moreThings",
+          "type": {
+            "collection": {
+              "elementtype": {
+                "primitive": "string"
+              },
+              "kind": "array"
+            }
+          }
+        },
+        {
+          "abstract": true,
+          "name": "private",
+          "type": {
+            "primitive": "string"
+          }
+        }
+      ]
+    },
     "jsii-calc.IFriendlier": {
       "assembly": "jsii-calc",
       "docs": {
@@ -2183,6 +2203,59 @@
         }
       ]
     },
+    "jsii-calc.IJSII417Derived": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.IJSII417Derived",
+      "interfaces": [
+        {
+          "fqn": "jsii-calc.IJSII417PublicBaseOfBase"
+        }
+      ],
+      "kind": "interface",
+      "methods": [
+        {
+          "abstract": true,
+          "name": "bar"
+        },
+        {
+          "abstract": true,
+          "name": "baz"
+        }
+      ],
+      "name": "IJSII417Derived",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "name": "property",
+          "type": {
+            "primitive": "string"
+          }
+        }
+      ]
+    },
+    "jsii-calc.IJSII417PublicBaseOfBase": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.IJSII417PublicBaseOfBase",
+      "kind": "interface",
+      "methods": [
+        {
+          "abstract": true,
+          "name": "foo"
+        }
+      ],
+      "name": "IJSII417PublicBaseOfBase",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "name": "hasRoot",
+          "type": {
+            "primitive": "boolean"
+          }
+        }
+      ]
+    },
     "jsii-calc.IMutableObjectLiteral": {
       "assembly": "jsii-calc",
       "fqn": "jsii-calc.IMutableObjectLiteral",
@@ -2209,6 +2282,13 @@
       "kind": "interface",
       "name": "INonInternalInterface",
       "properties": [
+        {
+          "abstract": true,
+          "name": "b",
+          "type": {
+            "primitive": "string"
+          }
+        },
         {
           "abstract": true,
           "name": "c",
@@ -4701,5 +4781,5 @@
     }
   },
   "version": "0.8.2",
-  "fingerprint": "upM77jvLtKXqaAYygq6yoGd2vc9Ae/Y7x70F/EiuKEY="
+  "fingerprint": "QykU9QyYdfH4KIwH5zf5Mf5E9iCrsAsxO5bVj4bpBrM="
 }
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
@@ -1133,6 +1133,9 @@
         },
         {
           "name": "b",
+          "overrides": {
+            "fqn": "jsii-calc.INonInternalInterface"
+          },
           "type": {
             "primitive": "string"
           }
@@ -1179,6 +1182,9 @@
         },
         {
           "name": "b",
+          "overrides": {
+            "fqn": "jsii-calc.INonInternalInterface"
+          },
           "type": {
             "primitive": "string"
           }
@@ -1846,27 +1852,13 @@
           "type": {
             "primitive": "boolean"
           }
-        }
-      ]
-    },
-    "jsii-calc.ExtendsPrivateInterface": {
-      "assembly": "jsii-calc",
-      "datatype": true,
-      "fqn": "jsii-calc.ExtendsPrivateInterface",
-      "kind": "interface",
-      "name": "ExtendsPrivateInterface",
-      "properties": [
+        },
         {
           "abstract": true,
           "immutable": true,
-          "name": "moreThings",
+          "name": "prop",
           "type": {
-            "collection": {
-              "elementtype": {
-                "primitive": "string"
-              },
-              "kind": "array"
-            }
+            "primitive": "string"
           }
         }
       ]
@@ -1982,6 +1974,34 @@
         }
       ]
     },
+    "jsii-calc.IExtendsPrivateInterface": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.IExtendsPrivateInterface",
+      "kind": "interface",
+      "name": "IExtendsPrivateInterface",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "name": "moreThings",
+          "type": {
+            "collection": {
+              "elementtype": {
+                "primitive": "string"
+              },
+              "kind": "array"
+            }
+          }
+        },
+        {
+          "abstract": true,
+          "name": "private",
+          "type": {
+            "primitive": "string"
+          }
+        }
+      ]
+    },
     "jsii-calc.IFriendlier": {
       "assembly": "jsii-calc",
       "docs": {
@@ -2183,6 +2203,59 @@
         }
       ]
     },
+    "jsii-calc.IJSII417Derived": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.IJSII417Derived",
+      "interfaces": [
+        {
+          "fqn": "jsii-calc.IJSII417PublicBaseOfBase"
+        }
+      ],
+      "kind": "interface",
+      "methods": [
+        {
+          "abstract": true,
+          "name": "bar"
+        },
+        {
+          "abstract": true,
+          "name": "baz"
+        }
+      ],
+      "name": "IJSII417Derived",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "name": "property",
+          "type": {
+            "primitive": "string"
+          }
+        }
+      ]
+    },
+    "jsii-calc.IJSII417PublicBaseOfBase": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.IJSII417PublicBaseOfBase",
+      "kind": "interface",
+      "methods": [
+        {
+          "abstract": true,
+          "name": "foo"
+        }
+      ],
+      "name": "IJSII417PublicBaseOfBase",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "name": "hasRoot",
+          "type": {
+            "primitive": "boolean"
+          }
+        }
+      ]
+    },
     "jsii-calc.IMutableObjectLiteral": {
       "assembly": "jsii-calc",
       "fqn": "jsii-calc.IMutableObjectLiteral",
@@ -2209,6 +2282,13 @@
       "kind": "interface",
       "name": "INonInternalInterface",
       "properties": [
+        {
+          "abstract": true,
+          "name": "b",
+          "type": {
+            "primitive": "string"
+          }
+        },
         {
           "abstract": true,
           "name": "c",
@@ -4701,5 +4781,5 @@
     }
   },
   "version": "0.8.2",
-  "fingerprint": "upM77jvLtKXqaAYygq6yoGd2vc9Ae/Y7x70F/EiuKEY="
+  "fingerprint": "QykU9QyYdfH4KIwH5zf5Mf5E9iCrsAsxO5bVj4bpBrM="
 }