@kubb/plugin-zod 5.0.0-beta.42 → 5.0.0-beta.64

package/dist/index.cjs

@@ -10,6 +10,7 @@ var __name = (target, value) => __defProp(target, "name", {
 });
 //#endregion
 let _kubb_core = require("@kubb/core");
+let _kubb_ast_utils = require("@kubb/ast/utils");
 let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
 let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
 //#region ../../internals/utils/src/casing.ts
@@ -23,117 +24,57 @@ let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
 function toCamelOrPascal(text, pascal) {
 	return text.trim().replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/(\d)([a-z])/g, "$1 $2").split(/[\s\-_./\\:]+/).filter(Boolean).map((word, i) => {
 		if (word.length > 1 && word === word.toUpperCase()) return word;
-		if (i === 0 && !pascal) return word.charAt(0).toLowerCase() + word.slice(1);
-		return word.charAt(0).toUpperCase() + word.slice(1);
+		return (i === 0 && !pascal ? word.charAt(0).toLowerCase() : word.charAt(0).toUpperCase()) + word.slice(1);
 	}).join("").replace(/[^a-zA-Z0-9]/g, "");
 }
 /**
-* Splits `text` on `.` and applies `transformPart` to each segment.
-* The last segment receives `isLast = true`, all earlier segments receive `false`.
-* Segments are joined with `/` to form a file path.
-*
-* Only splits on dots followed by a letter so that version numbers
-* embedded in operationIds (e.g. `v2025.0`) are kept intact.
-*/
-function applyToFileParts(text, transformPart) {
-	const parts = text.split(/\.(?=[a-zA-Z])/);
-	return parts.map((part, i) => transformPart(part, i === parts.length - 1)).join("/");
-}
-/**
 * Converts `text` to camelCase.
-* When `isFile` is `true`, dot-separated segments are each cased independently and joined with `/`.
 *
-* @example
-* camelCase('hello-world')                   // 'helloWorld'
-* camelCase('pet.petId', { isFile: true })   // 'pet/petId'
+* @example Word boundaries
+* `camelCase('hello-world') // 'helloWorld'`
+*
+* @example With a prefix
+* `camelCase('tag', { prefix: 'create' }) // 'createTag'`
 */
-function camelCase(text, { isFile, prefix = "", suffix = "" } = {}) {
-	if (isFile) return applyToFileParts(text, (part, isLast) => camelCase(part, isLast ? {
-		prefix,
-		suffix
-	} : {}));
+function camelCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
 /**
 * Converts `text` to PascalCase.
-* When `isFile` is `true`, the last dot-separated segment is PascalCased and earlier segments are camelCased.
 *
-* @example
-* pascalCase('hello-world')                  // 'HelloWorld'
-* pascalCase('pet.petId', { isFile: true })  // 'pet/PetId'
+* @example Word boundaries
+* `pascalCase('hello-world') // 'HelloWorld'`
+*
+* @example With a suffix
+* `pascalCase('tag', { suffix: 'schema' }) // 'TagSchema'`
 */
-function pascalCase(text, { isFile, prefix = "", suffix = "" } = {}) {
-	if (isFile) return applyToFileParts(text, (part, isLast) => isLast ? pascalCase(part, {
-		prefix,
-		suffix
-	}) : camelCase(part));
+function pascalCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, true);
 }
 //#endregion
