fix: fix string enum keys for values with spaces

chatloop · Aug 19, 2024 · 0d51675 · 0d51675
1 parent 8bfacf2
commit 0d51675
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/plugins/typescript/src/core/schemaToEnumDeclaration.test.ts b/plugins/typescript/src/core/schemaToEnumDeclaration.test.ts
@@ -7,14 +7,15 @@ describe("schemaToTypeAliasDeclaration", () => {
   it("should generate a string enums", () => {
     const schema: SchemaObject = {
       type: "string",
-      enum: ["AVAILABLE", "PENDING", "SOLD"],
+      enum: ["AVAILABLE", "PENDING", "SOLD", "WITH SPACE"],
     };
 
     expect(printSchema(schema)).toMatchInlineSnapshot(`
      "export enum Test {
          AVAILABLE = "AVAILABLE",
          PENDING = "PENDING",
-         SOLD = "SOLD"
+         SOLD = "SOLD",
+         "WITH SPACE" = "WITH SPACE"
      }"
     `);
   });

diff --git a/plugins/typescript/src/core/schemaToEnumDeclaration.ts b/plugins/typescript/src/core/schemaToEnumDeclaration.ts
@@ -48,6 +48,7 @@ function getEnumMembers(
 
       if (typeof enumValue === "string") {
         enumName = enumValue.match(/^\d/) ? `"_${enumValue}"` : enumValue;
+        enumName = enumName.match(/[^"]+.*\s.*/) ? `"${enumName}"` : enumName;
         enumValueNode = f.createStringLiteral(enumValue);
       } else if (typeof enumValue === "number") {
         enumName = convertNumberToWord(enumValue)

diff --git a/plugins/typescript/src/generators/generateSchemaTypes.test.ts b/plugins/typescript/src/generators/generateSchemaTypes.test.ts
@@ -233,7 +233,7 @@ describe("generateSchemaTypes", () => {
        export enum DogBreed {
            saimois = "saimois",
            bengal = "bengal",
-           british shorthair = "british shorthair"
+           "british shorthair" = "british shorthair"
        }
 
        /**