fix(core): remove unnecessary empty item in case of null-only enum or…

… empty enum (#1022) (#1023)
orval-labs · Nov 8, 2023 · f6f2d42 · f6f2d42
1 parent e7dc399
commit f6f2d42
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 83 deletions.
diff --git a/packages/core/src/getters/enum.ts b/packages/core/src/getters/enum.ts
@@ -23,6 +23,9 @@ export const getEnum = (value: string, enumName: string, names?: string[]) => {
 };
 
 export const getEnumImplementation = (value: string, names?: string[]) => {
+  // empty enum or null-only enum
+  if (value === '') return '';
+
   return [...new Set(value.split(' | '))].reduce((acc, val, index) => {
     const name = names?.[index];
     if (name) {

diff --git a/packages/core/src/getters/scalar.ts b/packages/core/src/getters/scalar.ts
@@ -37,7 +37,9 @@ export const getScalar = ({
       let isEnum = false;
 
       if (enumItems) {
-        value = enumItems.map((enumItem: string) => `${enumItem}`).join(' | ');
+        value = enumItems
+          .map((enumItem: number | null) => `${enumItem}`)
+          .join(' | ');
         isEnum = true;
       }
 
@@ -84,12 +86,12 @@ export const getScalar = ({
       let isEnum = false;
 
       if (enumItems) {
-        value = `'${enumItems
-          .map((enumItem: string) =>
-            isString(enumItem) ? escape(enumItem) : `${enumItem}`,
+        value = `${enumItems
+          .map((enumItem: string | null) =>
+            isString(enumItem) ? `'${escape(enumItem)}'` : `${enumItem}`,
           )
           .filter(Boolean)
-          .join(`' | '`)}'`;
+          .join(` | `)}`;
 
         isEnum = true;
       }
@@ -131,12 +133,12 @@ export const getScalar = ({
     case 'object':
     default: {
       if (enumItems) {
-        const value = `'${enumItems
-          .map((enumItem: string) =>
-            isString(enumItem) ? escape(enumItem) : `${enumItem}`,
+        const value = `${enumItems
+          .map((enumItem: unknown) =>
+            isString(enumItem) ? `'${escape(enumItem)}'` : `${enumItem}`,
           )
           .filter(Boolean)
-          .join(`' | '`)}'`;
+          .join(` | `)}`;
 
         return {
           value: value + nullable,

diff --git a/tests/configs/default.config.ts b/tests/configs/default.config.ts
@@ -64,13 +64,6 @@ export default defineConfig({
       target: '../generated/default/null-type-v3-0/endpoints.ts',
     },
   },
-  'nullable-enum': {
-    input: '../specifications/nullable-enum.yaml',
-    output: {
-      schemas: '../generated/default/nullable-enum/model',
-      target: '../generated/default/nullable-enum/endpoints.ts',
-    },
-  },
   readonly: {
     input: '../specifications/readonly.yaml',
     output: {

diff --git a/tests/specifications/null-type-v3-0.yaml b/tests/specifications/null-type-v3-0.yaml
@@ -51,7 +51,7 @@ paths:
                 $ref: '#/components/schemas/NullableAnyObject'
 components:
   schemas:
-    ObjectWithNullableObjectKey:
+    ObjectWithNullableItems:
       type: object
       properties:
         nullableObject:
@@ -66,3 +66,33 @@ components:
     NullableAnyObject:
       type: object
       nullable: true
+
+    # Nullable Enums
+    NullableStringEnum:
+      type: string
+      nullable: true
+      enum:
+        - ONE
+        - TWO
+        - THREE
+        - null
+    NullableNumberEnum:
+      type: number
+      nullable: true
+      enum:
+        - 1
+        - 2
+        - 3
+        - null
+    NullOnlyStringEnum:
+      type: string
+      nullable: true
+      enum:
+        - null
+    NullOnlyNumberEnum:
+      type: number
+      nullable: true
+      enum:
+        - null
+    EmptyEnum:
+      enum: []
diff --git a/tests/specifications/nullable-enum.yaml b/tests/specifications/nullable-enum.yaml