fix(jsii): support public autoproperties in private constructor (#256)

Includes a fix in the .NET generator to add support for private constructors.
aws · Oct 10, 2018 · 181012e · 181012e
1 parent 660ae79
commit 181012e
Show file tree

Hide file tree

Showing 13 changed files with 381 additions and 122 deletions.
diff --git a/packages/jsii-calc/lib/compliance.ts b/packages/jsii-calc/lib/compliance.ts
@@ -914,3 +914,11 @@ export class DoNotOverridePrivates {
         this.privateProperty = newValue;
     }
 }
+
+/**
+ * Class that implements interface properties automatically, but using a private constructor
+ */
+export class ClassWithPrivateConstructorAndAutomaticProperties implements IInterfaceWithProperties {
+    private constructor(public readonly readOnlyString: string, public readWriteString: string) {
+    }
+}
diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -1035,6 +1035,41 @@
         }
       ]
     },
+    "jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties": {
+      "assembly": "jsii-calc",
+      "docs": {
+        "comment": "Class that implements interface properties automatically, but using a private constructor"
+      },
+      "fqn": "jsii-calc.ClassWithPrivateConstructorAndAutomaticProperties",
+      "interfaces": [
+        {
+          "fqn": "jsii-calc.IInterfaceWithProperties"
+        }
+      ],
+      "kind": "class",
+      "name": "ClassWithPrivateConstructorAndAutomaticProperties",
+      "properties": [
+        {
+          "immutable": true,
+          "name": "readOnlyString",
+          "overrides": {
+            "fqn": "jsii-calc.IInterfaceWithProperties"
+          },
+          "type": {
+            "primitive": "string"
+          }
+        },
+        {
+          "name": "readWriteString",
+          "overrides": {
+            "fqn": "jsii-calc.IInterfaceWithProperties"
+          },
+          "type": {
+            "primitive": "string"
+          }
+        }
+      ]
+    },
     "jsii-calc.DefaultedConstructorArgument": {
       "assembly": "jsii-calc",
       "fqn": "jsii-calc.DefaultedConstructorArgument",
@@ -3297,5 +3332,5 @@
     }
   },
   "version": "0.7.6",
-  "fingerprint": "IrPnQp841TiCOiG/Z2z18s0K8pxTwuMglW1UJ2t1zsM="
+  "fingerprint": "eFasWxN7YC37iWdz+dDbEFTSQCzyangrqP5Nu02rzpw="
 }
diff --git a/...es/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/Class/ClassGeneratorTests.cs b/...es/jsii-dotnet-generator/src/Amazon.JSII.Generator.UnitTests/Class/ClassGeneratorTests.cs
@@ -57,6 +57,36 @@ protected MyClass(DeputyProps props): base(props)
             Assert.Equal(expected, actual, ignoreLineEndingDifferences: true);
         }
 
+        [Fact(DisplayName = Prefix + nameof(AllowsPrivateConstructor))]
+        public void AllowsPrivateConstructor()
+        {
+            ClassType classType = new ClassType
+            (
+                fullyQualifiedName: "myFqn",
+                assembly: "myPackage",
+                name: "myClass",
+                isAbstract: false
+            );
+
+            string actual = Render(classType);
+            string expected =
+                @"namespace MyNamespace
+{
+    [JsiiClass(typeof(MyClass), ""myFqn"", ""[]"")]
+    public class MyClass : DeputyBase
+    {
+        protected MyClass(ByRefValue reference): base(reference)
+        {
+        }
+
+        protected MyClass(DeputyProps props): base(props)
+        {
+        }
+    }
+}";
+            Assert.Equal(expected, actual, ignoreLineEndingDifferences: true);
+        }
+
         [Fact(DisplayName = Prefix + nameof(IncludesAbstractKeyword))]
         public void IncludesAbstractKeyword()
         {

diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/Class/ClassGenerator.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/Class/ClassGenerator.cs
@@ -1,9 +1,9 @@
-using Amazon.JSII.JsonModel.Spec;
+using System.Collections.Generic;
+using System.Linq;
+using Amazon.JSII.JsonModel.Spec;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using System.Collections.Generic;
-using System.Linq;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Amazon.JSII.Generator.Class
@@ -97,37 +97,41 @@ IEnumerable<MemberDeclarationSyntax> CreateConstructors()
         {
             SyntaxToken typeName = Symbols.GetNameSyntaxToken(Type);
 
-            yield return SF.ConstructorDeclaration
-            (
-                SF.List<AttributeListSyntax>(),
-                SF.TokenList(SF.Token(
-                    Type.IsAbstract || Type.Initializer.IsProtected ?
-                       SyntaxKind.ProtectedKeyword :
-                       SyntaxKind.PublicKeyword
-                )),
-                typeName,
-                Type.Initializer.GetParameterListSyntax(Namespaces, Symbols),
-                SF.ConstructorInitializer
+            if (Type.Initializer != null)
+            {
+                yield return SF.ConstructorDeclaration
                 (
-                    SyntaxKind.BaseConstructorInitializer,
-                    SF.ArgumentList(
-                        SF.SeparatedList(new[] {
-                            SF.Argument(
-                                SF.ObjectCreationExpression(
-                                    SF.Token(SyntaxKind.NewKeyword),
-                                    SF.ParseTypeName("DeputyProps"),
-                                    SF.ArgumentList(SF.SeparatedList(
-                                        new[] { GetBaseArgument() }
-                                    )),
-                                    null
+                    SF.List<AttributeListSyntax>(),
+                    SF.TokenList(SF.Token(
+                        Type.IsAbstract || Type.Initializer.IsProtected
+                            ? SyntaxKind.ProtectedKeyword
+                            : SyntaxKind.PublicKeyword
+                    )),
+                    typeName,
+                    Type.Initializer.GetParameterListSyntax(Namespaces, Symbols),
+                    SF.ConstructorInitializer
+                    (
+                        SyntaxKind.BaseConstructorInitializer,
+                        SF.ArgumentList(
+                            SF.SeparatedList(new[]
+                            {
+                                SF.Argument(
+                                    SF.ObjectCreationExpression(
+                                        SF.Token(SyntaxKind.NewKeyword),
+                                        SF.ParseTypeName("DeputyProps"),
+                                        SF.ArgumentList(SF.SeparatedList(
+                                            new[] {GetBaseArgument()}
+                                        )),
+                                        null
+                                    )
                                 )
-                            )
-                        })
-                    )
-                ),
-                SF.Block(),
-                null
-            );
+                            })
+                        )
+                    ),
+                    SF.Block(),
+                    null
+                );
+            }
 
             yield return SF.ConstructorDeclaration
             (

diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/MethodExtensions.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator/MethodExtensions.cs
@@ -1,10 +1,10 @@
-using Amazon.JSII.JsonModel.Spec;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Amazon.JSII.JsonModel.Spec;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using SF = Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Amazon.JSII.Generator
@@ -44,7 +44,7 @@ IEnumerable<ParameterSyntax> GetParameters()
         public static SyntaxToken GetParametersJsonSyntaxToken(this Method method)
         {
             // Strip docs before serializing.
-            Parameter[] parameters = (method.Parameters ?? Enumerable.Empty<Parameter>())
+            Parameter[] parameters = (method?.Parameters ?? Enumerable.Empty<Parameter>())
                 .Select(p => new Parameter(p.Name, p.Type))
                 .ToArray();