Fix type to be a string value

anatine · Jan 19, 2024 · 5a6611b · 5a6611b
1 parent 19be9b7
commit 5a6611b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/zod-nestjs/src/lib/create-zod-dto.spec.ts b/packages/zod-nestjs/src/lib/create-zod-dto.spec.ts
@@ -85,7 +85,7 @@ describe('zod-nesjs create-zod-dto', () => {
     const generatedSchema = metadataFactory();
 
     expect(generatedSchema).toBeDefined();
-    expect(generatedSchema?.name.type).toEqual(['string']);
+    expect(generatedSchema?.name.type).toEqual('string');
     expect(generatedSchema?.name.nullable).toBe(true);
   });
 

diff --git a/packages/zod-nestjs/src/lib/create-zod-dto.ts b/packages/zod-nestjs/src/lib/create-zod-dto.ts
@@ -104,14 +104,12 @@ export const createZodDto = <T extends OpenApiZodAny>(
 
         // @nestjs/swagger expects OpenAPI 3.0-style schema objects
         // Nullable
-        if (Array.isArray(convertedSchemaObject.type)) {
-          const nullTypeIndex = convertedSchemaObject.type.findIndex(
-            (type) => type === 'null'
+        if (Array.isArray(schemaObject.type)) {
+          convertedSchemaObject.type = schemaObject.type.find(
+            (t) => t !== 'null'
           );
-          if (nullTypeIndex > -1) {
-            convertedSchemaObject.type.splice(nullTypeIndex, 1);
-            convertedSchemaObject.nullable = true;
-          }
+          convertedSchemaObject.nullable =
+            schemaObject.type.includes('null') || undefined;
         }
         // Exclusive minimum and maximum
         const { exclusiveMinimum, exclusiveMaximum } = schemaObject;