refactor: initialize Zod node with $.object(), call .pretty() in boolean branch only

Copilot · mrlubos · Copilot · commit 714698dacd03 · 2026-03-04T22:40:33.000Z
Co-authored-by: mrlubos &lt;12529395+mrlubos@users.noreply.github.com&gt;
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-metadata-fn/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-metadata-fn/zod.gen.ts
@@ -2,128 +2,56 @@
 
 import * as z from 'zod/mini';
 
-export const zBaz = z._default(z.readonly(z.string().check(z.regex(/foo\nbar/)).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'string'
-})), 'baz');
+export const zBaz = z._default(z.readonly(z.string().check(z.regex(/foo\nbar/)).register(z.globalRegistry, { custom: 'value', title: 'string' })), 'baz');
 
 export const zQux = z.record(z.string(), z.object({
-    qux: z.optional(z.string().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'string'
-    }))
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-})).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+    qux: z.optional(z.string().register(z.globalRegistry, { custom: 'value', title: 'string' }))
+}).register(z.globalRegistry, { custom: 'value', title: 'object' })).register(z.globalRegistry, { custom: 'value', title: 'object' });
 
 /**
  * This is Foo schema.
  */
 export const zFoo = z._default(z.nullable(z.object({
-    foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/)).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'This is foo property.'
-    })),
+    foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/)).register(z.globalRegistry, { custom: 'value', title: 'This is foo property.' })),
     bar: z.optional(z.lazy((): any => zBar)),
-    baz: z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'This is baz property.'
-    })),
-    qux: z._default(z.optional(z.int().check(z.gt(0)).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'This is qux property.'
-    })), 0)
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-})), null);
+    baz: z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, { custom: 'value', title: 'This is baz property.' })),
+    qux: z._default(z.optional(z.int().check(z.gt(0)).register(z.globalRegistry, { custom: 'value', title: 'This is qux property.' })), 0)
+}).register(z.globalRegistry, { custom: 'value', title: 'object' })), null);
 
 /**
  * This is Bar schema.
  */
 export const zBar = z.object({
     foo: z.optional(zFoo)
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'This is Bar schema.'
-});
+}).register(z.globalRegistry, { custom: 'value', title: 'This is Bar schema.' });
 
 /**
  * This is Foo parameter.
  */
-export const zFoo2 = z.string().register(z.globalRegistry, {
-    custom: 'value',
-    title: 'This is Foo parameter.'
-});
+export const zFoo2 = z.string().register(z.globalRegistry, { custom: 'value', title: 'This is Foo parameter.' });
 
 export const zFoo3 = z.object({
     foo: z.optional(zBar)
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+}).register(z.globalRegistry, { custom: 'value', title: 'object' });
 
 export const zPatchFooData = z.object({
     body: z.object({
-        foo: z.optional(z.string().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'string'
-        }))
-    }).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'object'
-    }),
-    path: z.optional(z.never().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'never'
-    })),
+        foo: z.optional(z.string().register(z.globalRegistry, { custom: 'value', title: 'string' }))
+    }).register(z.globalRegistry, { custom: 'value', title: 'object' }),
+    path: z.optional(z.never().register(z.globalRegistry, { custom: 'value', title: 'never' })),
     query: z.optional(z.object({
-        foo: z.optional(z.string().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'This is Foo parameter.'
-        })),
+        foo: z.optional(z.string().register(z.globalRegistry, { custom: 'value', title: 'This is Foo parameter.' })),
         bar: z.optional(zBar),
         baz: z.optional(z.object({
-            baz: z.optional(z.string().register(z.globalRegistry, {
-                custom: 'value',
-                title: 'string'
-            }))
-        }).register(z.globalRegistry, {
-            custom: 'value',
-            title: 'object'
-        })),
-        qux: z.optional(z.iso.date().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'string'
-        })),
-        quux: z.optional(z.iso.datetime().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'string'
-        }))
-    }).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'object'
-    }))
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+            baz: z.optional(z.string().register(z.globalRegistry, { custom: 'value', title: 'string' }))
+        }).register(z.globalRegistry, { custom: 'value', title: 'object' })),
+        qux: z.optional(z.iso.date().register(z.globalRegistry, { custom: 'value', title: 'string' })),
+        quux: z.optional(z.iso.datetime().register(z.globalRegistry, { custom: 'value', title: 'string' }))
+    }).register(z.globalRegistry, { custom: 'value', title: 'object' }))
+}).register(z.globalRegistry, { custom: 'value', title: 'object' });
 
 export const zPostFooData = z.object({
     body: zFoo3,
-    path: z.optional(z.never().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'never'
-    })),
-    query: z.optional(z.never().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'never'
-    }))
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+    path: z.optional(z.never().register(z.globalRegistry, { custom: 'value', title: 'never' })),
+    query: z.optional(z.never().register(z.globalRegistry, { custom: 'value', title: 'never' }))
+}).register(z.globalRegistry, { custom: 'value', title: 'object' });
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-metadata-fn/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-metadata-fn/zod.gen.ts
@@ -2,128 +2,56 @@
 
 import * as z from 'zod';
 
