@kubb/plugin-zod 4.0.0 → 4.1.0

package/dist/generators-B66sl9uI.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators-B66sl9uI.js","names":["options"],"sources":["../src/generators/zodGenerator.tsx","../src/generators/operationsGenerator.tsx"],"sourcesContent":["import { createReactGenerator, type OperationSchema as OperationSchemaType, SchemaGenerator, schemaKeywords } from '@kubb/plugin-oas'\nimport { Oas } from '@kubb/plugin-oas/components'\nimport { useOas, useOperationManager, useSchemaManager } from '@kubb/plugin-oas/hooks'\nimport { getBanner, getFooter } from '@kubb/plugin-oas/utils'\nimport { pluginTsName } from '@kubb/plugin-ts'\nimport { File, useApp } from '@kubb/react'\nimport { Zod } from '../components'\nimport type { PluginZod } from '../types'\n\nexport const zodGenerator = createReactGenerator<PluginZod>({\n  name: 'zod',\n  Operation({ operation, options }) {\n    const { coercion: globalCoercion, inferred, typed, mapper, wrapOutput } = options\n\n    const { plugin, pluginManager, mode } = useApp<PluginZod>()\n    const oas = useOas()\n    const { getSchemas, getFile, getGroup } = useOperationManager()\n    const schemaManager = useSchemaManager()\n\n    const file = getFile(operation)\n    const schemas = getSchemas(operation)\n    const schemaGenerator = new SchemaGenerator(options, {\n      oas,\n      plugin,\n      pluginManager,\n      mode,\n      override: options.override,\n    })\n\n    const operationSchemas = [schemas.pathParams, schemas.queryParams, schemas.headerParams, schemas.statusCodes, schemas.request, schemas.response]\n      .flat()\n      .filter(Boolean)\n\n    const mapOperationSchema = ({ name, schema: schemaObject, description, keysToOmit, ...options }: OperationSchemaType, i: number) => {\n      // hack so Params can be optional when needed\n      const required = Array.isArray(schemaObject?.required) ? !!schemaObject.required.length : !!schemaObject?.required\n      const someDefaults = Object.values(schemaObject.properties || {}).some((property) => Object.hasOwn(property, 'default') && property.default !== undefined)\n      const optional = !required && !someDefaults && name.includes('Params')\n\n      const tree = [...schemaGenerator.parse({ schemaObject, name }), optional ? { keyword: schemaKeywords.optional } : undefined].filter(Boolean)\n      const imports = schemaManager.getImports(tree)\n      const group = options.operation ? getGroup(options.operation) : undefined\n\n      const coercion = name.includes('Params') ? { numbers: true, strings: false, dates: true } : globalCoercion\n\n      const zod = {\n        name: schemaManager.getName(name, { type: 'function' }),\n        inferTypeName: schemaManager.getName(name, { type: 'type' }),\n        file: schemaManager.getFile(name),\n      }\n\n      const type = {\n        name: schemaManager.getName(name, {\n          type: 'type',\n          pluginKey: [pluginTsName],\n        }),\n        file: schemaManager.getFile(options.operationName || name, {\n          pluginKey: [pluginTsName],\n          group,\n        }),\n      }\n\n      return (\n        <Oas.Schema key={i} name={name} schemaObject={schemaObject} tree={tree}>\n          {typed && <File.Import isTypeOnly root={file.path} path={type.file.path} name={[type.name]} />}\n          {typed && plugin.options.version === '3' && <File.Import isTypeOnly path={'@kubb/plugin-zod/utils'} name={['ToZod']} />}\n          {imports.map((imp) => (\n            <File.Import key={[imp.path, imp.name, imp.isTypeOnly].join('-')} root={file.path} path={imp.path} name={imp.name} />\n          ))}\n          <Zod\n            name={zod.name}\n            typeName={typed ? type.name : undefined}\n            inferTypeName={inferred ? zod.inferTypeName : undefined}\n            description={description}\n            tree={tree}\n            rawSchema={schemaObject}\n            mapper={mapper}\n            coercion={coercion}\n            keysToOmit={keysToOmit}\n            wrapOutput={wrapOutput}\n            version={plugin.options.version}\n            emptySchemaType={plugin.options.emptySchemaType}\n          />\n        </Oas.Schema>\n      )\n    }\n\n    return (\n      <File\n        baseName={file.baseName}\n        path={file.path}\n        meta={file.meta}\n        banner={getBanner({ oas, output: plugin.options.output, config: pluginManager.config })}\n        footer={getFooter({ oas, output: plugin.options.output })}\n      >\n        <File.Import name={['z']} path={plugin.options.importPath} />\n        {operationSchemas.map(mapOperationSchema)}\n      </File>\n    )\n  },\n  Schema({ schema, options }) {\n    const { coercion, inferred, typed, mapper, importPath, wrapOutput, version } = options\n\n    const { getName, getFile, getImports } = useSchemaManager()\n    const {\n      pluginManager,\n      plugin: {\n        options: { output, emptySchemaType },\n      },\n    } = useApp<PluginZod>()\n    const oas = useOas()\n\n    const imports = getImports(schema.tree)\n\n    const zod = {\n      name: getName(schema.name, { type: 'function' }),\n      inferTypeName: getName(schema.name, { type: 'type' }),\n      file: getFile(schema.name),\n    }\n\n    const type = {\n      name: getName(schema.name, { type: 'type', pluginKey: [pluginTsName] }),\n      file: getFile(schema.name, { pluginKey: [pluginTsName] }),\n    }\n\n    return (\n      <File\n        baseName={zod.file.baseName}\n        path={zod.file.path}\n        meta={zod.file.meta}\n        banner={getBanner({ oas, output, config: pluginManager.config })}\n        footer={getFooter({ oas, output })}\n      >\n        <File.Import name={['z']} path={importPath} />\n        {typed && <File.Import isTypeOnly root={zod.file.path} path={type.file.path} name={[type.name]} />}\n        {typed && <File.Import isTypeOnly path={options.version === '4' ? '@kubb/plugin-zod/utils/v4' : '@kubb/plugin-zod/utils'} name={['ToZod']} />}\n        {imports.map((imp) => (\n          <File.Import key={[imp.path, imp.name, imp.isTypeOnly].join('-')} root={zod.file.path} path={imp.path} name={imp.name} />\n        ))}\n\n        <Zod\n          name={zod.name}\n          typeName={typed ? type.name : undefined}\n          inferTypeName={inferred ? zod.inferTypeName : undefined}\n          description={schema.value.description}\n          tree={schema.tree}\n          rawSchema={schema.value}\n          mapper={mapper}\n          coercion={coercion}\n          wrapOutput={wrapOutput}\n          version={version}\n          emptySchemaType={emptySchemaType}\n        />\n      </File>\n    )\n  },\n})\n","import { createReactGenerator } from '@kubb/plugin-oas'\nimport { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'\nimport { getBanner, getFooter } from '@kubb/plugin-oas/utils'\nimport { File, useApp } from '@kubb/react'\nimport { Operations } from '../components/Operations'\nimport type { PluginZod } from '../types'\n\nexport const operationsGenerator = createReactGenerator<PluginZod>({\n  name: 'operations',\n  Operations({ operations }) {\n    const {\n      pluginManager,\n      plugin: {\n        key: pluginKey,\n        options: { output },\n      },\n    } = useApp<PluginZod>()\n    const oas = useOas()\n    const { getFile, groupSchemasByName } = useOperationManager()\n\n    const name = 'operations'\n    const file = pluginManager.getFile({ name, extname: '.ts', pluginKey })\n\n    const transformedOperations = operations.map((operation) => ({ operation, data: groupSchemasByName(operation, { type: 'function' }) }))\n\n    const imports = Object.entries(transformedOperations)\n      .map(([key, { data, operation }]) => {\n        const names = [data.request, ...Object.values(data.responses), ...Object.values(data.parameters)].filter(Boolean)\n\n        return <File.Import key={key} name={names} root={file.path} path={getFile(operation).path} />\n      })\n      .filter(Boolean)\n\n    return (\n      <File\n        baseName={file.baseName}\n        path={file.path}\n        meta={file.meta}\n        banner={getBanner({ oas, output, config: pluginManager.config })}\n        footer={getFooter({ oas, output })}\n      >\n        {imports}\n        <Operations name={name} operations={transformedOperations} />\n      </File>\n    )\n  },\n})\n"],"mappings":"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"}

package/dist/generators.cjs

@@ -1,5 +1,5 @@
-require('./components-Bv7MaVo7.cjs');
-const require_generators = require('./generators-CrSYV5kr.cjs');
+require('./components-C6PNc1ua.cjs');
+const require_generators = require('./generators-8iZ6rvz2.cjs');
 
 exports.operationsGenerator = require_generators.operationsGenerator;
 exports.zodGenerator = require_generators.zodGenerator;

package/dist/generators.js

@@ -1,4 +1,4 @@
-import "./components-DtKP6doO.js";
-import { operationsGenerator, zodGenerator } from "./generators-BY96mD4w.js";
+import "./components-B1-pLa6g.js";
+import { operationsGenerator, zodGenerator } from "./generators-B66sl9uI.js";
 
 export { operationsGenerator, zodGenerator };

package/dist/index.cjs

@@ -1,5 +1,5 @@
-const require_components = require('./components-Bv7MaVo7.cjs');
-const require_generators = require('./generators-CrSYV5kr.cjs');
+const require_components = require('./components-C6PNc1ua.cjs');
+const require_generators = require('./generators-8iZ6rvz2.cjs');
 let node_path = require("node:path");
 node_path = require_components.__toESM(node_path);
 let __kubb_core = require("@kubb/core");

package/dist/index.js

@@ -1,5 +1,5 @@
-import "./components-DtKP6doO.js";
-import { operationsGenerator, zodGenerator } from "./generators-BY96mD4w.js";
+import "./components-B1-pLa6g.js";
+import { operationsGenerator, zodGenerator } from "./generators-B66sl9uI.js";
 import path from "node:path";
 import { FileManager, PackageManager, PluginManager, createPlugin } from "@kubb/core";
 import { camelCase, pascalCase } from "@kubb/core/transformers";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-zod",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Zod schema generator plugin for Kubb, creating type-safe validation schemas from OpenAPI specifications for runtime data validation.",
   "keywords": [
     "zod",
@@ -41,10 +41,6 @@
       "import": "./dist/utils.js",
       "require": "./dist/utils.cjs"
     },
-    "./utils/v4": {
-      "import": "./dist/utils/v4.js",
-      "require": "./dist/utils/v4.cjs"
-    },
     "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",
@@ -73,20 +69,19 @@
     "!/**/__tests__/**"
   ],
   "dependencies": {
-    "@kubb/core": "4.0.0",
-    "@kubb/oas": "4.0.0",
-    "@kubb/parser-ts": "4.0.0",
-    "@kubb/plugin-oas": "4.0.0",
-    "@kubb/plugin-ts": "4.0.0",
-    "@kubb/react": "4.0.0"
+    "@kubb/core": "4.1.0",
+    "@kubb/parser-ts": "4.1.0",
+    "@kubb/plugin-oas": "4.1.0",
+    "@kubb/plugin-ts": "4.1.0",
+    "@kubb/react": "4.1.0",
+    "@kubb/oas": "4.1.0"
   },
   "devDependencies": {
     "@asteasolutions/zod-to-openapi": "^7.3.4",
     "@hono/zod-openapi": "0.19.2",
     "tsdown": "^0.14.2",
     "zod": "^3.25.76",
-    "@kubb/config-ts": "4.0.0",
-    "@kubb/plugin-oas": "4.0.0"
+    "@kubb/plugin-oas": "4.1.0"
   },
   "peerDependencies": {
     "@kubb/react": "^4.0.0"

package/src/components/Zod.tsx

@@ -45,12 +45,14 @@ export function Zod({
   })
 
   const output = schemas
-    .map((schema, _index, siblings) =>
-      parserZod.parse(
+    .map((schema, index) => {
+      const siblings = schemas.filter((_, i) => i !== index)
+
+      return parserZod.parse(
         { parent: undefined, current: schema, siblings },
         { name, keysToOmit, typeName, description, mapper, coercion, wrapOutput, rawSchema, version },
-      ),
-    )
+      )
+    })
     .filter(Boolean)
     .join('')
 
@@ -86,11 +88,11 @@ export function Zod({
   )
 
   const baseSchemaOutput =
-    [output, keysToOmit?.length ? `${suffix}.omit({ ${keysToOmit.map((key) => `${key}: true`).join(',')} })` : undefined].filter(Boolean).join('') ||
+    [output, keysToOmit?.length ? `${suffix}.omit({ ${keysToOmit.map((key) => `'${key}': true`).join(',')} })` : undefined].filter(Boolean).join('') ||
     emptyValue ||
     ''
   const wrappedSchemaOutput = wrapOutput ? wrapOutput({ output: baseSchemaOutput, schema: rawSchema }) || baseSchemaOutput : baseSchemaOutput
-  const finalOutput = typeName ? `${wrappedSchemaOutput} as unknown as ToZod<${typeName}>` : wrappedSchemaOutput
+  const finalOutput = typeName ? `${wrappedSchemaOutput} as unknown as ${version === '4' ? 'z.ZodType' : 'ToZod'}<${typeName}>` : wrappedSchemaOutput
 
   return (
     <>

package/src/generators/__snapshots__/coercion.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.coerce.number().int(),
   name: z.coerce.string(),
-  date: z.coerce.date().optional(),
-  uuid: z.coerce.string().uuid().optional(),
-  email: z.coerce.string().email().optional(),
-  pattern: z.coerce
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.coerce.string().min(5).max(100).optional(),
+  date: z.optional(z.coerce.date()),
+  uuid: z.optional(z.coerce.string().uuid()),
+  email: z.optional(z.coerce.string().email()),
+  pattern: z.optional(z.coerce.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.coerce.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/coercionDates.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.number().int(),
   name: z.string(),
-  date: z.coerce.date().optional(),
-  uuid: z.string().uuid().optional(),
-  email: z.string().email().optional(),
-  pattern: z
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.string().min(5).max(100).optional(),
+  date: z.optional(z.coerce.date()),
+  uuid: z.optional(z.string().uuid()),
+  email: z.optional(z.string().email()),
+  pattern: z.optional(z.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/coercionNumbers.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.coerce.number().int(),
   name: z.string(),
-  date: z.date().optional(),
-  uuid: z.string().uuid().optional(),
-  email: z.string().email().optional(),
-  pattern: z
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.string().min(5).max(100).optional(),
+  date: z.optional(z.date()),
+  uuid: z.optional(z.string().uuid()),
+  email: z.optional(z.string().email()),
+  pattern: z.optional(z.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/coercionStrings.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.number().int(),
   name: z.coerce.string(),
-  date: z.date().optional(),
-  uuid: z.coerce.string().uuid().optional(),
-  email: z.coerce.string().email().optional(),
-  pattern: z.coerce
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.coerce.string().min(5).max(100).optional(),
+  date: z.optional(z.date()),
+  uuid: z.optional(z.coerce.string().uuid()),
+  email: z.optional(z.coerce.string().email()),
+  pattern: z.optional(z.coerce.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.coerce.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/deletePet.ts

@@ -10,7 +10,7 @@ export const deletePetPathParams = z.object({
 
 export const deletePetHeaderParams = z
   .object({
-    api_key: z.string().optional(),
+    api_key: z.optional(z.string()),
   })
   .optional()
 

package/src/generators/__snapshots__/deletePet_wrapOutput.ts

@@ -10,7 +10,7 @@ export const deletePetPathParams = z.object({
 
 export const deletePetHeaderParams = z
   .object({
-    api_key: z.string().optional(),
+    api_key: z.optional(z.string()),
   })
   .optional()
 

package/src/generators/__snapshots__/example.ts

@@ -5,5 +5,5 @@
 import { z } from 'zod'
 
 export const example = z.object({
-  nestedExamples: z.lazy(() => example).optional(),
+  nestedExamples: z.optional(z.lazy(() => example)),
 })

package/src/generators/__snapshots__/getPets.ts

@@ -5,8 +5,8 @@
 import { z } from 'zod'
 
 export const listPetsQueryParams = z.object({
-  limit: z.string().describe('How many items to return at one time (max 100)').optional(),
-  offset: z.coerce.number().int().default(0),
+  limit: z.optional(z.string().describe('How many items to return at one time (max 100)')),
+  offset: z.optional(z.coerce.number().int().default(0)),
 })
 
 /**

package/src/generators/__snapshots__/getPets_wrapOutput.ts

@@ -5,8 +5,8 @@
 import { z } from '@hono/zod-openapi'
 
 export const listPetsQueryParams = z.object({
-  limit: z.string().describe('How many items to return at one time (max 100)').optional(),
-  offset: z.coerce.number().int().default(0),
+  limit: z.optional(z.string().describe('How many items to return at one time (max 100)')),
+  offset: z.optional(z.coerce.number().int().default(0)),
 })
 
 /**

package/src/generators/__snapshots__/nullable.ts

@@ -6,6 +6,6 @@ import { z } from 'zod'
 
 export const nullable = z
   .object({
-    foo: z.string().nullable().nullish(),
+    foo: z.string().nullish(),
   })
   .nullable()

package/src/generators/__snapshots__/oneof.ts

@@ -6,9 +6,9 @@ import { z } from 'zod'
 
 export const test = z.union([
   z.object({
-    propertyA: z.string().optional(),
+    propertyA: z.optional(z.string()),
   }),
   z.object({
-    propertyA: z.string().optional(),
+    propertyA: z.optional(z.string()),
   }),
 ])

package/src/generators/__snapshots__/optionalPetInfer.ts

@@ -5,9 +5,9 @@
 import { z } from 'zod'
 
 export const optionalPet = z.object({
-  id: z.number().int().optional(),
-  name: z.string().optional(),
-  tag: z.string().optional(),
+  id: z.optional(z.number().int()),
+  name: z.optional(z.string()),
+  tag: z.optional(z.string()),
 })
 
 export type OptionalPet = z.infer<typeof optionalPet>

package/src/generators/__snapshots__/optionalPetTyped.ts

@@ -6,7 +6,7 @@ import type { ToZod } from '@kubb/plugin-zod/utils'
 import { z } from 'zod'
 
 export const optionalPet = z.object({
-  id: z.number().int().optional(),
-  name: z.string().optional(),
-  tag: z.string().optional(),
+  id: z.optional(z.number().int()),
+  name: z.optional(z.string()),
+  tag: z.optional(z.string()),
 }) as unknown as ToZod<OptionalPet>

package/src/generators/__snapshots__/order.ts

@@ -5,10 +5,10 @@
 import { z } from 'zod'
 
 export const order = z.object({
-  id: z.number().int().optional(),
-  petId: z.number().int().optional(),
-  quantity: z.number().int().optional(),
-  shipDate: z.date().optional(),
-  status: z.enum(['placed', 'approved', 'delivered']).describe('Order Status').optional(),
-  complete: z.boolean().optional(),
+  id: z.optional(z.number().int()),
+  petId: z.optional(z.number().int()),
+  quantity: z.optional(z.number().int()),
+  shipDate: z.optional(z.date()),
+  status: z.optional(z.enum(['placed', 'approved', 'delivered']).describe('Order Status')),
+  complete: z.optional(z.boolean()),
 })

package/src/generators/__snapshots__/orderDateTypeFalse.ts

@@ -5,10 +5,10 @@
 import { z } from 'zod'
 
 export const order = z.object({
-  id: z.number().int().optional(),
-  petId: z.number().int().optional(),
-  quantity: z.number().int().optional(),
-  shipDate: z.string().optional(),
-  status: z.enum(['placed', 'approved', 'delivered']).describe('Order Status').optional(),
-  complete: z.boolean().optional(),
+  id: z.optional(z.number().int()),
+  petId: z.optional(z.number().int()),
+  quantity: z.optional(z.number().int()),
+  shipDate: z.optional(z.string()),
+  status: z.optional(z.enum(['placed', 'approved', 'delivered']).describe('Order Status')),
+  complete: z.optional(z.boolean()),
 })

package/src/generators/__snapshots__/orderDateTypeString.ts

@@ -5,10 +5,10 @@
 import { z } from 'zod'
 
 export const order = z.object({
-  id: z.number().int().optional(),
-  petId: z.number().int().optional(),
-  quantity: z.number().int().optional(),
-  shipDate: z.string().datetime().optional(),
-  status: z.enum(['placed', 'approved', 'delivered']).describe('Order Status').optional(),
-  complete: z.boolean().optional(),
+  id: z.optional(z.number().int()),
+  petId: z.optional(z.number().int()),
+  quantity: z.optional(z.number().int()),
+  shipDate: z.optional(z.string().datetime()),
+  status: z.optional(z.enum(['placed', 'approved', 'delivered']).describe('Order Status')),
+  complete: z.optional(z.boolean()),
 })

package/src/generators/__snapshots__/pet.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.number().int(),
   name: z.string(),
-  date: z.date().optional(),
-  uuid: z.string().uuid().optional(),
-  email: z.string().email().optional(),
-  pattern: z
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.string().min(5).max(100).optional(),
+  date: z.optional(z.date()),
+  uuid: z.optional(z.string().uuid()),
+  email: z.optional(z.string().email()),
+  pattern: z.optional(z.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/petCoercion.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.coerce.number().int(),
   name: z.coerce.string(),
-  date: z.coerce.date().optional(),
-  uuid: z.coerce.string().uuid().optional(),
-  email: z.coerce.string().email().optional(),
-  pattern: z.coerce
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.coerce.string().min(5).max(100).optional(),
+  date: z.optional(z.coerce.date()),
+  uuid: z.optional(z.coerce.string().uuid()),
+  email: z.optional(z.coerce.string().email()),
+  pattern: z.optional(z.coerce.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.coerce.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/petTupleObject.ts

@@ -9,6 +9,6 @@ import { z } from 'zod'
  */
 export const petTupleObject = z
   .object({
-    tupleProperty: z.tuple([z.string(), z.string()]).optional(),
+    tupleProperty: z.optional(z.tuple([z.string(), z.string()])),
   })
   .describe('Tuple of exact length 2 nested in an object')

package/src/generators/__snapshots__/petV4.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.int(),
   name: z.string(),
-  date: z.date().optional(),
-  uuid: z.uuid().optional(),
-  email: z.email().optional(),
-  pattern: z
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.string().min(5).max(100).optional(),
+  date: z.optional(z.date()),
+  uuid: z.optional(z.uuid()),
+  email: z.optional(z.email()),
+  pattern: z.optional(z.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/petWithMapper.ts

@@ -7,12 +7,9 @@ import { z } from 'zod'
 export const pet = z.object({
   id: z.number().int(),
   name: z.string().email(),
-  date: z.date().optional(),
-  uuid: z.string().uuid().optional(),
-  email: z.string().email().optional(),
-  pattern: z
-    .string()
-    .regex(/^[a-zA-Z0-9]{3}$/)
-    .optional(),
-  tag: z.string().min(5).max(100).optional(),
+  date: z.optional(z.date()),
+  uuid: z.optional(z.string().uuid()),
+  email: z.optional(z.string().email()),
+  pattern: z.optional(z.string().regex(/^[a-zA-Z0-9]{3}$/)),
+  tag: z.optional(z.string().min(5).max(100)),
 })

package/src/generators/__snapshots__/pets.ts

@@ -9,6 +9,6 @@ export const pets = z.array(
   z.object({
     id: z.number().int(),
     name: z.string(),
-    tag: z.string().optional(),
+    tag: z.optional(z.string()),
   }),
 ) as unknown as ToZod<Pets>

package/src/generators/__snapshots__/queryAllDefaulted.ts

@@ -5,8 +5,8 @@
 import { z } from 'zod'
 
 export const getThingsQueryParams = z.object({
-  limit: z.coerce.number().int().min(1).max(100).default(100).describe('Maximum number of things to return'),
-  skip: z.coerce.number().int().min(0).default(0).describe('Number of things to skip'),
+  limit: z.optional(z.coerce.number().int().min(1).max(100).default(100).describe('Maximum number of things to return')),
+  skip: z.optional(z.coerce.number().int().min(0).default(0).describe('Number of things to skip')),
 })
 
 /**

package/src/generators/__snapshots__/queryAllDefaulted_wrapOutput.ts

@@ -5,8 +5,8 @@
 import { z } from '@hono/zod-openapi'
 
 export const getThingsQueryParams = z.object({
-  limit: z.coerce.number().int().min(1).max(100).default(100).describe('Maximum number of things to return'),
-  skip: z.coerce.number().int().min(0).default(0).describe('Number of things to skip'),
+  limit: z.optional(z.coerce.number().int().min(1).max(100).default(100).describe('Maximum number of things to return')),
+  skip: z.optional(z.coerce.number().int().min(0).default(0).describe('Number of things to skip')),
 })
 
 /**

package/src/generators/__snapshots__/toy.ts

@@ -7,7 +7,7 @@ import { z } from 'zod'
 export const toy = z
   .object({
     id: z.string().uuid(),
-    name: z.string().optional(),
-    description: z.string().nullable().nullish(),
+    name: z.optional(z.string()),
+    description: z.string().nullish(),
   })
   .nullable()

package/src/generators/zodGenerator.tsx

@@ -63,7 +63,7 @@ export const zodGenerator = createReactGenerator<PluginZod>({
       return (
         <Oas.Schema key={i} name={name} schemaObject={schemaObject} tree={tree}>
           {typed && <File.Import isTypeOnly root={file.path} path={type.file.path} name={[type.name]} />}
-          {typed && <File.Import isTypeOnly path={plugin.options.version === '4' ? '@kubb/plugin-zod/utils/v4' : '@kubb/plugin-zod/utils'} name={['ToZod']} />}
+          {typed && plugin.options.version === '3' && <File.Import isTypeOnly path={'@kubb/plugin-zod/utils'} name={['ToZod']} />}
           {imports.map((imp) => (
             <File.Import key={[imp.path, imp.name, imp.isTypeOnly].join('-')} root={file.path} path={imp.path} name={imp.name} />
           ))}