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

package/dist/index.js

@@ -1,6 +1,6 @@
 import { t as __name } from "./chunk-C0LytTxp.js";
 import { ast, defineGenerator, definePlugin, defineResolver } from "@kubb/core";
-import { buildList, buildObject, extractRefName, objectKey, stringify, stringifyObject, toRegExpString } from "@kubb/ast/utils";
+import { buildList, buildObject, caseParams, containsCircularRef, extractRefName, lazyGetter, mapSchemaItems, mapSchemaMembers, mapSchemaProperties, objectKey, stringify, stringifyObject, syncSchemaRef, toRegExpString } from "@kubb/ast/utils";
 import { Const, File, Type, jsxRenderer } from "@kubb/renderer-jsx";
 import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
 //#region ../../internals/utils/src/casing.ts
@@ -431,7 +431,7 @@ function containsCodec(node, seen = /* @__PURE__ */ new Set()) {
 			if (seen.has(refName)) return false;
 			seen.add(refName);
 		}
-		const resolved = ast.syncSchemaRef(node);
+		const resolved = syncSchemaRef(node);
 		if (resolved.type === "ref") return false;
 		return containsCodec(resolved, seen);
 	}
@@ -443,6 +443,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 ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? 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.
 */
@@ -567,7 +574,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 = ast.syncSchemaRef(node);
+		const schema = syncSchemaRef(node);
 		if (schema.type === "object" && (schema.additionalProperties === void 0 || schema.additionalProperties === false)) return `${member}.strict()`;
 	}
 	return member;