-//#region ../../internals/utils/src/string.ts
+//#region ../../internals/utils/src/fs.ts
 /**
-* Strips a single matching pair of `"..."`, `'...'`, or `` `...` `` from both ends of `text`.
-* Returns the string unchanged when no balanced quote pair is found.
+* Builds a nested file path from a dotted name. Splits on dots that precede a letter
+* (so version numbers embedded in operationIds like `v2025.0` stay intact), camelCases
+* every earlier segment, applies `caseLast` to the final segment, and joins with `/`.
 *
-* @example
-* trimQuotes('"hello"') // 'hello'
-* trimQuotes('hello')   // 'hello'
-*/
-function trimQuotes(text) {
-	if (text.length >= 2) {
-		const first = text[0];
-		const last = text[text.length - 1];
-		if (first === "\"" && last === "\"" || first === "'" && last === "'" || first === "`" && last === "`") return text.slice(1, -1);
-	}
-	return text;
-}
-//#endregion
-//#region ../../internals/utils/src/object.ts
-/**
-* Serializes a primitive value to a JSON string literal, stripping any surrounding quote characters first.
+* Empty segments are dropped before joining. They arise when the name starts with a dot
+* followed by a letter (e.g. `..Schema` splits into `['..', 'Schema']` and `'..'` cases to
+* an empty string). Without this a leading `/` would form, which `path.resolve` reads as an
+* absolute path, letting generated files escape the configured output directory.
 *
-* @example
-* stringify('hello')   // '"hello"'
-* stringify('"hello"') // '"hello"'
-*/
-function stringify(value) {
-	if (value === void 0 || value === null) return "\"\"";
-	return JSON.stringify(trimQuotes(value.toString()));
-}
-/**
-* Converts a plain object into a multiline key-value string suitable for embedding in generated code.
-* Nested objects are recursively stringified with indentation.
+* @example Nested path from a dotted name
+* `toFilePath('pet.petId') // 'pet/petId'`
 *
-* @example
-* stringifyObject({ foo: 'bar', nested: { a: 1 } })
-* // 'foo: bar,\nnested: {\n        a: 1\n      }'
-*/
-function stringifyObject(value) {
-	return Object.entries(value).map(([key, val]) => {
-		if (val !== null && typeof val === "object") return `${key}: {\n        ${stringifyObject(val)}\n      }`;
-		return `${key}: ${val}`;
-	}).filter(Boolean).join(",\n");
-}
-//#endregion
-//#region ../../internals/utils/src/regexp.ts
-/**
-* Converts a pattern string into a `new RegExp(...)` constructor call or a regex literal string.
-* Inline flags expressed as `^(?im)` prefixes are extracted and applied to the resulting expression.
-* Pass `null` as the second argument to emit a `/pattern/flags` literal instead.
+* @example PascalCase the final segment
+* `toFilePath('pet.Pet', pascalCase) // 'pet/Pet'`
 *
-* @example
-* toRegExpString('^(?im)foo')       // → 'new RegExp("foo", "im")'
-* toRegExpString('^(?im)foo', null) // → '/foo/im'
+* @example Suffix applied to the final segment only
+* `toFilePath('tag.tag', (part) => camelCase(part, { suffix: 'schema' })) // 'tag/tagSchema'`
 */
-function toRegExpString(text, func = "RegExp") {
-	const raw = trimQuotes(text);
-	const match = raw.match(/^\^(\(\?([igmsuy]+)\))/i);
-	const replacementTarget = match?.[1] ?? "";
-	const matchedFlags = match?.[2];
-	const cleaned = raw.replace(/^\\?\//, "").replace(/\\?\/$/, "").replace(replacementTarget, "");
-	const { source, flags } = new RegExp(cleaned, matchedFlags);
-	if (func === null) return `/${source}/${flags}`;
-	return `new ${func}(${JSON.stringify(source)}${flags ? `, ${JSON.stringify(flags)}` : ""})`;
+function toFilePath(name, caseLast = camelCase) {
+	const parts = name.split(/\.(?=[a-zA-Z])/);
+	return parts.map((part, i) => i === parts.length - 1 ? caseLast(part) : camelCase(part)).filter(Boolean).join("/");
 }
 //#endregion
 //#region ../../internals/utils/src/reserved.ts
@@ -315,26 +256,24 @@ function resolveContentTypeVariants(entries, baseName) {
 * shared default naming so every plugin groups output consistently:
 *
 * - `path` groups use the second path segment (`/pet/findByStatus` → `pet`).
-* - other groups use `${camelCase(group)}${suffix}` (e.g. `petController`).
+* - other groups use the camelCased group (`pet store` → `petStore`).
 *
 * A user-provided `group.name` always wins over the default namer, so callers stay in
 * control of their output folders. Returns `null` when grouping is disabled, matching the
 * per-plugin convention.
 *
 * @param group - The user-supplied group option, or `undefined` to disable grouping.
-* @param options.suffix - Appended to non-`path` group names, e.g. `'Controller'` or `'Requests'`.
 *
 * @example
 * ```ts
-* createGroupConfig(group, { suffix: 'Controller' }) // plugin-ts, plugin-client, …
-* createGroupConfig(group, { suffix: 'Requests' })   // plugin-cypress, plugin-mcp
+* createGroupConfig(group) // shared across every plugin
 * ```
 */
-function createGroupConfig(group, options) {
+function createGroupConfig(group) {
 	if (!group) return null;
 	const defaultName = (ctx) => {
 		if (group.type === "path") return `${ctx.group.split("/")[1]}`;
-		return `${camelCase(ctx.group)}${options.suffix}`;
+		return camelCase(ctx.group);
 	};
 	return {
 		...group,
@@ -399,7 +338,7 @@ function Operations({ name, operations }) {
 				export: true,
 				name,
 				asConst: true,
-				children: `{${stringifyObject(operationsJSON)}}`
+				children: `{${(0, _kubb_ast_utils.stringifyObject)(operationsJSON)}}`
 			})
 		}),
 		/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
@@ -410,7 +349,7 @@ function Operations({ name, operations }) {
 				export: true,
 				name: "paths",
 				asConst: true,
-				children: `{${stringifyObject(pathsJSON)}}`
+				children: `{${(0, _kubb_ast_utils.stringifyObject)(pathsJSON)}}`
 			})
 		})
 	] });
