From f661150c4e4f9d432b09c112a7b297310aa00aac Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmichev Date: Thu, 12 Oct 2023 21:10:01 +0600 Subject: [PATCH] Fixes "blank" enums by providing the fallback name --- src/openApi/v2/parser/getEnum.ts | 11 ++++++----- src/openApi/v3/parser/getEnum.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/openApi/v2/parser/getEnum.ts b/src/openApi/v2/parser/getEnum.ts index 64c7ca8b5..5e716a4aa 100644 --- a/src/openApi/v2/parser/getEnum.ts +++ b/src/openApi/v2/parser/getEnum.ts @@ -18,12 +18,13 @@ export const getEnum = (values?: (string | number)[]): Enum[] => { description: null, }; } + const sanitizedName = String(value) + .replace(/\W+/g, '_') + .replace(/^(\d+)/g, '_$1') + .replace(/([a-z])([A-Z]+)/g, '$1_$2') + .toUpperCase(); return { - name: String(value) - .replace(/\W+/g, '_') - .replace(/^(\d+)/g, '_$1') - .replace(/([a-z])([A-Z]+)/g, '$1_$2') - .toUpperCase(), + name: sanitizedName === '' ? 'BLANK' : sanitizedName, value: `'${value.replace(/'/g, "\\'")}'`, type: 'string', description: null, diff --git a/src/openApi/v3/parser/getEnum.ts b/src/openApi/v3/parser/getEnum.ts index 64c7ca8b5..5e716a4aa 100644 --- a/src/openApi/v3/parser/getEnum.ts +++ b/src/openApi/v3/parser/getEnum.ts @@ -18,12 +18,13 @@ export const getEnum = (values?: (string | number)[]): Enum[] => { description: null, }; } + const sanitizedName = String(value) + .replace(/\W+/g, '_') + .replace(/^(\d+)/g, '_$1') + .replace(/([a-z])([A-Z]+)/g, '$1_$2') + .toUpperCase(); return { - name: String(value) - .replace(/\W+/g, '_') - .replace(/^(\d+)/g, '_$1') - .replace(/([a-z])([A-Z]+)/g, '$1_$2') - .toUpperCase(), + name: sanitizedName === '' ? 'BLANK' : sanitizedName, value: `'${value.replace(/'/g, "\\'")}'`, type: 'string', description: null,