@@ -659,17 +666,17 @@ const printerZod = ast.definePrinter((options) => {
 				return resolvedName;
 			},
 			object(node) {
-				const objectBase = `z.object(${buildObject(node.properties.map((prop) => {
-					const { name: propName, schema } = prop;
-					const meta = ast.syncSchemaRef(schema);
-					const isNullable = meta.nullable;
-					const isOptional = schema.optional;
-					const isNullish = schema.nullish;
-					const hasSelfRef = this.options.cyclicSchemas != null && ast.containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
+				const isCyclic = (schema) => this.options.cyclicSchemas != null && containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
+				const objectBase = `z.object(${buildObject(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(ast.createSchema({ type: "unknown" }));
+					const baseOutput = this.transform(schema) ?? this.transform(ast.factory.createSchema({ type: "unknown" }));
 					if (hasSelfRef) this.options.cyclicSchemas = savedCyclicSchemas;
+					return baseOutput;
+				}).map(({ name: propName, property, output: baseOutput }) => {
+					const { schema } = property;
+					const meta = syncSchemaRef(schema);
 					const wrappedOutput = this.options.wrapOutput ? this.options.wrapOutput({
 						output: baseOutput,
 						schema
@@ -677,38 +684,37 @@ const printerZod = 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 ${objectKey(propName)}() { return ${value} }`;
-					return `${objectKey(propName)}: ${value}`;
+					return isCyclic(schema) ? lazyGetter({
+						name: propName,
+						body: value
+					}) : `${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(ast.createSchema({ type: "unknown" }))})`;
+					if (node.additionalProperties === true) return `${objectBase}.catchall(${this.transform(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(ast.createSchema({ type: "unknown" }))})${lengthConstraints(node)}`;
+				const base = `z.array(${mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(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(${buildList((node.items ?? []).map((item) => this.transform(item)).filter(Boolean))})`;
+				return `z.tuple(${buildList(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 = 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)}, ${buildList(members)})`;
@@ -734,7 +740,7 @@ const printerZod = ast.definePrinter((options) => {
 			const { keysToOmit } = this.options;
 			const transformed = this.transform(node);
 			if (!transformed) return null;
-			const meta = ast.syncSchemaRef(node);
+			const meta = syncSchemaRef(node);
 			return applyModifiers({
 				value: (() => {
 					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
@@ -837,44 +843,43 @@ const printerZodMini = ast.definePrinter((options) => {
 				return resolvedName;
 			},
 			object(node) {
-				return `z.object(${buildObject(node.properties.map((prop) => {
-					const { name: propName, schema } = prop;
-					const meta = ast.syncSchemaRef(schema);
-					const isNullable = meta.nullable;
-					const isOptional = schema.optional;
-					const isNullish = schema.nullish;
-					const hasSelfRef = this.options.cyclicSchemas != null && ast.containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
+				const isCyclic = (schema) => this.options.cyclicSchemas != null && containsCircularRef(schema, { circularSchemas: this.options.cyclicSchemas });
+				return `z.object(${buildObject(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(ast.createSchema({ type: "unknown" }));
+					const baseOutput = this.transform(schema) ?? this.transform(ast.factory.createSchema({ type: "unknown" }));
 					if (hasSelfRef) this.options.cyclicSchemas = savedCyclicSchemas;
+					return baseOutput;
+				}).map(({ name: propName, property, output: baseOutput }) => {
+					const { schema } = property;
+					const meta = 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 ${objectKey(propName)}() { return ${value} }`;
-					return `${objectKey(propName)}: ${value}`;
+					return isCyclic(schema) ? lazyGetter({
+						name: propName,
+						body: value
+					}) : `${objectKey(propName)}: ${value}`;
 				}))})`;
 			},
 			array(node) {
-				const base = `z.array(${(node.items ?? []).map((item) => this.transform(item)).filter(Boolean).join(", ") || this.transform(ast.createSchema({ type: "unknown" }))})${lengthChecksMini(node)}`;
+				const base = `z.array(${mapSchemaItems(node, (item) => this.transform(item)).map(({ output }) => output).filter(Boolean).join(", ") || this.transform(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(${buildList((node.items ?? []).map((item) => this.transform(item)).filter(Boolean))})`;
+				return `z.tuple(${buildList(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 = 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)}, ${buildList(members)})`;
@@ -900,7 +905,7 @@ const printerZodMini = ast.definePrinter((options) => {
 			const { keysToOmit } = this.options;
 			const transformed = this.transform(node);
 			if (!transformed) return null;
-			const meta = ast.syncSchemaRef(node);
+			const meta = syncSchemaRef(node);
 			return applyMiniModifiers({
 				value: (() => {
 					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
@@ -985,7 +990,7 @@ const zodGenerator = defineGenerator({
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
 		const hasCodec = !mini && containsCodec(node);
-		const codecRefNames = new Set(hasCodec ? ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? 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({
@@ -1097,7 +1102,7 @@ const zodGenerator = defineGenerator({
 		const { output, coercion, guidType, mini, wrapOutput, inferred, importPath, group, paramsCasing, printer } = ctx.options;
 		const dateType = adapter.options.dateType;
 		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
-		const params = ast.caseParams(node.parameters, paramsCasing);
+		const params = caseParams(node.parameters, paramsCasing);
 		const meta = { file: resolver.resolveFile({
 			name: node.operationId,
 			extname: ".ts",
@@ -1112,7 +1117,7 @@ const zodGenerator = 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(ast.collect(schema, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? 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({
@@ -1171,9 +1176,9 @@ const zodGenerator = defineGenerator({
 		}
 		function buildContentTypeVariants(entries, baseName, decorate, direction) {
 			const variants = resolveContentTypeVariants(entries, baseName);
-			const unionSchema = ast.createSchema({
+			const unionSchema = ast.factory.createSchema({
 				type: "union",
-				members: variants.map((variant) => ast.createSchema({
+				members: variants.map((variant) => ast.factory.createSchema({
 					type: "ref",
 					name: variant.name
 				}))
@@ -1211,12 +1216,12 @@ const zodGenerator = 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) => ast.createSchema({
+			const members = responsesWithSchema.map((res) => ast.factory.createSchema({
 				type: "ref",
 				name: resolver.resolveResponseStatusName(node, res.statusCode)
 			}));
 			return renderSchemaEntry({
-				schema: members.length === 1 ? members[0] : ast.createSchema({
+				schema: members.length === 1 ? members[0] : ast.factory.createSchema({
 					type: "union",
 					members
 				}),
@@ -1294,7 +1299,7 @@ const zodGenerator = defineGenerator({
 			return {
 				node,
 				data: buildSchemaNames(node, {
-					params: ast.caseParams(node.parameters, paramsCasing),
+					params: caseParams(node.parameters, paramsCasing),
 					resolver
 				})
 			};
@@ -1462,7 +1467,7 @@ const pluginZod = definePlugin((options) => {
 	const { output = {
 		path: "zod",
 		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, transformer: userTransformer, generators: userGenerators = [] } = options;
+	}, 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,
@@ -1489,7 +1494,7 @@ const pluginZod = 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);
 		} }