@kubb/plugin-zod 4.4.1 → 4.5.1

package/dist/{generators-B2hD7k6l.cjs → generators-BOldMlBb.cjs}

@@ -1,12 +1,14 @@
-const require_components = require('./components-BiOh-7_I.cjs');
+const require_components = require('./components-DIUzzW4k.cjs');
+let node_path = require("node:path");
+node_path = require_components.__toESM(node_path);
 let __kubb_plugin_oas = require("@kubb/plugin-oas");
 __kubb_plugin_oas = require_components.__toESM(__kubb_plugin_oas);
 let __kubb_plugin_ts = require("@kubb/plugin-ts");
 __kubb_plugin_ts = require_components.__toESM(__kubb_plugin_ts);
 let __kubb_core_hooks = require("@kubb/core/hooks");
 __kubb_core_hooks = require_components.__toESM(__kubb_core_hooks);
-let __kubb_plugin_oas_components = require("@kubb/plugin-oas/components");
-__kubb_plugin_oas_components = require_components.__toESM(__kubb_plugin_oas_components);
+let __kubb_plugin_oas_generators = require("@kubb/plugin-oas/generators");
+__kubb_plugin_oas_generators = require_components.__toESM(__kubb_plugin_oas_generators);
 let __kubb_plugin_oas_hooks = require("@kubb/plugin-oas/hooks");
 __kubb_plugin_oas_hooks = require_components.__toESM(__kubb_plugin_oas_hooks);
 let __kubb_plugin_oas_utils = require("@kubb/plugin-oas/utils");
@@ -16,21 +18,80 @@ __kubb_react_fabric = require_components.__toESM(__kubb_react_fabric);
 let __kubb_react_fabric_jsx_runtime = require("@kubb/react-fabric/jsx-runtime");
 __kubb_react_fabric_jsx_runtime = require_components.__toESM(__kubb_react_fabric_jsx_runtime);
 
+//#region src/generators/operationsGenerator.tsx
+const operationsGenerator = (0, __kubb_plugin_oas_generators.createReactGenerator)({
+	name: "operations",
+	Operations({ operations, generator, plugin }) {
+		const { key: pluginKey, options: { output, importPath } } = plugin;
+		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
+		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
+		const { getFile, groupSchemasByName } = (0, __kubb_plugin_oas_hooks.useOperationManager)(generator);
+		const name = "operations";
+		const file = pluginManager.getFile({
+			name,
+			extname: ".ts",
+			pluginKey
+		});
+		const transformedOperations = operations.map((operation) => ({
+			operation,
+			data: groupSchemasByName(operation, { type: "function" })
+		}));
+		const imports = Object.entries(transformedOperations).map(([key, { data, operation }]) => {
+			const names = [
+				data.request,
+				...Object.values(data.responses),
+				...Object.values(data.parameters)
+			].filter(Boolean);
+			return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+				name: names,
+				root: file.path,
+				path: getFile(operation).path
+			}, key);
+		}).filter(Boolean);
+		return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric.File, {
+			baseName: file.baseName,
+			path: file.path,
+			meta: file.meta,
+			banner: (0, __kubb_plugin_oas_utils.getBanner)({
+				oas,
+				output,
+				config: pluginManager.config
+			}),
+			footer: (0, __kubb_plugin_oas_utils.getFooter)({
+				oas,
+				output
+			}),
+			children: [
+				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+					isTypeOnly: true,
+					name: ["z"],
+					path: importPath
+				}),
+				imports,
+				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.Operations, {
+					name,
+					operations: transformedOperations
+				})
+			]
+		});
+	}
+});
+
+//#endregion
 //#region src/generators/zodGenerator.tsx