-export const zBaz = z.string().regex(/foo\nbar/).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'string'
-}).readonly().default('baz');
+export const zBaz = z.string().regex(/foo\nbar/).register(z.globalRegistry, { custom: 'value', title: 'string' }).readonly().default('baz');
 
 export const zQux = z.record(z.string(), z.object({
-    qux: z.string().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'string'
-    }).optional()
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-})).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+    qux: z.string().register(z.globalRegistry, { custom: 'value', title: 'string' }).optional()
+}).register(z.globalRegistry, { custom: 'value', title: 'object' })).register(z.globalRegistry, { custom: 'value', title: 'object' });
 
 /**
  * This is Foo schema.
  */
 export const zFoo = z.object({
-    foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'This is foo property.'
-    }).optional(),
+    foo: z.string().regex(/^\d{3}-\d{2}-\d{4}$/).register(z.globalRegistry, { custom: 'value', title: 'This is foo property.' }).optional(),
     bar: z.lazy((): any => zBar).optional(),
-    baz: z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'This is baz property.'
-    }).optional(),
-    qux: z.int().gt(0).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'This is qux property.'
-    }).optional().default(0)
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-}).nullable().default(null);
+    baz: z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, { custom: 'value', title: 'This is baz property.' }).optional(),
+    qux: z.int().gt(0).register(z.globalRegistry, { custom: 'value', title: 'This is qux property.' }).optional().default(0)
+}).register(z.globalRegistry, { custom: 'value', title: 'object' }).nullable().default(null);
 
 /**
  * This is Bar schema.
  */
 export const zBar = z.object({
     foo: zFoo.optional()
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'This is Bar schema.'
-});
+}).register(z.globalRegistry, { custom: 'value', title: 'This is Bar schema.' });
 
 /**
  * This is Foo parameter.
  */
