fix(zod): handle schema type array correctly (#1311)

* fix(zod): handle schema type array correctly * fix(format): check
orval-labs · Apr 16, 2024 · b1d66dc · b1d66dc
1 parent 25267ae
commit b1d66dc
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/packages/zod/src/index.ts b/packages/zod/src/index.ts
@@ -38,12 +38,26 @@ const ZOD_DEPENDENCIES: GeneratorDependency[] = [
 
 export const getZodDependencies = () => ZOD_DEPENDENCIES;
 
+const possibleSchemaTypes = [
+  'integer',
+  'number',
+  'string',
+  'boolean',
+  'object',
+  'null',
+  'array',
+];
+
 const resolveZodType = (schemaTypeValue: SchemaObject['type']) => {
-  switch (schemaTypeValue) {
+  const type = Array.isArray(schemaTypeValue)
+    ? schemaTypeValue.find((t) => possibleSchemaTypes.includes(t))
+    : schemaTypeValue;
+
+  switch (type) {
     case 'integer':
       return 'number';
     default:
-      return schemaTypeValue ?? 'any';
+      return type ?? 'any';
   }
 };
 
@@ -65,7 +79,9 @@ const generateZodValidationSchemaDefinition = (
   const functions: [string, any][] = [];
   const type = resolveZodType(schema.type);
   const required = schema.default !== undefined ? false : _required ?? false;
-  const nullable = schema.nullable ?? false;
+  const nullable =
+    schema.nullable ??
+    (Array.isArray(schema.type) && schema.type.includes('null'));
   const min =
     schema.minimum ??
     schema.exclusiveMinimum ??