From d38086e40a454bf81b420de56c0fa86b52e02338 Mon Sep 17 00:00:00 2001 From: Bar Nuri Date: Thu, 16 May 2024 22:39:11 +0300 Subject: [PATCH 1/3] fix-enum --- src/generators/TypescriptGenerator.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/generators/TypescriptGenerator.ts b/src/generators/TypescriptGenerator.ts index 3f769db..ac65679 100644 --- a/src/generators/TypescriptGenerator.ts +++ b/src/generators/TypescriptGenerator.ts @@ -86,8 +86,14 @@ ${objectInput.properties const modelFile = join(this.modelsFolder, this.getFileName(enumInput) + this.getFileExtension(true)); const specialChars = ['-', ' ', '!']; const specialKeywords = ['in', 'public', 'private', 'readonly']; - const fixName = (name: string) => (specialChars.filter(x => name.includes(x)).length > 0 || specialKeywords.filter(x => name === x).length > 0 ? `"${name}"` : name); - const modelFileContent = ` + const shouldWrapName = (name: string) => { + if (specialChars.filter(x => name.includes(x)).length > 0) { return true; } + if (specialKeywords.filter(x => name === x).length > 0) { return true; } + if (!isNaN(str) && !isNaN(parseFloat(str))) { return true; } + return false; + }; + const fixName = (name: string) => shouldWrapName(name) ? `"${name}"` : name; + const modelFileContent = ` export enum ${this.getFileName(enumInput)} { ${Object.keys(enumVals) .map(x => `\t${fixName(x)} = ${typeof enumVals[x] === 'number' ? enumVals[x] : `'${enumVals[x]}'`}`) From 21a6da4479a3b66a8319b71cff7da504b4198f44 Mon Sep 17 00:00:00 2001 From: Bar Nuri Date: Thu, 16 May 2024 22:40:13 +0300 Subject: [PATCH 2/3] Update TypescriptGenerator.ts --- src/generators/TypescriptGenerator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generators/TypescriptGenerator.ts b/src/generators/TypescriptGenerator.ts index ac65679..f093b0e 100644 --- a/src/generators/TypescriptGenerator.ts +++ b/src/generators/TypescriptGenerator.ts @@ -89,7 +89,7 @@ ${objectInput.properties const shouldWrapName = (name: string) => { if (specialChars.filter(x => name.includes(x)).length > 0) { return true; } if (specialKeywords.filter(x => name === x).length > 0) { return true; } - if (!isNaN(str) && !isNaN(parseFloat(str))) { return true; } + if (!isNaN(name) && !isNaN(parseFloat(name))) { return true; } return false; }; const fixName = (name: string) => shouldWrapName(name) ? `"${name}"` : name; From c70afefe520c4c0b37b40a5d040077b07eedbd99 Mon Sep 17 00:00:00 2001 From: Bar Nuri Date: Thu, 16 May 2024 22:42:18 +0300 Subject: [PATCH 3/3] Update TypescriptGenerator.ts --- src/generators/TypescriptGenerator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/generators/TypescriptGenerator.ts b/src/generators/TypescriptGenerator.ts index f093b0e..62de14e 100644 --- a/src/generators/TypescriptGenerator.ts +++ b/src/generators/TypescriptGenerator.ts @@ -89,7 +89,7 @@ ${objectInput.properties const shouldWrapName = (name: string) => { if (specialChars.filter(x => name.includes(x)).length > 0) { return true; } if (specialKeywords.filter(x => name === x).length > 0) { return true; } - if (!isNaN(name) && !isNaN(parseFloat(name))) { return true; } + if (!isNaN(parseFloat(name))) { return true; } return false; }; const fixName = (name: string) => shouldWrapName(name) ? `"${name}"` : name;