-const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
+const zodGenerator = (0, __kubb_plugin_oas_generators.createReactGenerator)({
 	name: "zod",
-	Operation({ operation, options, instance }) {
-		const { coercion: globalCoercion, inferred, typed, mapper, wrapOutput } = options;
-		const plugin = (0, __kubb_core_hooks.usePlugin)();
+	Operation({ config, operation, generator, plugin }) {
+		const { options, options: { coercion: globalCoercion, inferred, typed, mapper, wrapOutput, version } } = plugin;
 		const mode = (0, __kubb_core_hooks.useMode)();
 		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
 		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
-		const { getSchemas, getFile, getGroup } = (0, __kubb_plugin_oas_hooks.useOperationManager)();
+		const { getSchemas, getFile, getGroup } = (0, __kubb_plugin_oas_hooks.useOperationManager)(generator);
 		const schemaManager = (0, __kubb_plugin_oas_hooks.useSchemaManager)();
 		const file = getFile(operation);
 		const schemas = getSchemas(operation);
 		const schemaGenerator = new __kubb_plugin_oas.SchemaGenerator(options, {
-			fabric: instance.context.fabric,
+			fabric: generator.context.fabric,
 			oas,
 			plugin,
 			pluginManager,
@@ -45,10 +106,11 @@ const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 			schemas.request,
 			schemas.response
 		].flat().filter(Boolean);
-		const mapOperationSchema = ({ name, schema: schemaObject, description, keysToOmit,...options$1 }, i) => {
-			const required = Array.isArray(schemaObject?.required) ? !!schemaObject.required.length : !!schemaObject?.required;
-			const someDefaults = Object.values(schemaObject.properties || {}).some((property) => Object.hasOwn(property, "default") && property.default !== void 0);
-			const optional = !required && !someDefaults && name.includes("Params");
+		const mapOperationSchema = ({ name, schema: schemaObject, description, keysToOmit,...options$1 }) => {
+			const hasProperties = Object.keys(schemaObject || {}).length > 0;
+			const hasDefaults = Object.values(schemaObject.properties || {}).some((prop) => prop && Object.hasOwn(prop, "default"));
+			const optional = !(Array.isArray(schemaObject?.required) ? schemaObject.required.length > 0 : !!schemaObject?.required) && !hasDefaults && hasProperties && name.includes("Params");
+			if (!optional && Array.isArray(schemaObject.required) && !schemaObject.required.length) schemaObject.required = Object.entries(schemaObject.properties || {}).filter(([_key, value]) => value && Object.hasOwn(value, "default")).map(([key]) => key);
 			const tree = [...schemaGenerator.parse({
 				schemaObject,
 				name
@@ -75,47 +137,42 @@ const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					group
 				})
 			};
-			return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_plugin_oas_components.Oas.Schema, {
-				name,
-				schemaObject,
-				tree,
-				children: [
-					typed && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						isTypeOnly: true,
-						root: file.path,
-						path: type.file.path,
-						name: [type.name]
-					}),
-					typed && plugin.options.version === "3" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						isTypeOnly: true,
-						path: "@kubb/plugin-zod/utils",
-						name: ["ToZod"]
-					}),
-					imports.map((imp) => /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						root: file.path,
-						path: imp.path,
-						name: imp.name
-					}, [
-						imp.path,
-						imp.name,
-						imp.isTypeOnly
-					].join("-"))),
-					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.Zod, {
-						name: zod.name,
-						typeName: typed ? type.name : void 0,
-						inferTypeName: inferred ? zod.inferTypeName : void 0,
-						description,
-						tree,
-						rawSchema: schemaObject,
-						mapper,
-						coercion,
-						keysToOmit,
-						wrapOutput,
-						version: plugin.options.version,
-						emptySchemaType: plugin.options.emptySchemaType
-					})
-				]
-			}, i);
+			return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric.Fragment, { children: [
+				typed && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+					isTypeOnly: true,
+					root: file.path,
+					path: type.file.path,
+					name: [type.name]
+				}),
+				typed && version === "3" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+					name: ["ToZod"],
+					root: file.path,
+					path: node_path.default.resolve(config.root, config.output.path, ".kubb/ToZod.ts")
+				}),
+				imports.map((imp) => /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+					root: file.path,
+					path: imp.path,
+					name: imp.name
+				}, [
+					imp.path,
+					imp.name,
+					imp.isTypeOnly
+				].join("-"))),
+				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.Zod, {
+					name: zod.name,
+					typeName: typed ? type.name : void 0,
+					inferTypeName: inferred ? zod.inferTypeName : void 0,
+					description,
+					tree,
+					schema: schemaObject,
+					mapper,
+					coercion,
+					keysToOmit,
+					wrapOutput,
+					version: plugin.options.version,
+					emptySchemaType: plugin.options.emptySchemaType
+				})
+			] });
 		};
 		return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric.File, {
 			baseName: file.baseName,
@@ -136,10 +193,9 @@ const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 			}), operationSchemas.map(mapOperationSchema)]
 		});
 	},
