Support field names which aren't legal typescript identifiers.

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

@@ -168,7 +168,12 @@ export class ObjectSerializer {
             let instance: {[index: string]: any} = {};
             for (let index = 0; index < attributeTypes.length; index++) {
                 let attributeType = attributeTypes[index];
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : Object.prototype.hasOwnProperty.call(data, attributeType.baseName)
+                        ? data[attributeType.baseName]
+                        : undefined;
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type);
             }
             return instance;
         }

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

@@ -205,7 +205,10 @@ export class ObjectSerializer {
             let attributeTypes = typeMap[type].getAttributeTypeMap();
             let instance: {[index: string]: any} = {};
             for (let attributeType of attributeTypes) {
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type, attributeType.format);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : data[attributeType.baseName];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type, attributeType.format);
             }
             return instance;
         }

modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts

@@ -95,7 +95,10 @@ export class ObjectSerializer {
             let instance: {[index: string]: any} = {};
             for (let index in attributeTypes) {
                 let attributeType = attributeTypes[index];
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : data[attributeType.baseName];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type);
             }
             return instance;
         }

samples/client/others/typescript-node/encode-decode/build/model/models.ts

@@ -139,7 +139,12 @@ export class ObjectSerializer {
             let instance: {[index: string]: any} = {};
             for (let index = 0; index < attributeTypes.length; index++) {
                 let attributeType = attributeTypes[index];
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : Object.prototype.hasOwnProperty.call(data, attributeType.baseName)
+                        ? data[attributeType.baseName]
+                        : undefined;
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type);
             }
             return instance;
         }

samples/client/petstore/typescript-node/3_0/model/models.ts

@@ -145,7 +145,12 @@ export class ObjectSerializer {
             let instance: {[index: string]: any} = {};
             for (let index = 0; index < attributeTypes.length; index++) {
                 let attributeType = attributeTypes[index];
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : Object.prototype.hasOwnProperty.call(data, attributeType.baseName)
+                        ? data[attributeType.baseName]
+                        : undefined;
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type);
             }
             return instance;
         }

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

@@ -153,7 +153,12 @@ export class ObjectSerializer {
             let instance: {[index: string]: any} = {};
             for (let index = 0; index < attributeTypes.length; index++) {
                 let attributeType = attributeTypes[index];
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : Object.prototype.hasOwnProperty.call(data, attributeType.baseName)
+                        ? data[attributeType.baseName]
+                        : undefined;
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type);
             }
             return instance;
         }

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

@@ -153,7 +153,12 @@ export class ObjectSerializer {
             let instance: {[index: string]: any} = {};
             for (let index = 0; index < attributeTypes.length; index++) {
                 let attributeType = attributeTypes[index];
-                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+                const value = Object.prototype.hasOwnProperty.call(data, attributeType.name)
+                    ? data[attributeType.name]
+                    : Object.prototype.hasOwnProperty.call(data, attributeType.baseName)
+                        ? data[attributeType.baseName]
+                        : undefined;
+                instance[attributeType.baseName] = ObjectSerializer.serialize(value, attributeType.type);
             }
             return instance;
         }