fix: handle enums

kubb-labs · Dec 18, 2023 · a0b43e8 · a0b43e8
1 parent e8e6e8c
commit a0b43e8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/packages/swagger-faker/src/FakerGenerator.ts b/packages/swagger-faker/src/FakerGenerator.ts
@@ -243,18 +243,18 @@ export class FakerGenerator extends Generator<PluginOptions['resolvedOptions'],
     }
 
     if (schema.enum) {
-      const extensionEnums = ['x-enumNames', 'x-enum-varnames'].map(extensionKey => {
-        if (extensionKey in schema) {
+      const extensionEnums = (['x-enumNames', 'x-enum-varnames'] as Array<keyof typeof schema>)
+      .filter(extensionKey => extensionKey in schema)
+      .map((extensionKey) => {
           return [
             {
               keyword: fakerKeywords.enum,
               args: [`[${[...new Set(schema[extensionKey] as string[])].map((value) => `\`${value}\``).join(', ')}]`],
             },
           ]
-        }
       })
 
-      if (extensionEnums.length > 0) {
+      if (extensionEnums.length > 0 && extensionEnums[0]) {
         return extensionEnums[0]
       }
 

diff --git a/packages/swagger-ts/src/TypeGenerator.ts b/packages/swagger-ts/src/TypeGenerator.ts
@@ -280,16 +280,16 @@ export class TypeGenerator extends Generator<PluginOptions['resolvedOptions'], C
 
       let enums: [key: string, value: string | number][] = [...new Set(schema.enum)].map((key) => [key, key])
 
-      const extensionEnums = ['x-enumNames', 'x-enum-varnames'].map(extensionKey => {
-        if (extensionKey in schema) {
-          return [...new Set(schema[extensionKey] as string[])].map((key, index) => {
-            return [key, schema.enum?.[index] as string]
-          })
-        }
-      })
+      const extensionEnums : Array<typeof enums> = (['x-enumNames', 'x-enum-varnames'] as Array<keyof typeof schema>)
+        .filter(extensionKey => extensionKey in schema)
+        .map((extensionKey) => {
+            return [...new Set(schema[extensionKey] as string[])].map((key, index) => {
+              return [key, schema.enum?.[index] as string] as const
+            })
+        })
 
-      if (extensionEnums.length > 0) {
-        return extensionEnums[0]
+      if (extensionEnums.length > 0 && extensionEnums[0]) {
+        enums = extensionEnums[0]
       }
 
 

diff --git a/packages/swagger-zod/src/ZodGenerator.ts b/packages/swagger-zod/src/ZodGenerator.ts
@@ -249,19 +249,19 @@ export class ZodGenerator extends Generator<PluginOptions['resolvedOptions'], Co
     }
 
     if (schema.enum) {
-      const extensionEnums = ['x-enumNames', 'x-enum-varnames'].map(extensionKey => {
-        if (extensionKey in schema) {
-          return [
-            {
-              keyword: zodKeywords.enum,
-              args: [...new Set(schema[extensionKey] as string[])].map((value: string) => `\`${value}\``),
-            },
-            ...baseItems,
-          ]
-        }
-      })
+      const extensionEnums = (['x-enumNames', 'x-enum-varnames'] as Array<keyof typeof schema>)
+        .filter(extensionKey => extensionKey in schema)
+        .map((extensionKey) => {
+            return [
+              {
+                keyword: zodKeywords.enum,
+                args: [...new Set(schema[extensionKey] as string[])].map((value: string) => `\`${value}\``),
+              },
+              ...baseItems,
+            ]
+        })
 
-      if (extensionEnums.length > 0) {
+      if (extensionEnums.length > 0 && extensionEnums[0]) {
         return extensionEnums[0]
       }