Generate a valid identifier for integer enums

Fixes #40

Author: luisfpg

lib/gen-utils.ts

@@ -68,12 +68,16 @@ export function typeName(name: string): string {
  * Returns the name of the enum constant for a given value
  */
 export function enumName(value: string, options: Options): string {
-  const name = toBasicChars(value, true);
+  let name = toBasicChars(value, true);
   if (options.enumStyle === 'upper') {
-    return upperCase(name).replace(/\s+/g, '_');
+    name = upperCase(name).replace(/\s+/g, '_');
   } else {
-    return upperFirst(camelCase(name));
+    name = upperFirst(camelCase(name));
   }
+  if (/^\d/.test(name)) {
+    name = '$' + name;
+  }
+  return name;
 }
 
 /**

test/all-types.json

@@ -94,6 +94,14 @@
           "valueC"
         ]
       },
+      "RefIntEnum": {
+        "type": "integer",
+        "enum": [
+          100,
+          200,
+          300
+        ]
+      },
       "a.b.RefObject": {
         "type": "object",
         "required": [
@@ -125,6 +133,9 @@
           {
             "$ref": "#/components/schemas/RefEnum"
           },
+          {
+            "$ref": "#/components/schemas/RefIntEnum"
+          },
           {
             "$ref": "#/components/schemas/Container"
           }
@@ -324,6 +335,22 @@
                   "$ref": "#/components/schemas/x.y.RefObject"
                 }
               },
+              "stringEnumProp": {
+                "type": "string",
+                "enum": [
+                  "a",
+                  "b",
+                  "c"
+                ]
+              },
+              "intEnumProp": {
+                "type": "integer",
+                "enum": [
+                  1,
+                  2,
+                  3
+                ]
+              },
               "nestedObject": {
                 "type": "object",
                 "properties": {

test/all-types.spec.ts

@@ -32,8 +32,8 @@ it('Api', done => {
 
 describe('Generation tests using all-types.json', () => {
   it('RefEnum model', done => {
-    const refString = gen.models.get('RefEnum');
-    const ts = gen.templates.apply('model', refString);
+    const ref = gen.models.get('RefEnum');
+    const ts = gen.templates.apply('model', ref);
     const parser = new TypescriptParser();
     parser.parseSource(ts).then(ast => {
       expect(ast.imports.length).toBe(0);
@@ -49,6 +49,24 @@ describe('Generation tests using all-types.json', () => {
     });
   });
 
+  it('RefIntEnum model', done => {
+    const ref = gen.models.get('RefIntEnum');
+    const ts = gen.templates.apply('model', ref);
+    const parser = new TypescriptParser();
+    parser.parseSource(ts).then(ast => {
+      expect(ast.imports.length).toBe(0);
+      expect(ast.declarations.length).toBe(1);
+      expect(ast.declarations[0]).toEqual(jasmine.any(EnumDeclaration));
+      const decl = ast.declarations[0] as EnumDeclaration;
+      expect(decl.name).toBe('RefIntEnum');
+      expect(decl.members.length).toBe(3);
+      expect(decl.members[0]).toBe('$100');
+      expect(decl.members[1]).toBe('$200');
+      expect(decl.members[2]).toBe('$300');
+      done();
+    });
+  });
+
   it('a.b.RefObject model', done => {
     const refObject = gen.models.get('a.b.RefObject');
     const ts = gen.templates.apply('model', refObject);
@@ -96,7 +114,7 @@ describe('Generation tests using all-types.json', () => {
       const decl = ast.declarations[0] as TypeAliasDeclaration;
       expect(decl.name).toBe('Union');
       const text = ts.substring(decl.start || 0, decl.end || ts.length);
-      expect(text).toBe('export type Union = { [key: string]: any } | RefEnum | Container;');
+      expect(text).toBe('export type Union = { [key: string]: any } | RefEnum | RefIntEnum | Container;');
       done();
     });
   });
@@ -236,7 +254,7 @@ describe('Generation tests using all-types.json', () => {
       expect(ast.declarations[0]).toEqual(jasmine.any(InterfaceDeclaration));
       const decl = ast.declarations[0] as InterfaceDeclaration;
       expect(decl.name).toBe('Container');
-      expect(decl.properties.length).toBe(19);
+      expect(decl.properties.length).toBe(21);
 
       // Assert the simple types
       function assertProperty(name: string, type: string, required = false) {
@@ -267,6 +285,8 @@ describe('Generation tests using all-types.json', () => {
       assertProperty('nestedObject', '{ \'p1\': string, \'p2\': number, ' +
         '\'deeper\': { \'d1\': ABRefObject, \'d2\': string | Array<ABRefObject> | number } }');
       assertProperty('dynamic', '{ [key: string]: XYRefObject }');
+      assertProperty('stringEnumProp', '\'a\' | \'b\' | \'c\'');
+      assertProperty('intEnumProp', '1 | 2 | 3');
 
       done();
     });