@@ -497,12 +436,12 @@ function containsCodec(node, seen = /* @__PURE__ */ new Set()) {
 	if (hasCodec(node)) return true;
 	if (node.type === "ref") {
 		if (!node.ref) return false;
-		const refName = _kubb_core.ast.extractRefName(node.ref);
+		const refName = (0, _kubb_ast_utils.extractRefName)(node.ref);
 		if (refName) {
 			if (seen.has(refName)) return false;
 			seen.add(refName);
 		}
-		const resolved = _kubb_core.ast.syncSchemaRef(node);
+		const resolved = (0, _kubb_ast_utils.syncSchemaRef)(node);
 		if (resolved.type === "ref") return false;
 		return containsCodec(resolved, seen);
 	}
@@ -514,6 +453,13 @@ function containsCodec(node, seen = /* @__PURE__ */ new Set()) {
 	return children.some((child) => containsCodec(child, seen));
 }
 /**
+* Collects the names of `$ref` schemas that transitively contain a codec, so the generator can route
+* them to their input (encode) variant.
+*/
+function collectCodecRefNames(node) {
+	return _kubb_core.ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? (0, _kubb_ast_utils.extractRefName)(n.ref) ?? void 0 : void 0 });
+}
+/**
 * Collects all resolved schema names for an operation's parameters and responses
 * into a single lookup object, useful for building imports and type references.
 */
