[TypeScript-Consolidated] Fixes invalid type enum array & incorrect discriminator value if mapping is present

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

@@ -610,6 +610,7 @@ public String getTypeDeclaration(Schema p) {
         } else if (ModelUtils.isBinarySchema(p)) {
             return "ArrayBuffer";
         }
+
         return super.getTypeDeclaration(p);
     }
 
@@ -885,7 +886,8 @@ public String toEnumVarName(String name, String datatype) {
     public String toEnumName(CodegenProperty property) {
         String enumName = property.name;
         enumName = addSuffix(enumName, enumSuffix);
-        return toTypescriptTypeName(enumName, "_");
+        String tsName = toTypescriptTypeName(enumName, "_");
+        return tsName;
     }
 
     protected void setEnumPropertyNaming(String naming) {
@@ -962,6 +964,40 @@ public ModelsMap postProcessModels(ModelsMap objs) {
         return objs;
     }
 
+    /**
+     * Update datatypeWithEnum for array container
+     *
+     * @param property Codegen property
+     */
+    protected void updateDataTypeWithEnumForArray(CodegenProperty property) {
+        CodegenProperty baseItem = property.items;
+        while (baseItem != null && (Boolean.TRUE.equals(baseItem.isMap)
+                || Boolean.TRUE.equals(baseItem.isArray))) {
+            baseItem = baseItem.items;
+        }
+        if (baseItem != null) {
+            /* 
+             * Note: There are cases where we have datatypeWithEnum == Array<{ [key: string]: string}
+             * In these cases, we then have Array <{ [key: EnumName]: EnumName}> - which is invalid typescript
+             * To protect agains this we first replace [key: string] with a special/reserved placeholder (i.e. *[key]* )
+             */
+            property.datatypeWithEnum = property.datatypeWithEnum.replace("[key: string]", "*PLACEHOLDER*")
+                                                                    .replace(baseItem.baseType, toEnumName(baseItem))
+                                                                    .replace("*PLACEHOLDER*", "[key: string]");
+
+            // naming the enum with respect to the language enum naming convention
+            // e.g. remove [], {} from array/map of enum
+            property.enumName = toEnumName(property);
+
+            // set default value for variable with inner enum
+            if (property.defaultValue != null) {
+                property.defaultValue = property.defaultValue.replace(baseItem.baseType, toEnumName(baseItem));
+            }
+
+            updateCodegenPropertyEnum(property);
+        }
+    }
+
     @Override
     public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs) {
         Map<String, ModelsMap> result = super.postProcessAllModels(objs);

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

@@ -303,13 +303,15 @@ public ModelsMap postProcessModels(ModelsMap objs) {
             // name enum with model name, e.g. StatusEnum => Pet.StatusEnum
             for (CodegenProperty var : cm.vars) {
                 if (Boolean.TRUE.equals(var.isEnum)) {
+                    String replaceName = var.isInnerEnum ? "Inner" + super.enumSuffix : var.enumName;
+                    var.datatypeWithEnum = var.datatypeWithEnum.replace(replaceName, var.enumName);
                     var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + var.enumName);
                 }
             }
             if (cm.parent != null) {
                 for (CodegenProperty var : cm.allVars) {
                     if (Boolean.TRUE.equals(var.isEnum)) {
-                        var.datatypeWithEnum = var.datatypeWithEnum
+                            var.datatypeWithEnum = var.datatypeWithEnum
                                 .replace(var.enumName, cm.classname + var.enumName);
                     }
                 }
@@ -422,8 +424,8 @@ public String getTypeDeclaration(Schema p) {
         if (ModelUtils.isArraySchema(p)) {
             inner = ((ArraySchema) p).getItems();
             return this.getSchemaType(p) + "<" + this.getTypeDeclaration(unaliasSchema(inner)) + ">";
-        } else if (ModelUtils.isMapSchema(p)) {
-            inner = getSchemaAdditionalProperties(p);
+        } else if (ModelUtils.isMapSchema(p)) { // it is an object schema
+            inner = getSchemaAdditionalProperties(p); // additional properties?
             String postfix = "";
             if (Boolean.TRUE.equals(inner.getNullable())) {
                 postfix = " | null";

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

@@ -79,7 +79,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {

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

@@ -24,6 +24,11 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
 
     {{#discriminator}}
     static readonly discriminator: string | undefined = "{{discriminatorName}}";
+    static readonly discriminatorTypeMap = {
+    {{#mappedModels}}
+        "{{mappingName}}": "{{modelName}}"{{^-last}},{{/-last}}    
+    {{/mappedModels}}
+    }
     {{/discriminator}}
     {{^discriminator}}
     static readonly discriminator: string | undefined = undefined;
@@ -35,7 +40,7 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
         {
             "name": "{{name}}",
             "baseName": "{{baseName}}",
-            "type": "{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}",
+            "type": "{{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}} | null{{/isNullable}}",
             "format": "{{dataFormat}}"
         }{{^-last}},
         {{/-last}}
@@ -61,9 +66,14 @@ export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
         this.{{name}} = "{{discriminatorValue}}";
         {{/discriminatorValue}}
         {{/allVars}}
-        {{#discriminatorName}}
+
+        {{#discriminator}}
+            {{^hasDiscriminatorWithNonEmptyMapping}}
+            {{#discriminatorName}}
         this.{{discriminatorName}} = "{{classname}}";
-        {{/discriminatorName}}
+            {{/discriminatorName}}
+            {{/hasDiscriminatorWithNonEmptyMapping}}
+        {{/discriminator}}
     }
 }
 

samples/client/others/typescript/builds/with-unique-items/models/ObjectSerializer.ts

@@ -51,7 +51,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {

samples/client/others/typescript/builds/with-unique-items/models/Response.ts

@@ -37,6 +37,7 @@ export class Response {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/browser/models/ApiResponse.ts

@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/browser/models/Category.ts

@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/browser/models/ObjectSerializer.ts

@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {

samples/openapi3/client/petstore/typescript/builds/browser/models/Order.ts

@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/browser/models/Pet.ts

@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/browser/models/Tag.ts

@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/browser/models/User.ts

@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Cat.ts

@@ -37,6 +37,7 @@ export class Cat {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/CatAllOf.ts

@@ -37,6 +37,7 @@ export class CatAllOf {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/Dog.ts

@@ -37,6 +37,7 @@ export class Dog {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/DogAllOf.ts

@@ -37,6 +37,7 @@ export class DogAllOf {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/FilePostRequest.ts

@@ -30,6 +30,7 @@ export class FilePostRequest {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts

@@ -80,7 +80,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByAge.ts

@@ -37,6 +37,7 @@ export class PetByAge {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetByType.ts

@@ -37,6 +37,7 @@ export class PetByType {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsFilteredPatchRequest.ts

@@ -53,6 +53,7 @@ export class PetsFilteredPatchRequest {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/PetsPatchRequest.ts

@@ -21,6 +21,8 @@ export class PetsPatchRequest {
     'breed'?: PetsPatchRequestBreedEnum;
 
     static readonly discriminator: string | undefined = "petType";
+    static readonly discriminatorTypeMap = {
+    }
 
     static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
         {
@@ -53,6 +55,7 @@ export class PetsPatchRequest {
     }
 
     public constructor() {
+
         this.petType = "PetsPatchRequest";
     }
 }

samples/openapi3/client/petstore/typescript/builds/default/models/ApiResponse.ts

@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/default/models/Category.ts

@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/default/models/ObjectSerializer.ts

@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {

samples/openapi3/client/petstore/typescript/builds/default/models/Order.ts

@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/default/models/Pet.ts

@@ -73,6 +73,7 @@ export class Pet {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/default/models/Tag.ts

@@ -40,6 +40,7 @@ export class Tag {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/default/models/User.ts

@@ -85,6 +85,7 @@ export class User {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/deno/models/ApiResponse.ts

@@ -47,6 +47,7 @@ export class ApiResponse {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/deno/models/Category.ts

@@ -40,6 +40,7 @@ export class Category {
     }
 
     public constructor() {
+
     }
 }
 

samples/openapi3/client/petstore/typescript/builds/deno/models/ObjectSerializer.ts

@@ -68,7 +68,9 @@ export class ObjectSerializer {
                 return expectedType; // the type does not have a discriminator. use it.
             } else {
                 if (data[discriminatorProperty]) {
-                    var discriminatorType = data[discriminatorProperty];
+                    var discriminatorValue = data[discriminatorProperty];
+                    // if it has a mapping we need to map from discriminatorvalue to the actual type name
+                    var discriminatorType = data.discriminatorTypeMap[discriminatorValue] || discriminatorValue;
                     if(typeMap[discriminatorType]){
                         return discriminatorType; // use the type given in the discriminator
                     } else {

samples/openapi3/client/petstore/typescript/builds/deno/models/Order.ts

@@ -71,6 +71,7 @@ export class Order {
     }
 
     public constructor() {
+
     }
 }