-	Schema({ schema, options }) {
-		const { coercion, inferred, typed, mapper, importPath, wrapOutput, version } = options;
+	Schema({ config, schema, plugin }) {
 		const { getName, getFile, getImports } = (0, __kubb_plugin_oas_hooks.useSchemaManager)();
-		const { options: { output, emptySchemaType } } = (0, __kubb_core_hooks.usePlugin)();
+		const { options: { output, emptySchemaType, coercion, inferred, typed, mapper, importPath, wrapOutput, version } } = plugin;
 		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
 		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
 		const imports = getImports(schema.tree);
@@ -179,10 +235,10 @@ const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					path: type.file.path,
 					name: [type.name]
 				}),
-				typed && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					isTypeOnly: true,
-					path: options.version === "4" ? "@kubb/plugin-zod/utils/v4" : "@kubb/plugin-zod/utils",
-					name: ["ToZod"]
+				typed && version === "3" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+					name: ["ToZod"],
+					root: zod.file.path,
+					path: node_path.default.resolve(config.root, config.output.path, ".kubb/ToZod.ts")
 				}),
 				imports.map((imp) => /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					root: zod.file.path,
@@ -199,7 +255,7 @@ const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					inferTypeName: inferred ? zod.inferTypeName : void 0,
 					description: schema.value.description,
 					tree: schema.tree,
-					rawSchema: schema.value,
+					schema: schema.value,
 					mapper,
 					coercion,
 					wrapOutput,
@@ -211,66 +267,6 @@ const zodGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 	}
 });
 
