Allow nullable with default null option

packages/plugin-oas/mocks/petStore.yaml

@@ -136,7 +136,22 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/Pet'
-
+    Toy:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+        description:
+          type: string
+          default: null
+          nullable: true
+      default: null
+      nullble: true
     PageSize:
       type: integer
       minimum: 1

packages/plugin-oas/src/SchemaGenerator.test.ts

@@ -36,6 +36,16 @@ describe('SchemaGenerator core', async () => {
         unknownType: 'unknown',
       },
     },
+    {
+      name: 'Toy',
+      input: '../mocks/petStore.yaml',
+      path: 'Toy',
+      options: {
+        dateType: 'date',
+        transformers: {},
+        unknownType: 'unknown',
+      },
+    },
     {
       name: 'PageSize',
       input: '../mocks/petStore.yaml',

packages/plugin-oas/src/SchemaGenerator.ts

@@ -395,8 +395,9 @@ export class SchemaGenerator<
     const min = schema.minimum ?? schema.minLength ?? schema.minItems ?? undefined
     const max = schema.maximum ?? schema.maxLength ?? schema.maxItems ?? undefined
     const nullable = schema.nullable ?? schema['x-nullable'] ?? false
+    const defaultNullAndNullable = schema.default === null && nullable
 
-    if (schema.default !== undefined && !Array.isArray(schema.default)) {
+    if (schema.default !== undefined && !defaultNullAndNullable && !Array.isArray(schema.default)) {
       if (typeof schema.default === 'string') {
         baseItems.push({
           keyword: schemaKeywords.default,

packages/plugin-oas/src/__snapshots__/SchemaGenerator.test.ts.snap

@@ -264,3 +264,84 @@ exports[`SchemaGenerator core > 'Pets' 1`] = `
   },
 ]
 `;
+
+exports[`SchemaGenerator core > 'Toy' 1`] = `
+[
+  {
+    "args": {
+      "additionalProperties": [],
+      "properties": {
+        "description": [
+          {
+            "keyword": "string",
+          },
+          {
+            "args": {
+              "format": undefined,
+              "type": "string",
+            },
+            "keyword": "schema",
+          },
+          {
+            "keyword": "nullable",
+          },
+          {
+            "args": "description",
+            "keyword": "name",
+          },
+          {
+            "keyword": "nullish",
+          },
+        ],
+        "id": [
+          {
+            "keyword": "uuid",
+          },
+          {
+            "args": {
+              "format": "uuid",
+              "type": "string",
+            },
+            "keyword": "schema",
+          },
+          {
+            "args": "id",
+            "keyword": "name",
+          },
+        ],
+        "name": [
+          {
+            "keyword": "string",
+          },
+          {
+            "args": {
+              "format": undefined,
+              "type": "string",
+            },
+            "keyword": "schema",
+          },
+          {
+            "args": "name",
+            "keyword": "name",
+          },
+          {
+            "keyword": "optional",
+          },
+        ],
+      },
+    },
+    "keyword": "object",
+  },
+  {
+    "args": {
+      "format": undefined,
+      "type": "object",
+    },
+    "keyword": "schema",
+  },
+  {
+    "args": null,
+    "keyword": "default",
+  },
+]
+`;

packages/plugin-zod/mocks/petStore.yaml

@@ -215,6 +215,22 @@ components:
         required: ['id', 'name'],
         properties: { id: { type: 'integer', format: 'int64' }, name: { type: 'string' }, tag: { type: 'string' } },
       }
+    Toy:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: string
+          format: uuid
+        name:
+          type: string
+        description:
+          type: string
+          default: null
+          nullable: true
+      default: null
+      nullable: true
     Error:
       type: object
       required:

packages/plugin-zod/src/generators/__snapshots__/toy.ts

@@ -0,0 +1,3 @@
+import { z } from "zod";
+
+ export const toy = z.object({ "id": z.string().uuid(), "name": z.string().optional(), "description": z.string().nullable().nullish() }).nullable();

packages/plugin-zod/src/generators/zodGenerator.test.tsx

@@ -85,6 +85,12 @@ describe('zodGenerator schema', async () => {
         dateType: 'string',
       },
     },
+    {
+      name: 'Toy',
+      path: 'Toy',
+      input: '../../mocks/petStore.yaml',
+      options: {},
+    },
     {
       name: 'OrderDateTypeFalse',
       path: 'Order',