feat(jsii): support multiple class declaration sites (#348)

Classes can have members added to them in multiple declarations. Combine all sites into a single class model.
aws · Feb 1, 2019 · 4ecf28c · 4ecf28c
1 parent aafd405
commit 4ecf28c
Show file tree

Hide file tree

Showing 21 changed files with 1,415 additions and 9,649 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/codemaker/package-lock.json b/packages/codemaker/package-lock.json
diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
@@ -1234,6 +1234,18 @@ export class JsiiAgent {
     }
 };
 
+// To support module augmentation classes must support multiple declaration sites
+// (the tail of which must be interfaces)
+export class AugmentableClass {
+    public methodOne(): void {
+        console.log('methodOne');
+    }
+}
+
+export interface AugmentableClass {
+    methodTwo(): void;
+}
+
 // Ensure the JSII kernel tags instances with the "most appropriate" FQN type label, so that runtimes are able to
 // correctly choose the implementation proxy that should be used. Failure to do so could cause situations where userland
 // needs to up-cast an instance to an incompatible type, which certain runtimes (such as Java) will prevent.

diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -735,6 +735,23 @@
       ],
       "name": "AsyncVirtualMethods"
     },
+    "jsii-calc.AugmentableClass": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.AugmentableClass",
+      "initializer": {
+        "initializer": true
+      },
+      "kind": "class",
+      "methods": [
+        {
+          "name": "methodOne"
+        },
+        {
+          "name": "methodTwo"
+        }
+      ],
+      "name": "AugmentableClass"
+    },
     "jsii-calc.BinaryOperation": {
       "abstract": true,
       "assembly": "jsii-calc",
@@ -3825,5 +3842,5 @@
     }
   },
   "version": "0.7.13",
-  "fingerprint": "WNp0Sw1d2+3FaQD0Fn01K4wYQi7Ms3w+NQatOylD1kM="
+  "fingerprint": "aAWhjTLeZrF20RGP+ziDi3xp7D9syctn1izqVdgXi7E="
 }
diff --git a/packages/jsii-pacmak/package-lock.json b/packages/jsii-pacmak/package-lock.json
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
@@ -735,6 +735,23 @@
       ],
       "name": "AsyncVirtualMethods"
     },
+    "jsii-calc.AugmentableClass": {
+      "assembly": "jsii-calc",
+      "fqn": "jsii-calc.AugmentableClass",
+      "initializer": {
+        "initializer": true
+      },
+      "kind": "class",
+      "methods": [
+        {
+          "name": "methodOne"
+        },
+        {
+          "name": "methodTwo"
+        }
+      ],
+      "name": "AugmentableClass"
+    },
     "jsii-calc.BinaryOperation": {
       "abstract": true,
       "assembly": "jsii-calc",
@@ -3825,5 +3842,5 @@
     }
   },
   "version": "0.7.13",
-  "fingerprint": "WNp0Sw1d2+3FaQD0Fn01K4wYQi7Ms3w+NQatOylD1kM="
+  "fingerprint": "aAWhjTLeZrF20RGP+ziDi3xp7D9syctn1izqVdgXi7E="
 }
diff --git a/....JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AugmentableClass.cs b/....JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AugmentableClass.cs
@@ -0,0 +1,32 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace
+{
+    [JsiiClass(typeof(AugmentableClass), "jsii-calc.AugmentableClass", "[]")]
+    public class AugmentableClass : DeputyBase
+    {
+        public AugmentableClass(): base(new DeputyProps(new object[]{}))
+        {
+        }
+
+        protected AugmentableClass(ByRefValue reference): base(reference)
+        {
+        }
+
+        protected AugmentableClass(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod("methodOne", null, "[]")]
+        public virtual void MethodOne()
+        {
+            InvokeInstanceVoidMethod(new object[]{});
+        }
+
+        [JsiiMethod("methodTwo", null, "[]")]
+        public virtual void MethodTwo()
+        {
+            InvokeInstanceVoidMethod(new object[]{});
+        }
+    }
+}
diff --git a/.../expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/.../expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java
@@ -26,6 +26,7 @@ protected Class<?> resolveClass(final String fqn) throws ClassNotFoundException
             case "jsii-calc.AllTypesEnum": return software.amazon.jsii.tests.calculator.AllTypesEnum.class;
             case "jsii-calc.AllowedMethodNames": return software.amazon.jsii.tests.calculator.AllowedMethodNames.class;
             case "jsii-calc.AsyncVirtualMethods": return software.amazon.jsii.tests.calculator.AsyncVirtualMethods.class;
+            case "jsii-calc.AugmentableClass": return software.amazon.jsii.tests.calculator.AugmentableClass.class;
             case "jsii-calc.BinaryOperation": return software.amazon.jsii.tests.calculator.BinaryOperation.class;
             case "jsii-calc.Calculator": return software.amazon.jsii.tests.calculator.Calculator.class;
             case "jsii-calc.CalculatorProps": return software.amazon.jsii.tests.calculator.CalculatorProps.class;

diff --git a/....jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/AugmentableClass.java b/....jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/AugmentableClass.java
@@ -0,0 +1,21 @@
+package software.amazon.jsii.tests.calculator;
+
+@javax.annotation.Generated(value = "jsii-pacmak")
+@software.amazon.jsii.Jsii(module = software.amazon.jsii.tests.calculator.$Module.class, fqn = "jsii-calc.AugmentableClass")
+public class AugmentableClass extends software.amazon.jsii.JsiiObject {
+    protected AugmentableClass(final software.amazon.jsii.JsiiObject.InitializationMode mode) {
+        super(mode);
+    }
+    public AugmentableClass() {
+        super(software.amazon.jsii.JsiiObject.InitializationMode.Jsii);
+        software.amazon.jsii.JsiiEngine.getInstance().createNewObject(this);
+    }
+
+    public void methodOne() {
+        this.jsiiCall("methodOne", Void.class);
+    }
+
+    public void methodTwo() {
+        this.jsiiCall("methodTwo", Void.class);
+    }
+}
diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst b/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst
@@ -673,6 +673,42 @@ AsyncVirtualMethods
       :rtype: number
 
 
+AugmentableClass
+^^^^^^^^^^^^^^^^
+
+.. py:class:: AugmentableClass()
+
+   **Language-specific names:**
+
+   .. tabs::
+
+      .. code-tab:: c#
+
+         using Amazon.JSII.Tests.CalculatorNamespace;
+
+      .. code-tab:: java
+
+         import software.amazon.jsii.tests.calculator.AugmentableClass;
+
+      .. code-tab:: javascript
+
+         const { AugmentableClass } = require('jsii-calc');
+
+      .. code-tab:: typescript
+
+         import { AugmentableClass } from 'jsii-calc';
+
+
+
+
+   .. py:method:: methodOne()
+
+
+
+   .. py:method:: methodTwo()
+
+
+
 BinaryOperation
 ^^^^^^^^^^^^^^^