Merge pull request #28 from barnuri/ts-fix-enum

ts-fix-enum
barnuri · May 16, 2024 · b6df297 · b6df297
2 parents 25ba328 + 09c8d1d
commit b6df297
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/generators/TypescriptGenerator.ts b/src/generators/TypescriptGenerator.ts
@@ -86,13 +86,12 @@ ${objectInput.properties
         const modelFile = join(this.modelsFolder, this.getFileName(enumInput) + this.getFileExtension(true));
         const specialChars = ['-', ' ', '!'];
         const specialKeywords = ['in', 'public', 'private', 'readonly'];
-        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(parseFloat(name))) { return true; }
-            return false;
+        const fixName = (name: string) => {
+            if (specialChars.filter(x => name.includes(x)).length > 0) { return `"${name}"`; }
+            if (specialKeywords.filter(x => name === x).length > 0) { return `"${name}"`; }
+            if (!isNaN(parseFloat(name))) { return `Num${name}`; }
+            return name;
         };
-        const fixName = (name: string) => shouldWrapName(name) ? `"${name}"` : name;
         const modelFileContent = `
 export enum ${this.getFileName(enumInput)} {
 ${Object.keys(enumVals)