Merge pull request #192 from asteasolutions/fix/#188-default-should-b…

…e-optional #188 - do not label default schemas as required
asteasolutions · Nov 16, 2023 · eb58a06 · eb58a06
2 parents 81d16d5 + 7b8b2bd
commit eb58a06
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/spec/modifiers/default.spec.ts b/spec/modifiers/default.spec.ts
@@ -56,7 +56,7 @@ describe('default', () => {
     });
   });
 
-  it('supports required defaults', () => {
+  it('supports required types with defaults', () => {
     const schema = z
       .object({
         test: z.string().default('test'),
@@ -72,7 +72,6 @@ describe('default', () => {
             default: 'test',
           },
         },
-        required: ['test'],
       },
     });
   });
@@ -103,7 +102,7 @@ describe('default', () => {
     );
   });
 
-  it('supports required default schemas with refine', () => {
+  it('supports required types with default and refine', () => {
     expectSchema(
       [
         z
@@ -124,7 +123,6 @@ describe('default', () => {
               default: 42,
             },
           },
-          required: ['test'],
         },
       }
     );

diff --git a/spec/modifiers/refine.spec.ts b/spec/modifiers/refine.spec.ts
@@ -107,7 +107,7 @@ describe('refine', () => {
     );
   });
 
-  it('supports required refined schemas with default', () => {
+  it('supports required type schemas with refine and default', () => {
     expectSchema(
       [
         z
@@ -128,7 +128,6 @@ describe('refine', () => {
               default: 42,
             },
           },
-          required: ['test'],
         },
       }
     );

diff --git a/src/openapi-generator.ts b/src/openapi-generator.ts
@@ -1045,10 +1045,6 @@ export class OpenAPIGenerator {
       return this.isOptionalSchema(zodSchema._def.schema);
     }
 
-    if (isZodType(zodSchema, 'ZodDefault')) {
-      return this.isOptionalSchema(zodSchema._def.innerType);
-    }
-
     return zodSchema.isOptional();
   }