-export const zFoo2 = z.string().register(z.globalRegistry, {
-    custom: 'value',
-    title: 'This is Foo parameter.'
-});
+export const zFoo2 = z.string().register(z.globalRegistry, { custom: 'value', title: 'This is Foo parameter.' });
 
 export const zFoo3 = z.object({
     foo: zBar.optional()
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+}).register(z.globalRegistry, { custom: 'value', title: 'object' });
 
 export const zPatchFooData = z.object({
     body: z.object({
-        foo: z.string().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'string'
-        }).optional()
-    }).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'object'
-    }),
-    path: z.never().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'never'
-    }).optional(),
+        foo: z.string().register(z.globalRegistry, { custom: 'value', title: 'string' }).optional()
+    }).register(z.globalRegistry, { custom: 'value', title: 'object' }),
+    path: z.never().register(z.globalRegistry, { custom: 'value', title: 'never' }).optional(),
     query: z.object({
-        foo: z.string().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'This is Foo parameter.'
-        }).optional(),
+        foo: z.string().register(z.globalRegistry, { custom: 'value', title: 'This is Foo parameter.' }).optional(),
         bar: zBar.optional(),
         baz: z.object({
-            baz: z.string().register(z.globalRegistry, {
-                custom: 'value',
-                title: 'string'
-            }).optional()
-        }).register(z.globalRegistry, {
-            custom: 'value',
-            title: 'object'
-        }).optional(),
-        qux: z.iso.date().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'string'
-        }).optional(),
-        quux: z.iso.datetime().register(z.globalRegistry, {
-            custom: 'value',
-            title: 'string'
-        }).optional()
-    }).register(z.globalRegistry, {
-        custom: 'value',
-        title: 'object'
-    }).optional()
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+            baz: z.string().register(z.globalRegistry, { custom: 'value', title: 'string' }).optional()
+        }).register(z.globalRegistry, { custom: 'value', title: 'object' }).optional(),
+        qux: z.iso.date().register(z.globalRegistry, { custom: 'value', title: 'string' }).optional(),
+        quux: z.iso.datetime().register(z.globalRegistry, { custom: 'value', title: 'string' }).optional()
+    }).register(z.globalRegistry, { custom: 'value', title: 'object' }).optional()
+}).register(z.globalRegistry, { custom: 'value', title: 'object' });
 
 export const zPostFooData = z.object({
     body: zFoo3,
-    path: z.never().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'never'
-    }).optional(),
-    query: z.never().register(z.globalRegistry, {
-        custom: 'value',
-        title: 'never'
-    }).optional()
-}).register(z.globalRegistry, {
-    custom: 'value',
-    title: 'object'
-});
+    path: z.never().register(z.globalRegistry, { custom: 'value', title: 'never' }).optional(),
+    query: z.never().register(z.globalRegistry, { custom: 'value', title: 'never' }).optional()
+}).register(z.globalRegistry, { custom: 'value', title: 'object' });
diff --git a/packages/openapi-ts/src/plugins/zod/mini/walker.ts b/packages/openapi-ts/src/plugins/zod/mini/walker.ts
@@ -208,11 +208,11 @@ export function createVisitor(
       if (!metadata) {
         return result;
       }
-      const node = $.object().pretty();
+      const node = $.object();
       if (typeof metadata === 'function') {
         metadata({ $, node, schema });
       } else if (schema.description) {
-        node.prop('description', $.literal(schema.description));
+        node.pretty().prop('description', $.literal(schema.description));
       }
       if (node.isEmpty) {
         return result;
diff --git a/packages/openapi-ts/src/plugins/zod/v4/walker.ts b/packages/openapi-ts/src/plugins/zod/v4/walker.ts
@@ -225,11 +225,11 @@ export function createVisitor(
       if (!metadata) {
         return result;
       }
-      const node = $.object().pretty();
+      const node = $.object();
       if (typeof metadata === 'function') {
         metadata({ $, node, schema });
       } else if (schema.description) {
-        node.prop('description', $.literal(schema.description));
+        node.pretty().prop('description', $.literal(schema.description));
       }
       if (node.isEmpty) {
         return result;

Original file line number	Diff line number	Diff line change
`@@ -208,11 +208,11 @@ export function createVisitor(`
`208`	`208`	`if (!metadata) {`
`209`	`209`	`return result;`
`210`	`210`	`}`
`211`		`- const node = $.object().pretty();`
	`211`	`+ const node = $.object();`
`212`	`212`	`if (typeof metadata === 'function') {`
`213`	`213`	`metadata({ $, node, schema });`
`214`	`214`	`} else if (schema.description) {`
`215`		`- node.prop('description', $.literal(schema.description));`
	`215`	`+ node.pretty().prop('description', $.literal(schema.description));`
`216`	`216`	`}`
`217`	`217`	`if (node.isEmpty) {`
`218`	`218`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -225,11 +225,11 @@ export function createVisitor(`
`225`	`225`	`if (!metadata) {`
`226`	`226`	`return result;`
`227`	`227`	`}`
`228`		`- const node = $.object().pretty();`
	`228`	`+ const node = $.object();`
`229`	`229`	`if (typeof metadata === 'function') {`
`230`	`230`	`metadata({ $, node, schema });`
`231`	`231`	`} else if (schema.description) {`
`232`		`- node.prop('description', $.literal(schema.description));`
	`232`	`+ node.pretty().prop('description', $.literal(schema.description));`
`233`	`233`	`}`
`234`	`234`	`if (node.isEmpty) {`
`235`	`235`	`return result;`