@kubb/plugin-zod 0.0.0-canary-20251103132818 → 0.0.0-canary-20251103161135

package/dist/index.js

@@ -1,5 +1,5 @@
-import "./components-DpM7dEpH.js";
-import { n as operationsGenerator, t as zodGenerator } from "./generators-pT2oV1kT.js";
+import "./components-BtBB23cQ.js";
+import { n as operationsGenerator, t as zodGenerator } from "./generators-9upbJt-4.js";
 import path from "node:path";
 import { PackageManager, PluginManager, createPlugin, getBarrelFiles, getMode } from "@kubb/core";
 import { camelCase, pascalCase } from "@kubb/core/transformers";

package/dist/{types-Dz_P13wd.d.ts → types-CQSK_Scm.d.cts}

@@ -1,4 +1,3 @@
-import { Fabric, FileManager } from "@kubb/react-fabric";
 import * as OasTypes from "oas/types";
 import { HttpMethods as HttpMethod, OASDocument, SchemaObject, User } from "oas/types";
 import { Operation, Operation as Operation$1 } from "oas/operation";
@@ -6,6 +5,7 @@ import { OpenAPIV3 } from "openapi-types";
 import * as oas_normalize_lib_types0 from "oas-normalize/lib/types";
 import BaseOas from "oas";
 import { KubbFile } from "@kubb/fabric-core/types";
+import { Fabric, FileManager } from "@kubb/react-fabric";
 import { ConsolaInstance, LogLevel } from "consola";
 import { KubbNode } from "@kubb/react-fabric/types";
 
@@ -912,10 +912,7 @@ declare class SchemaGenerator<TOptions extends SchemaGeneratorOptions = SchemaGe
    * optionally adds a union with null.
    */
   parse(props: SchemaProps$1): Schema[];
-  deepSearch<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): Array<SchemaKeywordMapper[T]>;
-  find<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static deepSearch<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): Array<SchemaKeywordMapper[T]>;
-  static findInObject<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static find<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static combineObjects(tree: Schema[] | undefined): Schema[];
   build(...generators: Array<Generator<TPluginOptions>>): Promise<Array<KubbFile.File<TFileMeta>>>;
@@ -1121,4 +1118,4 @@ type ResolvedOptions = {
 type PluginZod = PluginFactoryOptions<'plugin-zod', Options$1, ResolvedOptions, never, ResolvePathOptions>;
 //#endregion
 export { UserPluginWithLifeCycle as a, Schema as i, PluginZod as n, Operation$1 as o, ReactGenerator as r, SchemaObject$1 as s, Options$1 as t };
-//# sourceMappingURL=types-Dz_P13wd.d.ts.map
+//# sourceMappingURL=types-CQSK_Scm.d.cts.map

package/dist/{types-DBZGvY3G.d.cts → types-DcQBOr_-.d.ts}

@@ -1,3 +1,4 @@
+import { Fabric, FileManager } from "@kubb/react-fabric";
 import * as OasTypes from "oas/types";
 import { HttpMethods as HttpMethod, OASDocument, SchemaObject, User } from "oas/types";
 import { Operation, Operation as Operation$1 } from "oas/operation";
@@ -5,7 +6,6 @@ import { OpenAPIV3 } from "openapi-types";
 import * as oas_normalize_lib_types0 from "oas-normalize/lib/types";
 import BaseOas from "oas";
 import { KubbFile } from "@kubb/fabric-core/types";
-import { Fabric, FileManager } from "@kubb/react-fabric";
 import { ConsolaInstance, LogLevel } from "consola";
 import { KubbNode } from "@kubb/react-fabric/types";
 
@@ -912,10 +912,7 @@ declare class SchemaGenerator<TOptions extends SchemaGeneratorOptions = SchemaGe
    * optionally adds a union with null.
    */
   parse(props: SchemaProps$1): Schema[];
-  deepSearch<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): Array<SchemaKeywordMapper[T]>;
-  find<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static deepSearch<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): Array<SchemaKeywordMapper[T]>;
-  static findInObject<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static find<T extends keyof SchemaKeywordMapper>(tree: Schema[] | undefined, keyword: T): SchemaKeywordMapper[T] | undefined;
   static combineObjects(tree: Schema[] | undefined): Schema[];
   build(...generators: Array<Generator<TPluginOptions>>): Promise<Array<KubbFile.File<TFileMeta>>>;