@@ -548,7 +494,7 @@ function buildSchemaNames(node, { params, resolver }) {
 * Objects become `{}`, primitives become their string representation, strings are quoted.
 */
 function formatDefault(value) {
-	if (typeof value === "string") return stringify(value);
+	if (typeof value === "string") return (0, _kubb_ast_utils.stringify)(value);
 	if (typeof value === "object" && value !== null) return "{}";
 	return String(value ?? "");
 }
@@ -557,7 +503,7 @@ function formatDefault(value) {
 * Strings are quoted; numbers and booleans are emitted raw.
 */
 function formatLiteral(v) {
-	if (typeof v === "string") return stringify(v);
+	if (typeof v === "string") return (0, _kubb_ast_utils.stringify)(v);
 	return String(v);
 }
 /**
@@ -581,7 +527,7 @@ function lengthConstraints({ min, max, pattern }) {
 	return [
 		min !== void 0 ? `.min(${min})` : "",
 		max !== void 0 ? `.max(${max})` : "",
-		pattern !== void 0 ? `.regex(${toRegExpString(pattern, null)})` : ""
+		pattern !== void 0 ? `.regex(${(0, _kubb_ast_utils.toRegExpString)(pattern, null)})` : ""
 	].join("");
 }
 /**
@@ -603,7 +549,7 @@ function lengthChecksMini({ min, max, pattern }) {
 	const checks = [];
 	if (min !== void 0) checks.push(`z.minLength(${min})`);
 	if (max !== void 0) checks.push(`z.maxLength(${max})`);
-	if (pattern !== void 0) checks.push(`z.regex(${toRegExpString(pattern, null)})`);
+	if (pattern !== void 0) checks.push(`z.regex(${(0, _kubb_ast_utils.toRegExpString)(pattern, null)})`);
 	return checks.length ? `.check(${checks.join(", ")})` : "";
 }
 /**
@@ -618,7 +564,7 @@ function applyModifiers({ value, nullable, optional, nullish, defaultValue, desc
 		return value;
 	})();
 	const withDefault = defaultValue !== void 0 ? `${withModifier}.default(${formatDefault(defaultValue)})` : withModifier;
-	return description ? `${withDefault}.describe(${stringify(description)})` : withDefault;
+	return description ? `${withDefault}.describe(${(0, _kubb_ast_utils.stringify)(description)})` : withDefault;
 }
 /**
 * Apply nullable / optional / nullish modifiers using the functional `zod/mini` API
@@ -638,7 +584,7 @@ function strictOneOfMember$1(member, node) {
 	if (node.type === "object" && node.additionalProperties === void 0) return `${member}.strict()`;
 	if (node.type === "ref") {
 		if (member.startsWith("z.lazy(")) return member;
-		const schema = _kubb_core.ast.syncSchemaRef(node);
+		const schema = (0, _kubb_ast_utils.syncSchemaRef)(node);
 		if (schema.type === "object" && (schema.additionalProperties === void 0 || schema.additionalProperties === false)) return `${member}.strict()`;
 	}
 	return member;
@@ -723,24 +669,24 @@ const printerZod = _kubb_core.ast.definePrinter((options) => {
 			},
 			ref(node) {
 				if (!node.name) return null;
-				const refName = node.ref ? _kubb_core.ast.extractRefName(node.ref) ?? node.name : node.name;
+				const refName = node.ref ? (0, _kubb_ast_utils.extractRefName)(node.ref) ?? node.name : node.name;
 				const useInputVariant = node.ref != null && this.options.direction === "input" && containsCodec(node);
 				const resolvedName = node.ref ? useInputVariant ? this.options.resolver?.resolveInputSchemaName(refName) ?? refName : this.options.resolver?.default(refName, "function") ?? refName : node.name;
 				if (node.ref && this.options.cyclicSchemas?.has(refName)) return `z.lazy(() => ${resolvedName})`;
 				return resolvedName;
 			},
 			object(node) {
-				const objectBase = `z.object({\n    ${node.properties.map((prop) => {
-					const { name: propName, schema } = prop;
-					const meta = _kubb_core.ast.syncSchemaRef(schema);
-					const isNullable = meta.nullable;
-					const isOptional = schema.optional;
-					const isNullish = schema.nullish;
-					const hasSelfRef = this.options.cyclicSchemas != null && _kubb_core.ast.containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
+				const isCyclic = (schema) => this.options.cyclicSchemas != null && (0, _kubb_ast_utils.containsCircularRef)(schema, { circularSchemas: this.options.cyclicSchemas });
+				const objectBase = `z.object(${(0, _kubb_ast_utils.buildObject)((0, _kubb_ast_utils.mapSchemaProperties)(node, (schema) => {
+					const hasSelfRef = isCyclic(schema);
 					const savedCyclicSchemas = this.options.cyclicSchemas;
 					if (hasSelfRef) this.options.cyclicSchemas = void 0;
-					const baseOutput = this.transform(schema) ?? this.transform(_kubb_core.ast.createSchema({ type: "unknown" }));
+					const baseOutput = this.transform(schema) ?? this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
 					if (hasSelfRef) this.options.cyclicSchemas = savedCyclicSchemas;
+					return baseOutput;
+				}).map(({ name: propName, property, output: baseOutput }) => {
+					const { schema } = property;
+					const meta = (0, _kubb_ast_utils.syncSchemaRef)(schema);
 					const wrappedOutput = this.options.wrapOutput ? this.options.wrapOutput({
 						output: baseOutput,
 						schema
@@ -748,42 +694,41 @@ const printerZod = _kubb_core.ast.definePrinter((options) => {
 					const descriptionToApply = schema.type !== "ref" && meta.type === "ref" ? void 0 : meta.description;
 					const value = applyModifiers({
 						value: wrappedOutput,
-						nullable: isNullable,
-						optional: isOptional,
-						nullish: isNullish,
+						nullable: meta.nullable,
+						optional: schema.optional || property.required === false,
+						nullish: schema.nullish,
 						defaultValue: meta.default,
 						description: descriptionToApply
 					});
-					if (hasSelfRef) return `get "${propName}"() { return ${value} }`;
-					return `"${propName}": ${value}`;
-				}).join(",\n    ")}\n    })`;
+					return isCyclic(schema) ? (0, _kubb_ast_utils.lazyGetter)({
+						name: propName,
+						body: value
+					}) : `${(0, _kubb_ast_utils.objectKey)(propName)}: ${value}`;
+				}))})`;
 				return (() => {
 					if (node.additionalProperties && node.additionalProperties !== true) {
 						const catchallType = this.transform(node.additionalProperties);
 						return catchallType ? `${objectBase}.catchall(${catchallType})` : objectBase;
 					}
-					if (node.additionalProperties === true) return `${objectBase}.catchall(${this.transform(_kubb_core.ast.createSchema({ type: "unknown" }))})`;
+					if (node.additionalProperties === true) return `${objectBase}.catchall(${this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})`;
 					if (node.additionalProperties === false) return `${objectBase}.strict()`;
 					return objectBase;
 				})();
 			},
 			array(node) {
-				const base = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(_kubb_core.ast.createSchema({ type: "unknown" }))})${lengthConstraints(node)}`;
+				const base = `z.array(${(0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})${lengthConstraints(node)}`;
 				return node.unique ? `${base}.refine(items => new Set(items).size === items.length, { message: "Array entries must be unique" })` : base;
 			},
 			tuple(node) {
-				return `z.tuple([${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ")}])`;
+				return `z.tuple(${(0, _kubb_ast_utils.buildList)((0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean))})`;
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = nodeMembers.map((memberNode) => {
-					const member = this.transform(memberNode);
-					return member && node.strategy === "one" ? strictOneOfMember$1(member, memberNode) : member;
-				}).filter(Boolean);
+				const members = (0, _kubb_ast_utils.mapSchemaMembers)(node, (memberNode) => this.transform(memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember$1(output, schema) : output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
-				if (node.discriminatorPropertyName && !nodeMembers.some((m) => m.type === "intersection")) return `z.discriminatedUnion(${stringify(node.discriminatorPropertyName)}, [${members.join(", ")}])`;
-				return `z.union([${members.join(", ")}])`;
+				if (node.discriminatorPropertyName && !nodeMembers.some((m) => m.type === "intersection")) return `z.discriminatedUnion(${(0, _kubb_ast_utils.stringify)(node.discriminatorPropertyName)}, ${(0, _kubb_ast_utils.buildList)(members)})`;
+				return `z.union(${(0, _kubb_ast_utils.buildList)(members)})`;
 			},
 			intersection(node) {
 				const members = node.members ?? [];
@@ -805,7 +750,7 @@ const printerZod = _kubb_core.ast.definePrinter((options) => {
 			const { keysToOmit } = this.options;
 			const transformed = this.transform(node);
 			if (!transformed) return null;
-			const meta = _kubb_core.ast.syncSchemaRef(node);
+			const meta = (0, _kubb_ast_utils.syncSchemaRef)(node);
 			return applyModifiers({
 				value: (() => {
 					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
@@ -902,54 +847,53 @@ const printerZodMini = _kubb_core.ast.definePrinter((options) => {
 			},
 			ref(node) {
 				if (!node.name) return null;
-				const refName = node.ref ? _kubb_core.ast.extractRefName(node.ref) ?? node.name : node.name;
+				const refName = node.ref ? (0, _kubb_ast_utils.extractRefName)(node.ref) ?? node.name : node.name;
 				const resolvedName = node.ref ? this.options.resolver?.default(refName, "function") ?? refName : node.name;
 				if (node.ref && this.options.cyclicSchemas?.has(refName)) return `z.lazy(() => ${resolvedName})`;
 				return resolvedName;
 			},
 			object(node) {
-				return `z.object({\n    ${node.properties.map((prop) => {
-					const { name: propName, schema } = prop;
-					const meta = _kubb_core.ast.syncSchemaRef(schema);
-					const isNullable = meta.nullable;
-					const isOptional = schema.optional;
-					const isNullish = schema.nullish;
-					const hasSelfRef = this.options.cyclicSchemas != null && _kubb_core.ast.containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
+				const isCyclic = (schema) => this.options.cyclicSchemas != null && (0, _kubb_ast_utils.containsCircularRef)(schema, { circularSchemas: this.options.cyclicSchemas });
+				return `z.object(${(0, _kubb_ast_utils.buildObject)((0, _kubb_ast_utils.mapSchemaProperties)(node, (schema) => {
+					const hasSelfRef = isCyclic(schema);
 					const savedCyclicSchemas = this.options.cyclicSchemas;
 					if (hasSelfRef) this.options.cyclicSchemas = void 0;
-					const baseOutput = this.transform(schema) ?? this.transform(_kubb_core.ast.createSchema({ type: "unknown" }));
+					const baseOutput = this.transform(schema) ?? this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }));
 					if (hasSelfRef) this.options.cyclicSchemas = savedCyclicSchemas;
+					return baseOutput;
+				}).map(({ name: propName, property, output: baseOutput }) => {
+					const { schema } = property;
+					const meta = (0, _kubb_ast_utils.syncSchemaRef)(schema);
 					const value = applyMiniModifiers({
 						value: this.options.wrapOutput ? this.options.wrapOutput({
 							output: baseOutput,
 							schema
 						}) || baseOutput : baseOutput,
-						nullable: isNullable,
-						optional: isOptional,
-						nullish: isNullish,
+						nullable: meta.nullable,
+						optional: schema.optional || property.required === false,
+						nullish: schema.nullish,
 						defaultValue: meta.default
 					});
-					if (hasSelfRef) return `get "${propName}"() { return ${value} }`;
-					return `"${propName}": ${value}`;
-				}).join(",\n    ")}\n    })`;
+					return isCyclic(schema) ? (0, _kubb_ast_utils.lazyGetter)({
+						name: propName,
+						body: value
+					}) : `${(0, _kubb_ast_utils.objectKey)(propName)}: ${value}`;
+				}))})`;
 			},
 			array(node) {
-				const base = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(_kubb_core.ast.createSchema({ type: "unknown" }))})${lengthChecksMini(node)}`;
+				const base = `z.array(${(0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(_kubb_core.ast.factory.createSchema({ type: "unknown" }))})${lengthChecksMini(node)}`;
 				return node.unique ? `${base}.refine(items => new Set(items).size === items.length, { message: "Array entries must be unique" })` : base;
 			},
 			tuple(node) {
-				return `z.tuple([${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ")}])`;
+				return `z.tuple(${(0, _kubb_ast_utils.buildList)((0, _kubb_ast_utils.mapSchemaItems)(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean))})`;
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = nodeMembers.map((memberNode) => {
-					const member = this.transform(memberNode);
-					return member && node.strategy === "one" ? strictOneOfMember(member, memberNode) : member;
-				}).filter(Boolean);
+				const members = (0, _kubb_ast_utils.mapSchemaMembers)(node, (memberNode) => this.transform(memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember(output, schema) : output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
-				if (node.discriminatorPropertyName && !nodeMembers.some((m) => m.type === "intersection")) return `z.discriminatedUnion(${stringify(node.discriminatorPropertyName)}, [${members.join(", ")}])`;
-				return `z.union([${members.join(", ")}])`;
+				if (node.discriminatorPropertyName && !nodeMembers.some((m) => m.type === "intersection")) return `z.discriminatedUnion(${(0, _kubb_ast_utils.stringify)(node.discriminatorPropertyName)}, ${(0, _kubb_ast_utils.buildList)(members)})`;
+				return `z.union(${(0, _kubb_ast_utils.buildList)(members)})`;
 			},
 			intersection(node) {
 				const members = node.members ?? [];
@@ -971,7 +915,7 @@ const printerZodMini = _kubb_core.ast.definePrinter((options) => {
 			const { keysToOmit } = this.options;
 			const transformed = this.transform(node);
 			if (!transformed) return null;
-			const meta = _kubb_core.ast.syncSchemaRef(node);
+			const meta = (0, _kubb_ast_utils.syncSchemaRef)(node);
 			return applyMiniModifiers({
 				value: (() => {
 					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
@@ -1047,17 +991,16 @@ function getMiniPrinter(resolver, params) {
 */
 const zodGenerator = (0, _kubb_core.defineGenerator)({
 	name: "zod",
-	renderer: _kubb_renderer_jsx.jsxRendererSync,
+	renderer: _kubb_renderer_jsx.jsxRenderer,
 	schema(node, ctx) {
 		const { adapter, config, resolver, root } = ctx;
 		const { output, coercion, guidType, mini, wrapOutput, inferred, importPath, group, printer } = ctx.options;
 		const dateType = adapter.options.dateType;
 		if (!node.name) return;
-		const mode = ctx.getMode(output);
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
 		const hasCodec = !mini && containsCodec(node);
-		const codecRefNames = new Set(hasCodec ? _kubb_core.ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? _kubb_core.ast.extractRefName(n.ref) ?? void 0 : void 0 }) : []);
+		const codecRefNames = new Set(hasCodec ? collectCodecRefNames(node) : []);
 		const importEntries = adapter.getImports(node, (schemaName) => ({
 			name: resolver.resolveSchemaName(schemaName),
 			path: resolver.resolveFile({
@@ -1070,7 +1013,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			}).path
 		}));
 		const inputImportEntries = hasCodec ? [...codecRefNames].map((schemaName) => ({
-			name: resolver.resolveInputSchemaName(schemaName),
+			name: [resolver.resolveInputSchemaName(schemaName)],
 			path: resolver.resolveFile({
 				name: schemaName,
 				extname: ".ts"
@@ -1139,7 +1082,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 					path: importPath,
 					isNameSpace: isZodImport
 				}),
-				mode === "split" && imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 					root: meta.file.path,
 					path: imp.path,
 					name: imp.name
@@ -1168,9 +1111,8 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		const { adapter, config, resolver, root } = ctx;
 		const { output, coercion, guidType, mini, wrapOutput, inferred, importPath, group, paramsCasing, printer } = ctx.options;
 		const dateType = adapter.options.dateType;
-		const mode = ctx.getMode(output);
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
-		const params = _kubb_core.ast.caseParams(node.parameters, paramsCasing);
+		const params = (0, _kubb_ast_utils.caseParams)(node.parameters, paramsCasing);
 		const meta = { file: resolver.resolveFile({
 			name: node.operationId,
 			extname: ".ts",
@@ -1185,7 +1127,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		function renderSchemaEntry({ schema, name, keysToOmit, direction = "output" }) {
 			if (!schema) return null;
 			const inferTypeName = inferred ? resolver.resolveTypeName(name) : null;
-			const codecRefNames = direction === "input" && !mini ? new Set(_kubb_core.ast.collect(schema, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? _kubb_core.ast.extractRefName(n.ref) ?? void 0 : void 0 })) : null;
+			const codecRefNames = direction === "input" && !mini ? new Set(collectCodecRefNames(schema)) : null;
 			const imports = adapter.getImports(schema, (schemaName) => ({
 				name: codecRefNames?.has(schemaName) ? resolver.resolveInputSchemaName(schemaName) : resolver.resolveSchemaName(schemaName),
 				path: resolver.resolveFile({
@@ -1227,7 +1169,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				cyclicSchemas,
 				nodes: printer?.nodes
 			})[direction];
-			return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [mode === "split" && imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+			return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [imports.map((imp) => /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 				root: meta.file.path,
 				path: imp.path,
 				name: imp.name
@@ -1244,9 +1186,9 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 		}
 		function buildContentTypeVariants(entries, baseName, decorate, direction) {
 			const variants = resolveContentTypeVariants(entries, baseName);
-			const unionSchema = _kubb_core.ast.createSchema({
+			const unionSchema = _kubb_core.ast.factory.createSchema({
 				type: "union",
-				members: variants.map((variant) => _kubb_core.ast.createSchema({
+				members: variants.map((variant) => _kubb_core.ast.factory.createSchema({
 					type: "ref",
 					name: variant.name
 				}))
@@ -1284,12 +1226,12 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 				name: resolver.resolveSchemaName(schemaName),
 				path: ""
 			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(responseUnionName)) return null;
-			const members = responsesWithSchema.map((res) => _kubb_core.ast.createSchema({
+			const members = responsesWithSchema.map((res) => _kubb_core.ast.factory.createSchema({
 				type: "ref",
 				name: resolver.resolveResponseStatusName(node, res.statusCode)
 			}));
 			return renderSchemaEntry({
-				schema: members.length === 1 ? members[0] : _kubb_core.ast.createSchema({
+				schema: members.length === 1 ? members[0] : _kubb_core.ast.factory.createSchema({
 					type: "union",
 					members
 				}),
@@ -1367,7 +1309,7 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 			return {
 				node,
 				data: buildSchemaNames(node, {
-					params: _kubb_core.ast.caseParams(node.parameters, paramsCasing),
+					params: (0, _kubb_ast_utils.caseParams)(node.parameters, paramsCasing),
 					resolver
 				})
 			};
@@ -1435,14 +1377,16 @@ const zodGenerator = (0, _kubb_core.defineGenerator)({
 /**
 * Default resolver used by `@kubb/plugin-zod`. Decides the names and file
 * paths for every generated Zod schema. Schemas use camelCase with a
-* `Schema` suffix (`listPetsSchema`); their inferred types use PascalCase.
+* `Schema` suffix (`listPetsSchema`); their inferred types use PascalCase
+* with a `SchemaType` suffix (`PetSchemaType`), so the value and the type
+* never share an identifier even when the schema name is all-uppercase.
 *
 * @example Resolve schema and type names
 * ```ts
 * import { resolverZod } from '@kubb/plugin-zod'
 *
 * resolverZod.default('list pets', 'function') // 'listPetsSchema'
-* resolverZod.resolveSchemaTypeName('pet')     // 'PetSchema'
+* resolverZod.resolveSchemaTypeName('pet')     // 'PetSchemaType'
 * ```
 */
 const resolverZod = (0, _kubb_core.defineResolver)(() => {
@@ -1450,17 +1394,14 @@ const resolverZod = (0, _kubb_core.defineResolver)(() => {
 		name: "default",
 		pluginName: "plugin-zod",
 		default(name, type) {
-			const resolved = camelCase(name, {
-				isFile: type === "file",
-				suffix: type ? "schema" : void 0
-			});
-			return type === "file" ? resolved : ensureValidVarName(resolved);
+			if (type === "file") return toFilePath(name, (part) => camelCase(part, { suffix: "schema" }));
+			return ensureValidVarName(camelCase(name, { suffix: type ? "schema" : void 0 }));
 		},
 		resolveSchemaName(name) {
 			return ensureValidVarName(camelCase(name, { suffix: "schema" }));
 		},
 		resolveSchemaTypeName(name) {
-			return ensureValidVarName(pascalCase(name, { suffix: "schema" }));
+			return ensureValidVarName(pascalCase(name, { suffix: "schema type" }));
 		},
 		resolveInputSchemaName(name) {
 			return this.resolveSchemaName(`${name} input`);
@@ -1469,7 +1410,7 @@ const resolverZod = (0, _kubb_core.defineResolver)(() => {
 			return this.resolveSchemaTypeName(`${name} input`);
 		},
 		resolveTypeName(name) {
-			return ensureValidVarName(pascalCase(name));
+			return ensureValidVarName(pascalCase(name, { suffix: "type" }));
 		},
 		resolvePathName(name, type) {
 			return this.default(name, type);
@@ -1535,9 +1476,9 @@ const pluginZodName = "plugin-zod";
 const pluginZod = (0, _kubb_core.definePlugin)((options) => {
 	const { output = {
 		path: "zod",
-		barrelType: "named"
-	}, group, exclude = [], include, override = [], typed = false, operations = false, mini = false, guidType = "uuid", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, wrapOutput = void 0, paramsCasing, printer, resolver: userResolver, transformer: userTransformer, generators: userGenerators = [] } = options;
-	const groupConfig = createGroupConfig(group, { suffix: "Controller" });
+		barrel: { type: "named" }
+	}, group, exclude = [], include, override = [], typed = false, operations = false, mini = false, guidType = "uuid", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, wrapOutput = void 0, paramsCasing, printer, resolver: userResolver, macros: userMacros, generators: userGenerators = [] } = options;
+	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginZodName,
 		options,
@@ -1563,7 +1504,7 @@ const pluginZod = (0, _kubb_core.definePlugin)((options) => {
 				...resolverZod,
 				...userResolver
 			} : resolverZod);
-			if (userTransformer) ctx.setTransformer(userTransformer);
+			if (userMacros?.length) ctx.setMacros(userMacros);
 			ctx.addGenerator(zodGenerator);
 			for (const gen of userGenerators) ctx.addGenerator(gen);
 		} }