fix: zod optional default order

.changeset/odd-plums-tell.md

@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**plugin(zod)**: fix: move `.default()` after `.optional()` to avoid `z.infer` producing required fields

dev/package.json

@@ -31,8 +31,5 @@
     "valibot": "1.3.1",
     "vue": "3.5.25",
     "zod": "4.3.6"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-python-tests/pydantic/v2/package.json

@@ -6,8 +6,5 @@
   "devDependencies": {
     "@hey-api/openapi-python": "workspace:*",
     "typescript": "6.0.2"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-python-tests/sdks/package.json

@@ -6,8 +6,5 @@
   "devDependencies": {
     "@hey-api/openapi-python": "workspace:*",
     "typescript": "6.0.2"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-python/src/plugins/pydantic/v2/walker.ts

@@ -37,8 +37,8 @@ export function createVisitor(
     applyModifiers(result, ctx, options = {}): PydanticFinal {
       const { optional } = options;
 
-      const hasDefault = result.meta.default !== undefined;
-      const needsOptional = optional || hasDefault;
+      const needsDefault = result.meta.default !== undefined;
+      const needsOptional = optional || needsDefault;
       const needsNullable = result.meta.nullable;
 
       let type = result.type;
@@ -48,7 +48,7 @@ export function createVisitor(
         const optionalType = ctx.plugin.external('typing.Optional');
         type = $(optionalType).slice(type ?? ctx.plugin.external('typing.Any'));
         if (needsOptional) {
-          fieldConstraints.default = hasDefault ? result.meta.default : null;
+          fieldConstraints.default = needsDefault ? result.meta.default : null;
         }
       }
 

packages/openapi-ts-tests/main/package.json

@@ -44,8 +44,5 @@
     "typescript": "6.0.2",
     "vue": "3.5.25",
     "zod": "4.3.6"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-ts-tests/nestjs/v11/package.json

@@ -9,8 +9,5 @@
   "devDependencies": {
     "@hey-api/openapi-ts": "workspace:*",
     "typescript": "6.0.2"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-ts-tests/orpc/v1/__snapshots__/3.0.x/default/zod.gen.ts

@@ -36,12 +36,12 @@ export const zPost = z.object({
 export const zCreatePostInput = z.object({
     title: z.string(),
     content: z.string(),
-    status: z.enum(['draft', 'published']).optional().default('draft')
+    status: z.enum(['draft', 'published']).default('draft').optional()
 });
 
 export const zGetUsersQuery = z.object({
-    limit: z.int().optional().default(10),
-    offset: z.int().optional().default(0)
+    limit: z.int().default(10).optional(),
+    offset: z.int().default(0).optional()
 });
 
 /**
@@ -119,7 +119,7 @@ export const zGetPostByIdPath = z.object({
 });
 
 export const zGetPostByIdQuery = z.object({
-    includeComments: z.boolean().optional().default(false)
+    includeComments: z.boolean().default(false).optional()
 });
 
 /**

packages/openapi-ts-tests/orpc/v1/__snapshots__/3.1.x/contracts-custom-naming/zod.gen.ts

@@ -36,12 +36,12 @@ export const zPost = z.object({
 export const zCreatePostInput = z.object({
     title: z.string(),
     content: z.string(),
-    status: z.enum(['draft', 'published']).optional().default('draft')
+    status: z.enum(['draft', 'published']).default('draft').optional()
 });
 
 export const zGetUsersQuery = z.object({
-    limit: z.int().optional().default(10),
-    offset: z.int().optional().default(0)
+    limit: z.int().default(10).optional(),
+    offset: z.int().default(0).optional()
 });
 
 /**
@@ -119,7 +119,7 @@ export const zGetPostByIdPath = z.object({
 });
 
 export const zGetPostByIdQuery = z.object({
-    includeComments: z.boolean().optional().default(false)
+    includeComments: z.boolean().default(false).optional()
 });
 
 /**

packages/openapi-ts-tests/orpc/v1/__snapshots__/3.1.x/contracts-nesting-id/zod.gen.ts

@@ -36,12 +36,12 @@ export const zPost = z.object({
 export const zCreatePostInput = z.object({
     title: z.string(),
     content: z.string(),
-    status: z.enum(['draft', 'published']).optional().default('draft')
+    status: z.enum(['draft', 'published']).default('draft').optional()
 });
 
 export const zGetUsersQuery = z.object({
-    limit: z.int().optional().default(10),
-    offset: z.int().optional().default(0)
+    limit: z.int().default(10).optional(),
+    offset: z.int().default(0).optional()
 });
 
 /**
@@ -119,7 +119,7 @@ export const zGetPostByIdPath = z.object({
 });
 
 export const zGetPostByIdQuery = z.object({
-    includeComments: z.boolean().optional().default(false)
+    includeComments: z.boolean().default(false).optional()
 });
 
 /**

packages/openapi-ts-tests/orpc/v1/__snapshots__/3.1.x/contracts-strategy-by-tags/zod.gen.ts

@@ -36,12 +36,12 @@ export const zPost = z.object({
 export const zCreatePostInput = z.object({
     title: z.string(),
     content: z.string(),
-    status: z.enum(['draft', 'published']).optional().default('draft')
+    status: z.enum(['draft', 'published']).default('draft').optional()
 });
 
 export const zGetUsersQuery = z.object({
-    limit: z.int().optional().default(10),
-    offset: z.int().optional().default(0)
+    limit: z.int().default(10).optional(),
+    offset: z.int().default(0).optional()
 });
 
 /**
@@ -119,7 +119,7 @@ export const zGetPostByIdPath = z.object({
 });
 
 export const zGetPostByIdQuery = z.object({
-    includeComments: z.boolean().optional().default(false)
+    includeComments: z.boolean().default(false).optional()
 });
 
 /**

packages/openapi-ts-tests/orpc/v1/__snapshots__/3.1.x/contracts-strategy-single/zod.gen.ts

@@ -36,12 +36,12 @@ export const zPost = z.object({
 export const zCreatePostInput = z.object({
     title: z.string(),
     content: z.string(),
-    status: z.enum(['draft', 'published']).optional().default('draft')
+    status: z.enum(['draft', 'published']).default('draft').optional()
 });
 
 export const zGetUsersQuery = z.object({
-    limit: z.int().optional().default(10),
-    offset: z.int().optional().default(0)
+    limit: z.int().default(10).optional(),
+    offset: z.int().default(0).optional()
 });
 
 /**
@@ -119,7 +119,7 @@ export const zGetPostByIdPath = z.object({
 });
 
 export const zGetPostByIdQuery = z.object({
-    includeComments: z.boolean().optional().default(false)
+    includeComments: z.boolean().default(false).optional()
 });
 
 /**

packages/openapi-ts-tests/orpc/v1/__snapshots__/3.1.x/default/zod.gen.ts

@@ -36,12 +36,12 @@ export const zPost = z.object({
 export const zCreatePostInput = z.object({
     title: z.string(),
     content: z.string(),
-    status: z.enum(['draft', 'published']).optional().default('draft')
+    status: z.enum(['draft', 'published']).default('draft').optional()
 });
 
 export const zGetUsersQuery = z.object({
-    limit: z.int().optional().default(10),
-    offset: z.int().optional().default(0)
+    limit: z.int().default(10).optional(),
+    offset: z.int().default(0).optional()
 });
 
 /**
@@ -119,7 +119,7 @@ export const zGetPostByIdPath = z.object({
 });
 
 export const zGetPostByIdQuery = z.object({
-    includeComments: z.boolean().optional().default(false)
+    includeComments: z.boolean().default(false).optional()
 });
 
 /**

packages/openapi-ts-tests/orpc/v1/package.json

@@ -12,8 +12,5 @@
     "typescript": "6.0.2",
     "valibot": "1.3.1",
     "zod": "4.3.6"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-ts-tests/sdks/package.json

@@ -9,8 +9,5 @@
   "devDependencies": {
     "@hey-api/openapi-ts": "workspace:*",
     "typescript": "6.0.2"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-ts-tests/valibot/v1/package.json

@@ -10,8 +10,5 @@
     "@hey-api/openapi-ts": "workspace:*",
     "typescript": "6.0.2",
     "valibot": "1.3.1"
-  },
-  "engines": {
-    "node": ">=22.13.0"
   }
 }

packages/openapi-ts-tests/valibot/v1/test/utils.ts

@@ -1,7 +1,8 @@
 import fs from 'node:fs';
 import path from 'node:path';
 
-import { createClient, type UserConfig } from '@hey-api/openapi-ts';
+import type { UserConfig } from '@hey-api/openapi-ts';
+import { createClient } from '@hey-api/openapi-ts';
 import * as v from 'valibot';
 
 import { getSpecsPath } from '../../../utils';

packages/openapi-ts-tests/zod/v3/.gitignore

@@ -1,14 +1,5 @@
 .DS_Store
 .idea
-.tmp
-.tsdown
 logs
 node_modules
-temp
-
-.env
 coverage
-dist
-
-# test files
-.gen

packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/mini/default/zod.gen.ts

@@ -510,19 +510,19 @@ export const zCallWithDefaultParametersQuery = z.object({
 });
 
 export const zCallWithDefaultOptionalParametersQuery = z.object({
-    parameterString: z._default(z.optional(z.string()), 'Hello World!'),
-    parameterNumber: z._default(z.optional(z.number()), 123),
-    parameterBoolean: z._default(z.optional(z.boolean()), true),
-    parameterEnum: z._default(z.optional(z.enum([
+    parameterString: z.optional(z._default(z.string(), 'Hello World!')),
+    parameterNumber: z.optional(z._default(z.number(), 123)),
+    parameterBoolean: z.optional(z._default(z.boolean(), true)),
+    parameterEnum: z.optional(z._default(z.enum([
         'Success',
         'Warning',
         'Error'
-    ])), 'Success')
+    ]), 'Success'))
 });
 
 export const zCallToTestOrderOfParamsQuery = z.object({
-    parameterOptionalStringWithDefault: z._default(z.optional(z.string()), 'Hello World!'),
-    parameterOptionalStringWithEmptyDefault: z._default(z.optional(z.string()), ''),
+    parameterOptionalStringWithDefault: z.optional(z._default(z.string(), 'Hello World!')),
+    parameterOptionalStringWithEmptyDefault: z.optional(z._default(z.string(), '')),
     parameterOptionalStringWithNoDefault: z.optional(z.string()),
     parameterStringWithDefault: z._default(z.string(), 'Hello World!'),
     parameterStringWithEmptyDefault: z._default(z.string(), ''),

packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v3/default/zod.gen.ts

@@ -510,19 +510,19 @@ export const zCallWithDefaultParametersQuery = z.object({
 });
 
 export const zCallWithDefaultOptionalParametersQuery = z.object({
-    parameterString: z.string().optional().default('Hello World!'),
-    parameterNumber: z.number().optional().default(123),
-    parameterBoolean: z.boolean().optional().default(true),
+    parameterString: z.string().default('Hello World!').optional(),
+    parameterNumber: z.number().default(123).optional(),
+    parameterBoolean: z.boolean().default(true).optional(),
     parameterEnum: z.enum([
         'Success',
         'Warning',
         'Error'
-    ]).optional().default('Success')
+    ]).default('Success').optional()
 });
 
 export const zCallToTestOrderOfParamsQuery = z.object({
-    parameterOptionalStringWithDefault: z.string().optional().default('Hello World!'),
-    parameterOptionalStringWithEmptyDefault: z.string().optional().default(''),
+    parameterOptionalStringWithDefault: z.string().default('Hello World!').optional(),
+    parameterOptionalStringWithEmptyDefault: z.string().default('').optional(),
     parameterOptionalStringWithNoDefault: z.string().optional(),
     parameterStringWithDefault: z.string().default('Hello World!'),
     parameterStringWithEmptyDefault: z.string().default(''),

packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v4/default/zod.gen.ts

@@ -510,19 +510,19 @@ export const zCallWithDefaultParametersQuery = z.object({
 });
 
 export const zCallWithDefaultOptionalParametersQuery = z.object({
-    parameterString: z.string().optional().default('Hello World!'),
-    parameterNumber: z.number().optional().default(123),
-    parameterBoolean: z.boolean().optional().default(true),
+    parameterString: z.string().default('Hello World!').optional(),
+    parameterNumber: z.number().default(123).optional(),
+    parameterBoolean: z.boolean().default(true).optional(),
     parameterEnum: z.enum([
         'Success',
         'Warning',
         'Error'
-    ]).optional().default('Success')
+    ]).default('Success').optional()
 });
 
 export const zCallToTestOrderOfParamsQuery = z.object({
-    parameterOptionalStringWithDefault: z.string().optional().default('Hello World!'),
-    parameterOptionalStringWithEmptyDefault: z.string().optional().default(''),
+    parameterOptionalStringWithDefault: z.string().default('Hello World!').optional(),
+    parameterOptionalStringWithEmptyDefault: z.string().default('').optional(),
     parameterOptionalStringWithNoDefault: z.string().optional(),
     parameterStringWithDefault: z.string().default('Hello World!'),
     parameterStringWithEmptyDefault: z.string().default(''),