@@ -1121,4 +1118,4 @@ type ResolvedOptions = {
 type PluginZod = PluginFactoryOptions<'plugin-zod', Options$1, ResolvedOptions, never, ResolvePathOptions>;
 //#endregion
 export { UserPluginWithLifeCycle as a, Schema as i, PluginZod as n, Operation$1 as o, ReactGenerator as r, SchemaObject$1 as s, Options$1 as t };
-//# sourceMappingURL=types-DBZGvY3G.d.cts.map
+//# sourceMappingURL=types-DcQBOr_-.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-zod",
-  "version": "0.0.0-canary-20251103132818",
+  "version": "0.0.0-canary-20251103161135",
   "description": "Zod schema generator plugin for Kubb, creating type-safe validation schemas from OpenAPI specifications for runtime data validation.",
   "keywords": [
     "zod",
@@ -69,16 +69,16 @@
   ],
   "dependencies": {
     "@kubb/react-fabric": "0.2.14",
-    "@kubb/core": "0.0.0-canary-20251103132818",
-    "@kubb/oas": "0.0.0-canary-20251103132818",
-    "@kubb/plugin-oas": "0.0.0-canary-20251103132818",
-    "@kubb/plugin-ts": "0.0.0-canary-20251103132818"
+    "@kubb/core": "0.0.0-canary-20251103161135",
+    "@kubb/oas": "0.0.0-canary-20251103161135",
+    "@kubb/plugin-oas": "0.0.0-canary-20251103161135",
+    "@kubb/plugin-ts": "0.0.0-canary-20251103161135"
   },
   "devDependencies": {
     "@asteasolutions/zod-to-openapi": "^8.1.0",
     "@hono/zod-openapi": "0.19.2",
     "zod": "^3.25.76",
-    "@kubb/plugin-oas": "0.0.0-canary-20251103132818"
+    "@kubb/plugin-oas": "0.0.0-canary-20251103161135"
   },
   "peerDependencies": {
     "@kubb/react-fabric": "0.2.14"

package/src/components/Zod.tsx

@@ -11,7 +11,7 @@ type Props = {
   typeName?: string
   inferTypeName?: string
   tree: Array<Schema>
-  rawSchema: SchemaObject
+  schema: SchemaObject
   description?: string
   coercion: PluginZod['resolvedOptions']['coercion']
   mapper: PluginZod['resolvedOptions']['mapper']
@@ -25,7 +25,7 @@ export function Zod({
   name,
   typeName,
   tree,
-  rawSchema,
+  schema,
   inferTypeName,
   mapper,
   coercion,
@@ -35,7 +35,7 @@ export function Zod({
   version,
   emptySchemaType,
 }: Props): KubbNode {
-  const hasTuple = !!SchemaGenerator.deepSearch(tree, schemaKeywords.tuple)
+  const hasTuple = !!SchemaGenerator.find(tree, schemaKeywords.tuple)
 
   const schemas = parserZod.sort(tree).filter((item) => {
     if (hasTuple && (isKeyword(item, schemaKeywords.min) || isKeyword(item, schemaKeywords.max))) {
@@ -49,10 +49,7 @@ export function Zod({
     .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 },
-      )
+      return parserZod.parse({ schema, parent: undefined, current: schema, siblings, name }, { mapper, coercion, wrapOutput, version })
     })
     .filter(Boolean)
     .join('')
@@ -71,28 +68,25 @@ export function Zod({
     } else {
       suffix = '.unwrap()'
     }
-  } else {
-    if (firstSchema && isKeyword(firstSchema, schemaKeywords.ref) && version === '3') {
-      suffix = '.schema'
-    }
   }
 
   const emptyValue = parserZod.parse(
     {
+      schema,
       parent: undefined,
       current: {
         keyword: schemaKeywords[emptySchemaType],
       },
       siblings: [],
     },
-    { name, keysToOmit, typeName, description, mapper, coercion, wrapOutput, rawSchema, version },
+    { mapper, coercion, wrapOutput, version },
   )
 
   const baseSchemaOutput =
     [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 wrappedSchemaOutput = wrapOutput ? wrapOutput({ output: baseSchemaOutput, schema }) || baseSchemaOutput : baseSchemaOutput
   const finalOutput = typeName ? `${wrappedSchemaOutput} as unknown as ${version === '4' ? 'z.ZodType' : 'ToZod'}<${typeName}>` : wrappedSchemaOutput
 
   return (

package/src/generators/__snapshots__/createPet.ts

@@ -12,11 +12,11 @@ export const createPets201 = z.unknown()
 /**
  * @description unexpected error
  */
-export const createPetsError = z.lazy(() => error)
+export const createPetsError = error
 
 export const createPetsMutationRequest = z.object({
   name: z.string(),
   tag: z.string(),
 })
 
-export const createPetsMutationResponse = z.lazy(() => createPets201)
+export const createPetsMutationResponse = createPets201

package/src/generators/__snapshots__/createPetWithUnknownTypeUnknown.ts

@@ -12,11 +12,11 @@ export const createPets201 = z.unknown()
 /**
  * @description unexpected error
  */
-export const createPetsError = z.lazy(() => error)
+export const createPetsError = error
 
 export const createPetsMutationRequest = z.object({
   name: z.string(),
   tag: z.string(),
 })
 
-export const createPetsMutationResponse = z.lazy(() => createPets201)
+export const createPetsMutationResponse = createPets201

package/src/generators/__snapshots__/createPetWithUnknownTypeUnknown_wrapOutput.ts

@@ -12,18 +12,16 @@ export const createPets201 = z.unknown()
 /**
  * @description unexpected error
  */
-export const createPetsError = z
-  .lazy(() => error)
-  .openapi({
-    examples: [
-      { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
-      { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
-    ],
-  })
+export const createPetsError = error.openapi({
+  examples: [
+    { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
+    { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
+  ],
+})
 
 export const createPetsMutationRequest = z.object({
   name: z.string().openapi({ example: 'Baxter' }),
   tag: z.string(),
 })
 
-export const createPetsMutationResponse = z.lazy(() => createPets201)
+export const createPetsMutationResponse = createPets201

package/src/generators/__snapshots__/createPetWithUnknownTypeUnknown_wrapOutput_entire_.ts

@@ -12,19 +12,16 @@ export const createPets201 = z.unknown()
 /**
  * @description unexpected error
  */
-export const createPetsError = extendApi(
-  z.lazy(() => error),
-  {
-    examples: [
-      { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
-      { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
-    ],
-  },
-)
+export const createPetsError = extendApi(error, {
+  examples: [
+    { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
+    { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
+  ],
+})
 
 export const createPetsMutationRequest = z.object({
   name: extendApi(z.string(), { example: 'Baxter' }),
   tag: z.string(),
 })
 
-export const createPetsMutationResponse = z.lazy(() => createPets201)
+export const createPetsMutationResponse = createPets201

package/src/generators/__snapshots__/createPet_wrapOutput.ts

@@ -12,18 +12,16 @@ export const createPets201 = z.unknown()
 /**
  * @description unexpected error
  */
-export const createPetsError = z
-  .lazy(() => error)
-  .openapi({
-    examples: [
-      { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
-      { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
-    ],
-  })
+export const createPetsError = error.openapi({
+  examples: [
+    { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
+    { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
+  ],
+})
 
 export const createPetsMutationRequest = z.object({
   name: z.string().openapi({ example: 'Baxter' }),
   tag: z.string(),
 })
 
-export const createPetsMutationResponse = z.lazy(() => createPets201)
+export const createPetsMutationResponse = createPets201

package/src/generators/__snapshots__/discriminator.ts

@@ -5,32 +5,24 @@
 import { z } from 'zod'
 
 export const advanced = z.union([
-  z
-    .lazy(() => enumerationValueSpecificationDto)
-    .and(
-      z.object({
-        type: z.literal('enum'),
-      }),
-    ),
-  z
-    .lazy(() => rangeValueSpecificationDto)
-    .and(
-      z.object({
-        type: z.literal('range'),
-      }),
-    ),
-  z
-    .lazy(() => regexValueSpecificationDto)
-    .and(
-      z.object({
-        type: z.literal('regex'),
-      }),
-    ),
-  z
-    .lazy(() => sliderValueSpecificationDto)
-    .and(
-      z.object({
-        type: z.literal('slider'),
-      }),
-    ),
+  enumerationValueSpecificationDto.and(
+    z.object({
+      type: z.literal('enum'),
+    }),
+  ),
+  rangeValueSpecificationDto.and(
+    z.object({
+      type: z.literal('range'),
+    }),
+  ),
+  regexValueSpecificationDto.and(
+    z.object({
+      type: z.literal('regex'),
+    }),
+  ),
+  sliderValueSpecificationDto.and(
+    z.object({
+      type: z.literal('slider'),
+    }),
+  ),
 ])

package/src/generators/__snapshots__/getPets.ts

@@ -12,11 +12,11 @@ export const listPetsQueryParams = z.object({
 /**
  * @description A paged array of pets
  */
-export const listPets200 = z.lazy(() => pets)
+export const listPets200 = pets
 
 /**
  * @description unexpected error
  */
-export const listPetsError = z.lazy(() => error)
+export const listPetsError = error
 
-export const listPetsQueryResponse = z.lazy(() => listPets200)
+export const listPetsQueryResponse = listPets200

package/src/generators/__snapshots__/getPets_wrapOutput.ts

@@ -12,18 +12,16 @@ export const listPetsQueryParams = z.object({
 /**
  * @description A paged array of pets
  */
-export const listPets200 = z.lazy(() => pets)
+export const listPets200 = pets
 
 /**
  * @description unexpected error
  */
-export const listPetsError = z
-  .lazy(() => error)
-  .openapi({
-    examples: [
-      { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
-      { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
-    ],
-  })
+export const listPetsError = error.openapi({
+  examples: [
+    { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
+    { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
+  ],
+})
 
-export const listPetsQueryResponse = z.lazy(() => listPets200)
+export const listPetsQueryResponse = listPets200

package/src/generators/__snapshots__/petArray.ts

@@ -7,8 +7,4 @@ import { z } from 'zod'
 /**
  * @description List of Pet object
  */
-export const petArray = z
-  .array(z.lazy(() => pet))
-  .min(1)
-  .max(3)
-  .describe('List of Pet object')
+export const petArray = z.array(pet).min(1).max(3).describe('List of Pet object')

package/src/generators/__snapshots__/queryAllDefaulted.ts

@@ -16,4 +16,4 @@ export const getThings200 = z.object({
   items: z.array(z.lazy(() => thing)),
 })
 
-export const getThingsQueryResponse = z.lazy(() => getThings200)
+export const getThingsQueryResponse = getThings200

package/src/generators/__snapshots__/queryAllDefaulted_wrapOutput.ts

@@ -13,7 +13,7 @@ export const getThingsQueryParams = z.object({
  * @description A list of things
  */
 export const getThings200 = z.object({
-  items: z.array(z.lazy(() => thing)),
+  items: z.array(thing),
 })
 
-export const getThingsQueryResponse = z.lazy(() => getThings200)
+export const getThingsQueryResponse = getThings200

package/src/generators/__snapshots__/showPetById.ts

@@ -12,11 +12,11 @@ export const showPetByIdPathParams = z.object({
 /**
  * @description Expected response to a valid request
  */
-export const showPetById200 = z.lazy(() => pet)
+export const showPetById200 = pet
 
 /**
  * @description unexpected error
  */
-export const showPetByIdError = z.lazy(() => error)
+export const showPetByIdError = error
 
-export const showPetByIdQueryResponse = z.lazy(() => showPetById200)
+export const showPetByIdQueryResponse = showPetById200

package/src/generators/__snapshots__/showPetById_wrapOutput.ts

@@ -12,18 +12,16 @@ export const showPetByIdPathParams = z.object({
 /**
  * @description Expected response to a valid request
  */
-export const showPetById200 = z.lazy(() => pet)
+export const showPetById200 = pet
 
 /**
  * @description unexpected error
  */
-export const showPetByIdError = z
-  .lazy(() => error)
-  .openapi({
-    examples: [
-      { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
-      { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
-    ],
-  })
+export const showPetByIdError = error.openapi({
+  examples: [
+    { sample: { summary: 'A sample error', value: { code: 1, message: 'A sample error message' } } },
+    { other_example: { summary: 'Another sample error', value: { code: 2, message: 'A totally specific message' } } },
+  ],
+})
 
-export const showPetByIdQueryResponse = z.lazy(() => showPetById200)
+export const showPetByIdQueryResponse = showPetById200

package/src/generators/zodGenerator.tsx

@@ -81,7 +81,7 @@ export const zodGenerator = createReactGenerator<PluginZod>({
             inferTypeName={inferred ? zod.inferTypeName : undefined}
             description={description}
             tree={tree}
-            rawSchema={schemaObject}
+            schema={schemaObject}
             mapper={mapper}
             coercion={coercion}
             keysToOmit={keysToOmit}
@@ -150,7 +150,7 @@ export const zodGenerator = createReactGenerator<PluginZod>({
           inferTypeName={inferred ? zod.inferTypeName : undefined}
           description={schema.value.description}
           tree={schema.tree}
-          rawSchema={schema.value}
+          schema={schema.value}
           mapper={mapper}
           coercion={coercion}
           wrapOutput={wrapOutput}