fix(core): make sure to add '| null' to enums with null in type array (…

…#1739)
orval-labs · Dec 9, 2024 · b653320 · b653320
1 parent b23257b
commit b653320
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/core/src/getters/scalar.ts b/packages/core/src/getters/scalar.ts
@@ -27,7 +27,10 @@ export const getScalar = ({
 }): ScalarValue => {
   // NOTE: Angular client does not support nullable types
   const isAngularClient = context.output.client === OutputClient.ANGULAR;
-  const nullable = item.nullable && !isAngularClient ? ' | null' : '';
+  const typeIncludesNull =
+    Array.isArray(item.type) && item.type.includes('null');
+  const nullable =
+    (typeIncludesNull || item.nullable) && !isAngularClient ? ' | null' : '';
 
   const enumItems = item.enum?.filter((enumItem) => enumItem !== null);
 

diff --git a/tests/specifications/null-type.yaml b/tests/specifications/null-type.yaml
@@ -76,6 +76,13 @@ components:
           type:
             - 'boolean'
             - 'null'
+    NullStringEnum:
+      type:
+        - string
+        - 'null'
+      enum:
+        - foo
+        - bar
     NullEnum:
       nullable: true
       enum: