From 9b9e7cd8553939d1ae6b4552388b40433f95fca6 Mon Sep 17 00:00:00 2001 From: Aleksandr Argunov Date: Fri, 26 Feb 2021 16:15:07 +0300 Subject: [PATCH] Wrap negative numbers in quotes, fix enums --- src/openApi/v2/parser/getEnum.ts | 2 +- src/openApi/v3/parser/getEnum.ts | 2 +- test/__snapshots__/index.spec.js.snap | 14 ++++++++------ test/spec/v2.json | 1 + test/spec/v3.json | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/openApi/v2/parser/getEnum.ts b/src/openApi/v2/parser/getEnum.ts index 650228bf..16b3bd0c 100644 --- a/src/openApi/v2/parser/getEnum.ts +++ b/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, diff --git a/src/openApi/v3/parser/getEnum.ts b/src/openApi/v3/parser/getEnum.ts index 650228bf..16b3bd0c 100644 --- a/src/openApi/v3/parser/getEnum.ts +++ b/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, diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap index c96a4034..6b91d8ab 100644 --- a/test/__snapshots__/index.spec.js.snap +++ b/test/__snapshots__/index.spec.js.snap @@ -587,9 +587,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, }" `; @@ -3016,9 +3017,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, }" `; diff --git a/test/spec/v2.json b/test/spec/v2.json index b7355487..56972c2a 100644 --- a/test/spec/v2.json +++ b/test/spec/v2.json @@ -793,6 +793,7 @@ "EnumWithNumbers": { "description": "This is a simple enum with numbers", "enum": [ + -1, 1, 2, 3 diff --git a/test/spec/v3.json b/test/spec/v3.json index 9b139746..ff81a807 100644 --- a/test/spec/v3.json +++ b/test/spec/v3.json @@ -1289,6 +1289,7 @@ "EnumWithNumbers": { "description": "This is a simple enum with numbers", "enum": [ + -1, 1, 2, 3