-//#endregion
-//#region src/generators/operationsGenerator.tsx
-const operationsGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
-	name: "operations",
-	Operations({ operations }) {
-		const { key: pluginKey, options: { output, importPath } } = (0, __kubb_core_hooks.usePlugin)();
-		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
-		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
-		const { getFile, groupSchemasByName } = (0, __kubb_plugin_oas_hooks.useOperationManager)();
-		const name = "operations";
-		const file = pluginManager.getFile({
-			name,
-			extname: ".ts",
-			pluginKey
-		});
-		const transformedOperations = operations.map((operation) => ({
-			operation,
-			data: groupSchemasByName(operation, { type: "function" })
-		}));
-		const imports = Object.entries(transformedOperations).map(([key, { data, operation }]) => {
-			const names = [
-				data.request,
-				...Object.values(data.responses),
-				...Object.values(data.parameters)
-			].filter(Boolean);
-			return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-				name: names,
-				root: file.path,
-				path: getFile(operation).path
-			}, key);
-		}).filter(Boolean);
-		return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric.File, {
-			baseName: file.baseName,
-			path: file.path,
-			meta: file.meta,
-			banner: (0, __kubb_plugin_oas_utils.getBanner)({
-				oas,
-				output,
-				config: pluginManager.config
-			}),
-			footer: (0, __kubb_plugin_oas_utils.getFooter)({
-				oas,
-				output
-			}),
-			children: [
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					isTypeOnly: true,
-					name: ["z"],
-					path: importPath
-				}),
-				imports,
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.Operations, {
-					name,
-					operations: transformedOperations
-				})
-			]
-		});
-	}
-});
-
 //#endregion
 Object.defineProperty(exports, 'operationsGenerator', {
   enumerable: true,
@@ -284,4 +280,4 @@ Object.defineProperty(exports, 'zodGenerator', {
     return zodGenerator;
   }
 });
-//# sourceMappingURL=generators-B2hD7k6l.cjs.map
+//# sourceMappingURL=generators-BOldMlBb.cjs.map

package/dist/generators-BOldMlBb.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators-BOldMlBb.cjs","names":["File","Operations","SchemaGenerator","options","schemaKeywords","pluginTsName","Fragment","File","path","Zod"],"sources":["../src/generators/operationsGenerator.tsx","../src/generators/zodGenerator.tsx"],"sourcesContent":["import { usePluginManager } from '@kubb/core/hooks'\nimport { createReactGenerator } from '@kubb/plugin-oas/generators'\nimport { useOas, useOperationManager } from '@kubb/plugin-oas/hooks'\nimport { getBanner, getFooter } from '@kubb/plugin-oas/utils'\nimport { File } from '@kubb/react-fabric'\nimport { Operations } from '../components/Operations.tsx'\nimport type { PluginZod } from '../types'\n\nexport const operationsGenerator = createReactGenerator<PluginZod>({\n  name: 'operations',\n  Operations({ operations, generator, plugin }) {\n    const {\n      key: pluginKey,\n      options: { output, importPath },\n    } = plugin\n    const pluginManager = usePluginManager()\n\n    const oas = useOas()\n    const { getFile, groupSchemasByName } = useOperationManager(generator)\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        <File.Import isTypeOnly name={['z']} path={importPath} />\n        {imports}\n        <Operations name={name} operations={transformedOperations} />\n      </File>\n    )\n  },\n})\n","import path from 'node:path'\nimport { useMode, usePluginManager } from '@kubb/core/hooks'\nimport { type OperationSchema as OperationSchemaType, SchemaGenerator, schemaKeywords } from '@kubb/plugin-oas'\nimport { createReactGenerator } from '@kubb/plugin-oas/generators'\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, Fragment } from '@kubb/react-fabric'\nimport { Zod } from '../components'\nimport type { PluginZod } from '../types'\n\nexport const zodGenerator = createReactGenerator<PluginZod>({\n  name: 'zod',\n  Operation({ config, operation, generator, plugin }) {\n    const {\n      options,\n      options: { coercion: globalCoercion, inferred, typed, mapper, wrapOutput, version },\n    } = plugin\n\n    const mode = useMode()\n    const pluginManager = usePluginManager()\n\n    const oas = useOas()\n    const { getSchemas, getFile, getGroup } = useOperationManager(generator)\n    const schemaManager = useSchemaManager()\n\n    const file = getFile(operation)\n    const schemas = getSchemas(operation)\n    const schemaGenerator = new SchemaGenerator(options, {\n      fabric: generator.context.fabric,\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) => {\n      const hasProperties = Object.keys(schemaObject || {}).length > 0\n      const hasDefaults = Object.values(schemaObject.properties || {}).some((prop) => prop && Object.hasOwn(prop, 'default'))\n\n      const required = Array.isArray(schemaObject?.required) ? schemaObject.required.length > 0 : !!schemaObject?.required\n      const optional = !required && !hasDefaults && hasProperties && name.includes('Params')\n\n      if (!optional && Array.isArray(schemaObject.required) && !schemaObject.required.length) {\n        schemaObject.required = Object.entries(schemaObject.properties || {})\n          .filter(([_key, value]) => value && Object.hasOwn(value, 'default'))\n          .map(([key]) => key)\n      }\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        <Fragment>\n          {typed && <File.Import isTypeOnly root={file.path} path={type.file.path} name={[type.name]} />}\n          {typed && version === '3' && <File.Import name={['ToZod']} root={file.path} path={path.resolve(config.root, config.output.path, '.kubb/ToZod.ts')} />}\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            schema={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        </Fragment>\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({ config, schema, plugin }) {\n    const { getName, getFile, getImports } = useSchemaManager()\n    const {\n      options: { output, emptySchemaType, coercion, inferred, typed, mapper, importPath, wrapOutput, version },\n    } = plugin\n    const pluginManager = usePluginManager()\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 && version === '3' && (\n          <File.Import name={['ToZod']} root={zod.file.path} path={path.resolve(config.root, config.output.path, '.kubb/ToZod.ts')} />\n        )}\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          schema={schema.value}\n          mapper={mapper}\n          coercion={coercion}\n          wrapOutput={wrapOutput}\n          version={version}\n          emptySchemaType={emptySchemaType}\n        />\n      </File>\n    )\n  },\n})\n"],"mappings":"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"}

package/dist/{generators-CwEOtNXG.js → generators-DpdxKqO8.js}

@@ -1,28 +1,88 @@
-import { n as Operations, t as Zod } from "./components-DUJ6Xkpc.js";
-import { SchemaGenerator, createReactGenerator, schemaKeywords } from "@kubb/plugin-oas";
+import { n as Operations, t as Zod } from "./components-BtBB23cQ.js";
+import path from "node:path";
+import { SchemaGenerator, schemaKeywords } from "@kubb/plugin-oas";
 import { pluginTsName } from "@kubb/plugin-ts";
-import { useMode, usePlugin, usePluginManager } from "@kubb/core/hooks";
-import { Oas } from "@kubb/plugin-oas/components";
+import { useMode, usePluginManager } from "@kubb/core/hooks";
+import { createReactGenerator } from "@kubb/plugin-oas/generators";
 import { useOas, useOperationManager, useSchemaManager } from "@kubb/plugin-oas/hooks";
 import { getBanner, getFooter } from "@kubb/plugin-oas/utils";
-import { File } from "@kubb/react-fabric";
+import { File, Fragment } from "@kubb/react-fabric";
 import { jsx, jsxs } from "@kubb/react-fabric/jsx-runtime";
 
+//#region src/generators/operationsGenerator.tsx
+const operationsGenerator = createReactGenerator({
+	name: "operations",
+	Operations({ operations, generator, plugin }) {
+		const { key: pluginKey, options: { output, importPath } } = plugin;
+		const pluginManager = usePluginManager();
+		const oas = useOas();
+		const { getFile, groupSchemasByName } = useOperationManager(generator);
+		const name = "operations";
+		const file = pluginManager.getFile({
+			name,
+			extname: ".ts",
+			pluginKey
+		});
+		const transformedOperations = operations.map((operation) => ({
+			operation,
+			data: groupSchemasByName(operation, { type: "function" })
+		}));
+		const imports = Object.entries(transformedOperations).map(([key, { data, operation }]) => {
+			const names = [
+				data.request,
+				...Object.values(data.responses),
+				...Object.values(data.parameters)
+			].filter(Boolean);
+			return /* @__PURE__ */ jsx(File.Import, {
+				name: names,
+				root: file.path,
+				path: getFile(operation).path
+			}, key);
+		}).filter(Boolean);
+		return /* @__PURE__ */ jsxs(File, {
+			baseName: file.baseName,
+			path: file.path,
+			meta: file.meta,
+			banner: getBanner({
+				oas,
+				output,
+				config: pluginManager.config
+			}),
+			footer: getFooter({
+				oas,
+				output
+			}),
+			children: [
+				/* @__PURE__ */ jsx(File.Import, {
+					isTypeOnly: true,
+					name: ["z"],
+					path: importPath
+				}),
+				imports,
+				/* @__PURE__ */ jsx(Operations, {
+					name,
+					operations: transformedOperations
+				})
+			]
+		});
+	}
+});
+
+//#endregion
 //#region src/generators/zodGenerator.tsx
 const zodGenerator = createReactGenerator({
 	name: "zod",
-	Operation({ operation, options, instance }) {
-		const { coercion: globalCoercion, inferred, typed, mapper, wrapOutput } = options;
-		const plugin = usePlugin();
+	Operation({ config, operation, generator, plugin }) {
+		const { options, options: { coercion: globalCoercion, inferred, typed, mapper, wrapOutput, version } } = plugin;
 		const mode = useMode();
 		const pluginManager = usePluginManager();
 		const oas = useOas();
-		const { getSchemas, getFile, getGroup } = useOperationManager();
+		const { getSchemas, getFile, getGroup } = useOperationManager(generator);
 		const schemaManager = useSchemaManager();
 		const file = getFile(operation);
 		const schemas = getSchemas(operation);
 		const schemaGenerator = new SchemaGenerator(options, {
-			fabric: instance.context.fabric,
+			fabric: generator.context.fabric,
 			oas,
 			plugin,
 			pluginManager,
@@ -37,10 +97,11 @@ const zodGenerator = createReactGenerator({
 			schemas.request,
 			schemas.response
 		].flat().filter(Boolean);
-		const mapOperationSchema = ({ name, schema: schemaObject, description, keysToOmit,...options$1 }, i) => {
-			const required = Array.isArray(schemaObject?.required) ? !!schemaObject.required.length : !!schemaObject?.required;
-			const someDefaults = Object.values(schemaObject.properties || {}).some((property) => Object.hasOwn(property, "default") && property.default !== void 0);
-			const optional = !required && !someDefaults && name.includes("Params");
+		const mapOperationSchema = ({ name, schema: schemaObject, description, keysToOmit,...options$1 }) => {
+			const hasProperties = Object.keys(schemaObject || {}).length > 0;
+			const hasDefaults = Object.values(schemaObject.properties || {}).some((prop) => prop && Object.hasOwn(prop, "default"));
+			const optional = !(Array.isArray(schemaObject?.required) ? schemaObject.required.length > 0 : !!schemaObject?.required) && !hasDefaults && hasProperties && name.includes("Params");
+			if (!optional && Array.isArray(schemaObject.required) && !schemaObject.required.length) schemaObject.required = Object.entries(schemaObject.properties || {}).filter(([_key, value]) => value && Object.hasOwn(value, "default")).map(([key]) => key);
 			const tree = [...schemaGenerator.parse({
 				schemaObject,
 				name
@@ -67,47 +128,42 @@ const zodGenerator = createReactGenerator({
 					group
 				})
 			};
-			return /* @__PURE__ */ jsxs(Oas.Schema, {
-				name,
-				schemaObject,
-				tree,
-				children: [
-					typed && /* @__PURE__ */ jsx(File.Import, {
-						isTypeOnly: true,
-						root: file.path,
-						path: type.file.path,
-						name: [type.name]
-					}),
-					typed && plugin.options.version === "3" && /* @__PURE__ */ jsx(File.Import, {
-						isTypeOnly: true,
-						path: "@kubb/plugin-zod/utils",
-						name: ["ToZod"]
-					}),
-					imports.map((imp) => /* @__PURE__ */ jsx(File.Import, {
-						root: file.path,
-						path: imp.path,
-						name: imp.name
-					}, [
-						imp.path,
-						imp.name,
-						imp.isTypeOnly
-					].join("-"))),
-					/* @__PURE__ */ jsx(Zod, {
-						name: zod.name,
-						typeName: typed ? type.name : void 0,
-						inferTypeName: inferred ? zod.inferTypeName : void 0,
-						description,
-						tree,
-						rawSchema: schemaObject,
-						mapper,
-						coercion,
-						keysToOmit,
-						wrapOutput,
-						version: plugin.options.version,
-						emptySchemaType: plugin.options.emptySchemaType
-					})
-				]
-			}, i);
+			return /* @__PURE__ */ jsxs(Fragment, { children: [
+				typed && /* @__PURE__ */ jsx(File.Import, {
+					isTypeOnly: true,
+					root: file.path,
+					path: type.file.path,
+					name: [type.name]
+				}),
+				typed && version === "3" && /* @__PURE__ */ jsx(File.Import, {
+					name: ["ToZod"],
+					root: file.path,
+					path: path.resolve(config.root, config.output.path, ".kubb/ToZod.ts")
+				}),
+				imports.map((imp) => /* @__PURE__ */ jsx(File.Import, {
+					root: file.path,
+					path: imp.path,
+					name: imp.name
+				}, [
+					imp.path,
+					imp.name,
+					imp.isTypeOnly
+				].join("-"))),
+				/* @__PURE__ */ jsx(Zod, {
+					name: zod.name,
+					typeName: typed ? type.name : void 0,
+					inferTypeName: inferred ? zod.inferTypeName : void 0,
+					description,
+					tree,
+					schema: schemaObject,
+					mapper,
+					coercion,
+					keysToOmit,
+					wrapOutput,
+					version: plugin.options.version,
+					emptySchemaType: plugin.options.emptySchemaType
+				})
+			] });
 		};
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: file.baseName,
@@ -128,10 +184,9 @@ const zodGenerator = createReactGenerator({
 			}), operationSchemas.map(mapOperationSchema)]
 		});
 	},
-	Schema({ schema, options }) {
-		const { coercion, inferred, typed, mapper, importPath, wrapOutput, version } = options;
+	Schema({ config, schema, plugin }) {
 		const { getName, getFile, getImports } = useSchemaManager();
-		const { options: { output, emptySchemaType } } = usePlugin();
+		const { options: { output, emptySchemaType, coercion, inferred, typed, mapper, importPath, wrapOutput, version } } = plugin;
 		const pluginManager = usePluginManager();
 		const oas = useOas();
 		const imports = getImports(schema.tree);
@@ -171,10 +226,10 @@ const zodGenerator = createReactGenerator({
 					path: type.file.path,
 					name: [type.name]
 				}),
-				typed && /* @__PURE__ */ jsx(File.Import, {
-					isTypeOnly: true,
-					path: options.version === "4" ? "@kubb/plugin-zod/utils/v4" : "@kubb/plugin-zod/utils",
-					name: ["ToZod"]
+				typed && version === "3" && /* @__PURE__ */ jsx(File.Import, {
+					name: ["ToZod"],
+					root: zod.file.path,
+					path: path.resolve(config.root, config.output.path, ".kubb/ToZod.ts")
 				}),
 				imports.map((imp) => /* @__PURE__ */ jsx(File.Import, {
 					root: zod.file.path,
@@ -191,7 +246,7 @@ const zodGenerator = createReactGenerator({
 					inferTypeName: inferred ? zod.inferTypeName : void 0,
 					description: schema.value.description,
 					tree: schema.tree,
-					rawSchema: schema.value,
+					schema: schema.value,
 					mapper,
 					coercion,
 					wrapOutput,
@@ -204,65 +259,5 @@ const zodGenerator = createReactGenerator({
 });
 
 //#endregion
-//#region src/generators/operationsGenerator.tsx
-const operationsGenerator = createReactGenerator({
-	name: "operations",
-	Operations({ operations }) {
-		const { key: pluginKey, options: { output, importPath } } = usePlugin();
-		const pluginManager = usePluginManager();
-		const oas = useOas();
-		const { getFile, groupSchemasByName } = useOperationManager();
-		const name = "operations";
-		const file = pluginManager.getFile({
-			name,
-			extname: ".ts",
-			pluginKey
-		});
-		const transformedOperations = operations.map((operation) => ({
-			operation,
-			data: groupSchemasByName(operation, { type: "function" })
-		}));
-		const imports = Object.entries(transformedOperations).map(([key, { data, operation }]) => {
-			const names = [
-				data.request,
-				...Object.values(data.responses),
-				...Object.values(data.parameters)
-			].filter(Boolean);
-			return /* @__PURE__ */ jsx(File.Import, {
-				name: names,
-				root: file.path,
-				path: getFile(operation).path
-			}, key);
-		}).filter(Boolean);
-		return /* @__PURE__ */ jsxs(File, {
-			baseName: file.baseName,
-			path: file.path,
-			meta: file.meta,
-			banner: getBanner({
-				oas,
-				output,
-				config: pluginManager.config
-			}),
-			footer: getFooter({
-				oas,
-				output
-			}),
-			children: [
-				/* @__PURE__ */ jsx(File.Import, {
-					isTypeOnly: true,
-					name: ["z"],
-					path: importPath
-				}),
-				imports,
-				/* @__PURE__ */ jsx(Operations, {
-					name,
-					operations: transformedOperations
-				})
-			]
-		});
-	}
-});
-
-//#endregion
-export { zodGenerator as n, operationsGenerator as t };
-//# sourceMappingURL=generators-CwEOtNXG.js.map
+export { operationsGenerator as n, zodGenerator as t };
+//# sourceMappingURL=generators-DpdxKqO8.js.map