[typescript-node] Set model default values (#10262)

* fix: add default value, if present, for model properties (closes #10261)

* update samples

* fix: set default to null to allow #defaultValue to work in templates

* fix: escape the string default value, leverage super rather than copy-pasta

* update samples again

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -546,7 +546,7 @@ public String toDefaultValue(Schema p) {
             return UNDEFINED_VALUE;
         } else if (ModelUtils.isStringSchema(p)) {
             if (p.getDefault() != null) {
-                return "'" + (String) p.getDefault() + "'";
+                return "'" + escapeText((String) p.getDefault()) + "'";
             }
             return UNDEFINED_VALUE;
         } else {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java

@@ -309,7 +309,7 @@ private String getApiFilenameFromClassname(String classname) {
         return toApiFilename(name);
     }
 
-@Override
+    @Override
     protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Schema schema) {
         super.addAdditionPropertiesToCodeGenModel(codegenModel, schema);
         Schema additionalProperties = getAdditionalProperties(schema);
@@ -319,4 +319,13 @@ protected void addAdditionPropertiesToCodeGenModel(CodegenModel codegenModel, Sc
         }
         addImport(codegenModel, codegenModel.additionalPropertiesType);
     }
+
+    @Override
+    public String toDefaultValue(Schema p) {
+        String def = super.toDefaultValue(p);
+        if ("undefined".equals(def)) {
+            return null;
+        }
+        return def;
+    }
 }

modules/openapi-generator/src/main/resources/typescript-node/model.mustache

@@ -19,7 +19,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
     * {{{.}}}
     */
 {{/description}}
-    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}};
+    '{{name}}'{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{#isNullable}} | null{{/isNullable}}{{/isEnum}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
 {{/vars}}
 
     {{#discriminator}}

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypeScriptNodeModelTest.java

@@ -68,15 +68,15 @@ public void simpleModelTest() {
         Assert.assertEquals(property1.baseName, "id");
         Assert.assertEquals(property1.dataType, "number");
         Assert.assertEquals(property1.name, "id");
-        Assert.assertEquals(property1.defaultValue, "undefined");
+        Assert.assertEquals(property1.defaultValue, null);
         Assert.assertEquals(property1.baseType, "number");
         Assert.assertTrue(property1.required);
 
         final CodegenProperty property2 = cm.vars.get(1);
         Assert.assertEquals(property2.baseName, "name");
         Assert.assertEquals(property2.dataType, "string");
         Assert.assertEquals(property2.name, "name");
-        Assert.assertEquals(property2.defaultValue, "undefined");
+        Assert.assertEquals(property2.defaultValue, null);
         Assert.assertEquals(property2.baseType, "string");
         Assert.assertTrue(property2.required);
 
@@ -85,23 +85,23 @@ public void simpleModelTest() {
         Assert.assertEquals(property3.complexType, null);
         Assert.assertEquals(property3.dataType, "Date");
         Assert.assertEquals(property3.name, "createdAt");
-        Assert.assertEquals(property3.defaultValue, "undefined");
+        Assert.assertEquals(property3.defaultValue, null);
         Assert.assertFalse(property3.required);
 
         final CodegenProperty property4 = cm.vars.get(3);
         Assert.assertEquals(property4.baseName, "birthDate");
         Assert.assertEquals(property4.complexType, null);
         Assert.assertEquals(property4.dataType, "string");
         Assert.assertEquals(property4.name, "birthDate");
-        Assert.assertEquals(property4.defaultValue, "undefined");
+        Assert.assertEquals(property4.defaultValue, null);
         Assert.assertFalse(property4.required);
 
         final CodegenProperty property5 = cm.vars.get(4);
         Assert.assertEquals(property5.baseName, "active");
         Assert.assertEquals(property5.complexType, null);
         Assert.assertEquals(property5.dataType, "boolean");
         Assert.assertEquals(property5.name, "active");
-        Assert.assertEquals(property5.defaultValue, "undefined");
+        Assert.assertEquals(property5.defaultValue, null);
         Assert.assertFalse(property5.required);
         Assert.assertFalse(property5.isContainer);
     }
@@ -187,7 +187,7 @@ public void listPropertyTest() {
         Assert.assertEquals(property1.baseName, "id");
         Assert.assertEquals(property1.dataType, "number");
         Assert.assertEquals(property1.name, "id");
-        Assert.assertEquals(property1.defaultValue, "undefined");
+        Assert.assertEquals(property1.defaultValue, null);
         Assert.assertEquals(property1.baseType, "number");
         Assert.assertTrue(property1.required);
 

samples/client/petstore/typescript-node/default/model/order.ts

@@ -24,7 +24,7 @@ export class Order {
     * Order Status
     */
     'status'?: Order.StatusEnum;
-    'complete'?: boolean;
+    'complete'?: boolean = false;
 
     static discriminator: string | undefined = undefined;
 

samples/client/petstore/typescript-node/npm/model/order.ts

@@ -24,7 +24,7 @@ export class Order {
     * Order Status
     */
     'status'?: Order.StatusEnum;
-    'complete'?: boolean;
+    'complete'?: boolean = false;
 
     static discriminator: string | undefined = undefined;