Merge pull request #3759 from hey-api/fix/zod-default-order

fix: zod optional default order

Author: mrlubos

.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()
 });
 
 /**