Order optional parameters to constructor as last (#396)

Author: Paweł Płazieński

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/ext/RequiredPropertyConstructorExtension.java

@@ -92,6 +92,7 @@ private TsBeanModel transformBean(TsBeanModel bean, TsModel model,
     private static Optional<TsConstructorModel> createConstructor(TsBeanModel bean, TsModel model,
                                                                   Map<String, TsConstructorModel> generatedConstructors) {
         List<TsParameterModel> parameters = new ArrayList<>();
+        List<TsParameterModel> optionalParameters = new ArrayList<>();
         List<TsStatement> body = new ArrayList<>();
         TsType parent = bean.getParent();
         if (parent != null) {
@@ -107,7 +108,9 @@ private static Optional<TsConstructorModel> createConstructor(TsBeanModel bean,
             TsIdentifierReference[] callParameters = new TsIdentifierReference[parentParameters.size()];
             int i = 0;
             for (TsParameterModel parentParameter : parentParameters) {
-                parameters.add(parentParameter);
+                List<TsParameterModel> targetParameterList =
+                        parentParameter.tsType instanceof TsType.OptionalType ? optionalParameters : parameters;
+                targetParameterList.add(parentParameter);
                 callParameters[i] = new TsIdentifierReference(parentParameter.name);
                 i++;
             }
@@ -122,14 +125,18 @@ private static Optional<TsConstructorModel> createConstructor(TsBeanModel bean,
             if (predefinedValue.isPresent()) {
                 assignmentExpression = predefinedValue.get();
             } else {
-                parameters.add(new TsParameterModel(property.name, property.tsType));
+                TsParameterModel parameter = new TsParameterModel(property.name, property.tsType);
+                List<TsParameterModel> targetParameterList =
+                        property.tsType instanceof TsType.OptionalType ? optionalParameters : parameters;
+                targetParameterList.add(parameter);
                 assignmentExpression = new TsIdentifierReference(property.name);
             }
             TsMemberExpression leftHandSideExpression = new TsMemberExpression(new TsThisExpression(), property.name);
             TsExpression assignment = new TsAssignmentExpression(leftHandSideExpression, assignmentExpression);
             TsExpressionStatement assignmentStatement = new TsExpressionStatement(assignment);
             body.add(assignmentStatement);
         }
+        parameters.addAll(optionalParameters);
         if(parameters.isEmpty() && body.isEmpty()) {
             return Optional.empty();
         }

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/ext/RequiredPropertyConstructorExtensionTest.java

@@ -11,9 +11,10 @@
 import cz.habarta.typescript.generator.TypeScriptOutputKind;
 import cz.habarta.typescript.generator.util.Utils;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-
+import javax.annotation.Nullable;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -62,6 +63,16 @@ static class SecondClass extends SimpleClass {
         public int field3;
     }
 
+    static class SimpleOptionalClass {
+        public String field1;
+        @Nullable
+        public Integer field2;
+    }
+
+    static class SecondOptionalClass extends SimpleOptionalClass {
+        public String field3;
+    }
+
     @Test
     public void testBasicWithReadOnly() {
         Settings settings = createBaseSettings(new RequiredPropertyConstructorExtension());
@@ -123,6 +134,19 @@ public void testInheritance() {
         Assert.assertEquals(expected, result);
     }
 
+    @Test
+    public void testOptionalParameters() {
+        Settings settings = createBaseSettings();
+        settings.declarePropertiesAsReadOnly = true;
+        settings.optionalAnnotations = new ArrayList<>();
+        settings.optionalAnnotations.add(Nullable.class);
+
+        String result = generateTypeScript(settings, SecondOptionalClass.class);
+
+        String expected = readResource("optionalParameters.ts");
+        Assert.assertEquals(expected, result);
+    }
+
     private static String generateTypeScript(Settings settings, Type... types) {
         TypeScriptGenerator typeScriptGenerator = new TypeScriptGenerator(settings);
         String result = typeScriptGenerator.generateTypeScript(Input.from(types));

typescript-generator-core/src/test/resources/ext/RequiredPropertyConstructorExtensionTest-optionalParameters.ts

@@ -0,0 +1,20 @@
+/* tslint:disable */
+
+export class SimpleOptionalClass {
+    readonly field1: string;
+    readonly field2?: number;
+
+    constructor(field1: string, field2?: number) {
+        this.field1 = field1;
+        this.field2 = field2;
+    }
+}
+
+export class SecondOptionalClass extends SimpleOptionalClass {
+    readonly field3: string;
+
+    constructor(field1: string, field3: string, field2?: number) {
+        super(field1, field2);
+        this.field3 = field3;
+    }
+}