[TS] fix array of enum, better handling of special enum value

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -3,14 +3,17 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
+import java.util.List;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.TreeSet;
 
 import io.swagger.codegen.CliOption;
 import io.swagger.codegen.CodegenConfig;
 import io.swagger.codegen.CodegenConstants;
+import io.swagger.codegen.CodegenModel;
 import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.CodegenType;
 import io.swagger.codegen.DefaultCodegen;
@@ -257,7 +260,7 @@ public String getNameUsingModelPropertyNaming(String name) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
+        if ("number".equals(datatype)) {
             return value;
         } else {
             return "\'" + escapeText(value) + "\'";
@@ -271,9 +274,15 @@ public String toEnumDefaultValue(String value, String datatype) {
 
     @Override
     public String toEnumVarName(String name, String datatype) {
+        // for symbol, e.g. $, #
+        if (getSymbolName(name) != null) {
+            return camelize(getSymbolName(name));
+        }
+
         // number
-        if ("int".equals(datatype) || "double".equals(datatype) || "float".equals(datatype)) {
-            String varName = new String(name);
+        if ("number".equals(datatype)) {
+            String varName = "NUMBER_" + name;
+
             varName = varName.replaceAll("-", "MINUS_");
             varName = varName.replaceAll("\\+", "PLUS_");
             varName = varName.replaceAll("\\.", "_DOT_");
@@ -310,7 +319,20 @@ public String toEnumName(CodegenProperty property) {
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
         // process enum in models
-        return postProcessModelsEnum(objs);
+        List<Object> models = (List<Object>) postProcessModelsEnum(objs).get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            cm.imports = new TreeSet(cm.imports);
+            for (CodegenProperty var : cm.vars) {
+                // name enum with model name, e.g. StatuEnum => Pet.StatusEnum
+                if (Boolean.TRUE.equals(var.isEnum)) {
+                    var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + "." + var.enumName);
+                }
+            }
+        } 
+
+        return objs;
     }
 
     public void setSupportsES6(Boolean value) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptFetchClientCodegen.java

@@ -1,9 +1,14 @@
 package io.swagger.codegen.languages;
 
 import io.swagger.codegen.CliOption;
+import io.swagger.codegen.CodegenModel;
+import io.swagger.codegen.CodegenProperty;
 import io.swagger.codegen.SupportingFile;
 
 import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
 
 public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodegen {
 
@@ -72,4 +77,24 @@ public void setNpmVersion(String npmVersion) {
         this.npmVersion = npmVersion;
     }
 
+    @Override
+    public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        // process enum in models
+        List<Object> models = (List<Object>) postProcessModelsEnum(objs).get("models");
+        for (Object _mo : models) {
+            Map<String, Object> mo = (Map<String, Object>) _mo;
+            CodegenModel cm = (CodegenModel) mo.get("model");
+            cm.imports = new TreeSet(cm.imports);
+            for (CodegenProperty var : cm.vars) {
+                // name enum with model name, e.g. StatuEnum => PetStatusEnum
+                if (Boolean.TRUE.equals(var.isEnum)) {
+                    var.datatypeWithEnum = var.datatypeWithEnum.replace(var.enumName, cm.classname + var.enumName);
+                    var.enumName = cm.classname + var.enumName;
+                }
+            }
+        }
+
+        return objs;
+    }
+
 }

modules/swagger-codegen/src/main/resources/TypeScript-Fetch/api.mustache

@@ -41,14 +41,14 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
      * {{{description}}}
      */
 {{/description}}
-    "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{classname}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
 }
 
 {{#hasEnums}}
 {{#vars}}
 {{#isEnum}}
-export type {{classname}}{{datatypeWithEnum}} = {{#allowableValues}}{{#values}}"{{.}}"{{^-last}} | {{/-last}}{{/values}}{{/allowableValues}};
+export type {{{enumName}}} = {{#allowableValues}}{{#values}}"{{{.}}}"{{^-last}} | {{/-last}}{{/values}}{{/allowableValues}};
 {{/isEnum}}
 {{/vars}}
 {{/hasEnums}}

modules/swagger-codegen/src/main/resources/typescript-angular/model.mustache

@@ -13,23 +13,26 @@ namespace {{package}} {
 {{/description}}
     export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
 {{#vars}}
-
 {{#description}}
         /**
          * {{{description}}}
          */
 {{/description}}
-        "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+        "{{name}}"{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+
 {{/vars}}
     }
 
 {{#hasEnums}}
     export namespace {{classname}} {
 {{#vars}}
 {{#isEnum}}
-
-        export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-            {{.}} = <any> '{{.}}'{{^-last}},{{/-last}}{{/values}}{{/allowableValues}}
+        export enum {{enumName}} {
+        {{#allowableValues}}
+        {{#enumVars}}
+            {{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
+        {{/enumVars}}
+        {{/allowableValues}}
         }
 {{/isEnum}}
 {{/vars}}

modules/swagger-codegen/src/main/resources/typescript-angular2/model.mustache

@@ -10,24 +10,30 @@ import * as models from './models';
  */
 {{/description}}
 export interface {{classname}} {{#parent}}extends models.{{{parent}}} {{/parent}}{
-    {{#additionalPropertiesType}}[key: string]: {{{additionalPropertiesType}}}{{#hasVars}} | any{{/hasVars}};{{/additionalPropertiesType}}
-{{#vars}}
+{{#additionalPropertiesType}}
+    [key: string]: {{{additionalPropertiesType}}}{{#hasVars}} | any{{/hasVars}};
 
+{{/additionalPropertiesType}}
+{{#vars}}
 {{#description}}
     /**
      * {{{description}}}
      */
 {{/description}}
-    {{name}}?: {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    {{name}}?: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+
 {{/vars}}
 }
 {{#hasEnums}}
 export namespace {{classname}} {
 {{#vars}}
 {{#isEnum}}
-
-    export enum {{datatypeWithEnum}} { {{#allowableValues}}{{#values}}
-        {{.}} = <any> '{{.}}',{{/values}}{{/allowableValues}}
+    export enum {{enumName}} {
+    {{#allowableValues}}
+    {{#enumVars}}
+        {{{name}}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{/enumVars}}
+    {{/allowableValues}}
     }
 {{/isEnum}}
 {{/vars}}

modules/swagger-codegen/src/main/resources/typescript-node/api.mustache

@@ -27,15 +27,15 @@ export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
     * {{{description}}}
     */
 {{/description}}
-    '{{name}}': {{#isEnum}}{{classname}}.{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
+    '{{name}}': {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{datatype}}}{{/isEnum}};
 {{/vars}}
 }
 
 {{#hasEnums}}
 export namespace {{classname}} {
 {{#vars}}
 {{#isEnum}}
-    export enum {{datatypeWithEnum}} {
+    export enum {{enumName}} {
         {{#allowableValues}}
         {{#enumVars}}
         {{name}} = <any> {{{value}}}{{^-last}},{{/-last}}

modules/swagger-codegen/src/test/java/io/swagger/codegen/typescript/fetch/TypeScriptFetchModelTest.java

@@ -12,11 +12,17 @@
 import io.swagger.models.ArrayModel;
 import io.swagger.models.Model;
 import io.swagger.models.ModelImpl;
+import io.swagger.models.properties.Property;
 import io.swagger.models.properties.ArrayProperty;
 import io.swagger.models.properties.DateTimeProperty;
 import io.swagger.models.properties.LongProperty;
 import io.swagger.models.properties.RefProperty;
 import io.swagger.models.properties.StringProperty;
+import io.swagger.models.Swagger;
+import io.swagger.parser.SwaggerParser;
+
+import java.util.HashMap;
+import java.util.Arrays;
 
 @SuppressWarnings("static-method")
 public class TypeScriptFetchModelTest {
@@ -180,4 +186,69 @@ public void mapModelTest() {
         Assert.assertEquals(cm.imports.size(), 1);
         Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
     }
+
+    @Test(description = "test enum array model")
+    public void enumArrayMdoelTest() {
+        final Swagger model =  new SwaggerParser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
+        final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
+        final Model definition = model.getDefinitions().get("EnumArrays");
+
+        Property property =  definition.getProperties().get("array_enum");
+        CodegenProperty prope = codegen.fromProperty("array_enum", property);
+        codegen.updateCodegenPropertyEnum(prope);
+        Assert.assertEquals(prope.datatypeWithEnum, "Array<ArrayEnumEnum>");
+        Assert.assertEquals(prope.enumName, "ArrayEnumEnum");
+        Assert.assertTrue(prope.isEnum);
+        Assert.assertEquals(prope.allowableValues.get("values"), Arrays.asList("fish", "crab"));
+
+        HashMap<String, String> fish= new HashMap<String, String>();
+        fish.put("name", "Fish");
+        fish.put("value", "'fish'");
+        HashMap<String, String> crab= new HashMap<String, String>();
+        crab.put("name", "Crab");
+        crab.put("value", "'crab'");
+        Assert.assertEquals(prope.allowableValues.get("enumVars"), Arrays.asList(fish, crab));
+
+        // assert inner items
+        Assert.assertEquals(prope.datatypeWithEnum, "Array<ArrayEnumEnum>");
+        Assert.assertEquals(prope.enumName, "ArrayEnumEnum");
+        Assert.assertTrue(prope.items.isEnum);
+        Assert.assertEquals(prope.items.allowableValues.get("values"), Arrays.asList("fish", "crab"));
+        Assert.assertEquals(prope.items.allowableValues.get("enumVars"), Arrays.asList(fish, crab));
+
+        //IMPORTANT: these are not final enum values, which may be further updated
+        //by postProcessModels
+
+    }
+
+    @Test(description = "test enum model for values (numeric, string, etc)")
+    public void enumMdoelValueTest() {
+        final Swagger model =  new SwaggerParser().read("src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml");
+        final DefaultCodegen codegen = new TypeScriptFetchClientCodegen();
+        final Model definition = model.getDefinitions().get("Enum_Test");
+
+        Property property =  definition.getProperties().get("enum_integer");
+        CodegenProperty prope = codegen.fromProperty("enum_integer", property);
+        codegen.updateCodegenPropertyEnum(prope);
+        Assert.assertEquals(prope.datatypeWithEnum, "EnumIntegerEnum");
+        Assert.assertEquals(prope.enumName, "EnumIntegerEnum");
+        Assert.assertTrue(prope.isEnum);
+        Assert.assertNull(prope.isContainer);
+        Assert.assertNull(prope.items);
+        Assert.assertEquals(prope.allowableValues.get("values"), Arrays.asList(1, -1));
+
+        HashMap<String, String> one = new HashMap<String, String>();
+        one.put("name", "NUMBER_1");
+        one.put("value", "1");
+        HashMap<String, String> minusOne = new HashMap<String, String>();
+        minusOne.put("name", "NUMBER_MINUS_1");
+        minusOne.put("value", "-1");
+        Assert.assertEquals(prope.allowableValues.get("enumVars"), Arrays.asList(one, minusOne));
+
+       //IMPORTANT: these are not final enum values, which may be further updated
+       //by postProcessModels
+
+    }
+
+
 }

samples/client/petstore/typescript-angular/API/Client/Category.ts

@@ -28,10 +28,10 @@ namespace API.Client {
     'use strict';
 
     export interface Category {
-
         "id"?: number;
 
         "name"?: string;
+
     }
 
 }

samples/client/petstore/typescript-angular/API/Client/Order.ts

@@ -28,7 +28,6 @@ namespace API.Client {
     'use strict';
 
     export interface Order {
-
         "id"?: number;
 
         "petId"?: number;
@@ -43,14 +42,14 @@ namespace API.Client {
         "status"?: Order.StatusEnum;
 
         "complete"?: boolean;
+
     }
 
     export namespace Order {
-
-        export enum StatusEnum { 
-            placed = <any> 'placed',
-            approved = <any> 'approved',
-            delivered = <any> 'delivered'
+        export enum StatusEnum {
+            Placed = <any> 'placed',
+            Approved = <any> 'approved',
+            Delivered = <any> 'delivered'
         }
     }
 }

samples/client/petstore/typescript-angular/API/Client/Pet.ts

@@ -28,7 +28,6 @@ namespace API.Client {
     'use strict';
 
     export interface Pet {
-
         "id"?: number;
 
         "category"?: Category;
@@ -43,14 +42,14 @@ namespace API.Client {
          * pet status in the store
          */
         "status"?: Pet.StatusEnum;
+
     }
 
     export namespace Pet {
-
-        export enum StatusEnum { 
-            available = <any> 'available',
-            pending = <any> 'pending',
-            sold = <any> 'sold'
+        export enum StatusEnum {
+            Available = <any> 'available',
+            Pending = <any> 'pending',
+            Sold = <any> 'sold'
         }
     }
 }