Merge pull request ferdikoomen#591 from troglotit/master

Wrap negative numbers in quotes, fix Enums in TypeScript

Author: ferdikoomen

src/openApi/v2/parser/getEnum.ts

@@ -11,7 +11,7 @@ export function getEnum(values?: (string | number)[]): Enum[] {
             .map(value => {
                 if (typeof value === 'number') {
                     return {
-                        name: `_${value}`,
+                        name: `'_${value}'`,
                         value: String(value),
                         type: 'number',
                         description: null,

src/openApi/v3/parser/getEnum.ts

@@ -11,7 +11,7 @@ export function getEnum(values?: (string | number)[]): Enum[] {
             .map(value => {
                 if (typeof value === 'number') {
                     return {
-                        name: `_${value}`,
+                        name: `'_${value}'`,
                         value: String(value),
                         type: 'number',
                         description: null,

test/__snapshots__/index.spec.js.snap

@@ -590,9 +590,10 @@ exports[`v2 should generate: ./test/generated/v2/models/EnumWithNumbers.ts 1`] =
  * This is a simple enum with numbers
  */
 export enum EnumWithNumbers {
-    _1 = 1,
-    _2 = 2,
-    _3 = 3,
+    '_-1' = -1,
+    '_1' = 1,
+    '_2' = 2,
+    '_3' = 3,
 }"
 `;
 
@@ -3033,9 +3034,10 @@ exports[`v3 should generate: ./test/generated/v3/models/EnumWithNumbers.ts 1`] =
  * This is a simple enum with numbers
  */
 export enum EnumWithNumbers {
-    _1 = 1,
-    _2 = 2,
-    _3 = 3,
+    '_-1' = -1,
+    '_1' = 1,
+    '_2' = 2,
+    '_3' = 3,
 }"
 `;
 

test/spec/v2.json

@@ -800,6 +800,7 @@
         "EnumWithNumbers": {
             "description": "This is a simple enum with numbers",
             "enum": [
+                -1,
                 1,
                 2,
                 3

test/spec/v3.json

@@ -1299,6 +1299,7 @@
             "EnumWithNumbers": {
                 "description": "This is a simple enum with numbers",
                 "enum": [
+                    -1,
                     1,
                     2,
                     3