@kubb/plugin-zod 5.0.0-beta.15 → 5.0.0-beta.22

package/dist/index.js

@@ -339,27 +339,26 @@ function lengthChecksMini({ min, max, pattern }) {
 * to a schema value string using the chainable Zod v4 API.
 */
 function applyModifiers({ value, nullable, optional, nullish, defaultValue, description }) {
-	let result = value;
-	if (nullish || nullable && optional) result = `${result}.nullish()`;
-	else if (optional) result = `${result}.optional()`;
-	else if (nullable) result = `${result}.nullable()`;
-	if (defaultValue !== void 0) result = `${result}.default(${formatDefault(defaultValue)})`;
-	if (description) result = `${result}.describe(${stringify(description)})`;
-	return result;
+	const withModifier = (() => {
+		if (nullish || nullable && optional) return `${value}.nullish()`;
+		if (optional) return `${value}.optional()`;
+		if (nullable) return `${value}.nullable()`;
+		return value;
+	})();
+	const withDefault = defaultValue !== void 0 ? `${withModifier}.default(${formatDefault(defaultValue)})` : withModifier;
+	return description ? `${withDefault}.describe(${stringify(description)})` : withDefault;
 }
 /**
 * Apply nullable / optional / nullish modifiers using the functional `zod/mini` API
 * (`z.nullable()`, `z.optional()`, `z.nullish()`).
 */
 function applyMiniModifiers({ value, nullable, optional, nullish, defaultValue }) {
-	let result = value;
-	if (nullish) result = `z.nullish(${result})`;
-	else {
-		if (nullable) result = `z.nullable(${result})`;
-		if (optional) result = `z.optional(${result})`;
-	}
-	if (defaultValue !== void 0) result = `z._default(${result}, ${formatDefault(defaultValue)})`;
-	return result;
+	const withModifier = (() => {
+		if (nullish) return `z.nullish(${value})`;
+		const withNullable = nullable ? `z.nullable(${value})` : value;
+		return optional ? `z.optional(${withNullable})` : withNullable;
+	})();
+	return defaultValue !== void 0 ? `z._default(${withModifier}, ${formatDefault(defaultValue)})` : withModifier;
 }
 //#endregion
 //#region src/printers/printerZod.ts
@@ -373,6 +372,11 @@ function strictOneOfMember$1(member, node) {
 	return member;
 }
 __name(strictOneOfMember$1, "strictOneOfMember");
+function getMemberConstraint(member) {
+	if (member.primitive === "string") return lengthConstraints(ast.narrowSchema(member, "string") ?? {}) || void 0;
+	if (member.primitive === "number" || member.primitive === "integer") return numberConstraints(ast.narrowSchema(member, "number") ?? ast.narrowSchema(member, "integer") ?? {}) || void 0;
+	if (member.primitive === "array") return lengthConstraints(ast.narrowSchema(member, "array") ?? {}) || void 0;
+}
 /**
 * Zod v4 printer built with `definePrinter`.
 *
@@ -445,14 +449,14 @@ const printerZod = ast.definePrinter((options) => {
 				return `z.enum([${nonNullValues.map(formatLiteral).join(", ")}])`;
 			},
 			ref(node) {
-				if (!node.name) return void 0;
+				if (!node.name) return null;
 				const refName = node.ref ? ast.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) {
-				let result = `z.object({\n    ${node.properties.map((prop) => {
+				const objectBase = `z.object({\n    ${node.properties.map((prop) => {
 					const { name: propName, schema } = prop;
 					const meta = ast.syncSchemaRef(schema);
 					const isNullable = meta.nullable;
@@ -467,8 +471,7 @@ const printerZod = ast.definePrinter((options) => {
 						output: baseOutput,
 						schema
 					}) || baseOutput : baseOutput;
-					let descriptionToApply = meta.description;
-					if (schema.type !== "ref" && meta.type === "ref") descriptionToApply = void 0;
+					const descriptionToApply = schema.type !== "ref" && meta.type === "ref" ? void 0 : meta.description;
 					const value = applyModifiers({
 						value: wrappedOutput,
 						nullable: isNullable,
@@ -480,17 +483,19 @@ const printerZod = ast.definePrinter((options) => {
 					if (hasSelfRef) return `get "${propName}"() { return ${value} }`;
 					return `"${propName}": ${value}`;
 				}).join(",\n    ")}\n    })`;
-				if (node.additionalProperties && node.additionalProperties !== true) {
-					const catchallType = this.transform(node.additionalProperties);
-					if (catchallType) result += `.catchall(${catchallType})`;
-				} else if (node.additionalProperties === true) result += `.catchall(${this.transform(ast.createSchema({ type: "unknown" }))})`;
-				else if (node.additionalProperties === false) result += ".strict()";
-				return result;
+				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(ast.createSchema({ type: "unknown" }))})`;
+					if (node.additionalProperties === false) return `${objectBase}.strict()`;
+					return objectBase;
+				})();
 			},
 			array(node) {
-				let result = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(ast.createSchema({ type: "unknown" }))})${lengthConstraints(node)}`;
-				if (node.unique) result += `.refine(items => new Set(items).size === items.length, { message: "Array entries must be unique" })`;
-				return result;
+				const base = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(ast.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(", ")}])`;
@@ -511,47 +516,29 @@ const printerZod = ast.definePrinter((options) => {
 				if (members.length === 0) return "";
 				const [first, ...rest] = members;
 				if (!first) return "";
-				let base = this.transform(first);
-				if (!base) return "";
-				for (const member of rest) {
-					if (member.primitive === "string") {
-						const c = lengthConstraints(ast.narrowSchema(member, "string") ?? {});
-						if (c) {
-							base += c;
-							continue;
-						}
-					} else if (member.primitive === "number" || member.primitive === "integer") {
-						const c = numberConstraints(ast.narrowSchema(member, "number") ?? ast.narrowSchema(member, "integer") ?? {});
-						if (c) {
-							base += c;
-							continue;
-						}
-					} else if (member.primitive === "array") {
-						const c = lengthConstraints(ast.narrowSchema(member, "array") ?? {});
-						if (c) {
-							base += c;
-							continue;
-						}
-					}
+				const firstBase = this.transform(first);
+				if (!firstBase) return "";
+				return rest.reduce((acc, member) => {
+					const constraint = getMemberConstraint(member);
+					if (constraint) return acc + constraint;
 					const transformed = this.transform(member);
-					if (transformed) base = `${base}.and(${transformed})`;
-				}
-				return base;
+					return transformed ? `${acc}.and(${transformed})` : acc;
+				}, firstBase);
 			},
 			...options.nodes
 		},
 		print(node) {
 			const { keysToOmit } = this.options;
-			let base = this.transform(node);
-			if (!base) return null;
+			const transformed = this.transform(node);
+			if (!transformed) return null;
 			const meta = ast.syncSchemaRef(node);
-			if (keysToOmit?.length && meta.primitive === "object" && !(meta.type === "union" && meta.discriminatorPropertyName)) {
-				const lazyMatch = base.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
-				if (lazyMatch) base = `z.lazy(() => ${lazyMatch[1]}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} }))`;
-				else base = `${base}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
-			}
 			return applyModifiers({
-				value: base,
+				value: (() => {
+					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
+					const lazyMatch = transformed.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
+					if (lazyMatch) return `z.lazy(() => ${lazyMatch[1]}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} }))`;
+					return `${transformed}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
+				})(),
 				nullable: meta.nullable,
 				optional: meta.optional,
 				nullish: meta.nullish,
@@ -567,6 +554,11 @@ function strictOneOfMember(member, node) {
 	if (node.type === "object" && (node.additionalProperties === void 0 || node.additionalProperties === false)) return member.replace(/^z\.object\(/, "z.strictObject(");
 	return member;
 }
+function getMemberConstraintMini(member) {
+	if (member.primitive === "string") return lengthChecksMini(ast.narrowSchema(member, "string") ?? {}) || void 0;
+	if (member.primitive === "number" || member.primitive === "integer") return numberChecksMini(ast.narrowSchema(member, "number") ?? ast.narrowSchema(member, "integer") ?? {}) || void 0;
+	if (member.primitive === "array") return lengthChecksMini(ast.narrowSchema(member, "array") ?? {}) || void 0;
+}
 /**
 * Zod v4 **Mini** printer built with `definePrinter`.
 *
@@ -635,7 +627,7 @@ const printerZodMini = ast.definePrinter((options) => {
 				return `z.enum([${nonNullValues.map(formatLiteral).join(", ")}])`;
 			},
 			ref(node) {
-				if (!node.name) return void 0;
+				if (!node.name) return null;
 				const refName = node.ref ? ast.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})`;
@@ -668,9 +660,8 @@ const printerZodMini = ast.definePrinter((options) => {
 				}).join(",\n    ")}\n    })`;
 			},
 			array(node) {
-				let result = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(ast.createSchema({ type: "unknown" }))})${lengthChecksMini(node)}`;
-				if (node.unique) result += `.refine(items => new Set(items).size === items.length, { message: "Array entries must be unique" })`;
-				return result;
+				const base = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(ast.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(", ")}])`;
@@ -691,47 +682,29 @@ const printerZodMini = ast.definePrinter((options) => {
 				if (members.length === 0) return "";
 				const [first, ...rest] = members;
 				if (!first) return "";
-				let base = this.transform(first);
-				if (!base) return "";
-				for (const member of rest) {
-					if (member.primitive === "string") {
-						const c = lengthChecksMini(ast.narrowSchema(member, "string") ?? {});
-						if (c) {
-							base += c;
-							continue;
-						}
-					} else if (member.primitive === "number" || member.primitive === "integer") {
-						const c = numberChecksMini(ast.narrowSchema(member, "number") ?? ast.narrowSchema(member, "integer") ?? {});
-						if (c) {
-							base += c;
-							continue;
-						}
-					} else if (member.primitive === "array") {
-						const c = lengthChecksMini(ast.narrowSchema(member, "array") ?? {});
-						if (c) {
-							base += c;
-							continue;
-						}
-					}
+				const firstBase = this.transform(first);
+				if (!firstBase) return "";
+				return rest.reduce((acc, member) => {
+					const constraint = getMemberConstraintMini(member);
+					if (constraint) return acc + constraint;
 					const transformed = this.transform(member);
-					if (transformed) base = `z.intersection(${base}, ${transformed})`;
-				}
-				return base;
+					return transformed ? `z.intersection(${acc}, ${transformed})` : acc;
+				}, firstBase);
 			},
 			...options.nodes
 		},
 		print(node) {
 			const { keysToOmit } = this.options;
-			let base = this.transform(node);
-			if (!base) return null;
+			const transformed = this.transform(node);
+			if (!transformed) return null;
 			const meta = ast.syncSchemaRef(node);
-			if (keysToOmit?.length && meta.primitive === "object" && !(meta.type === "union" && meta.discriminatorPropertyName)) {
-				const lazyMatch = base.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
-				if (lazyMatch) base = `z.lazy(() => ${lazyMatch[1]}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} }))`;
-				else base = `${base}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
-			}
 			return applyMiniModifiers({
-				value: base,
+				value: (() => {
+					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
+					const lazyMatch = transformed.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
+					if (lazyMatch) return `z.lazy(() => ${lazyMatch[1]}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} }))`;
+					return `${transformed}.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
+				})(),
 				nullable: meta.nullable,
 				optional: meta.optional,
 				nullish: meta.nullish,
@@ -748,7 +721,7 @@ const zodGenerator = defineGenerator({
 	name: "zod",
 	renderer: jsxRendererSync,
 	schema(node, ctx) {
-		const { adapter, config, resolver, root, inputNode } = 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;
@@ -777,7 +750,7 @@ const zodGenerator = defineGenerator({
 			})
 		};
 		const inferTypeName = inferred ? resolver.resolveSchemaTypeName(node.name) : void 0;
-		const cyclicSchemas = ast.findCircularSchemas(inputNode.schemas);
+		const cyclicSchemas = new Set(ctx.meta.circularNames);
 		const schemaPrinter = mini ? getCachedMiniPrinter() : getCachedStdPrinter();
 		function getCachedStdPrinter() {
 			const cached = zodPrinterCache.get(resolver);
@@ -819,11 +792,11 @@ const zodGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -848,7 +821,7 @@ const zodGenerator = defineGenerator({
 		});
 	},
 	operation(node, ctx) {
-		const { adapter, config, resolver, root, inputNode } = ctx;
+		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);
@@ -864,7 +837,7 @@ const zodGenerator = defineGenerator({
 			output,
 			group
 		}) };
-		const cyclicSchemas = ast.findCircularSchemas(inputNode.schemas);
+		const cyclicSchemas = new Set(ctx.meta.circularNames);
 		function renderSchemaEntry({ schema, name, keysToOmit }) {
 			if (!schema) return null;
 			const inferTypeName = inferred ? resolver.resolveTypeName(name) : void 0;
@@ -967,11 +940,11 @@ const zodGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -989,7 +962,7 @@ const zodGenerator = defineGenerator({
 		});
 	},
 	operations(nodes, ctx) {
-		const { config, resolver, root, inputNode } = ctx;
+		const { config, resolver, root } = ctx;
 		const { output, importPath, group, operations, paramsCasing } = ctx.options;
 		if (!operations) return;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
@@ -1036,11 +1009,11 @@ const zodGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),