@kubb/plugin-zod 5.4.9 → 5.4.10

package/dist/index.js

@@ -1,25 +1,7 @@
-import { t as __name } from "./rolldown-runtime-C0LytTxp.js";
-import { Resolver, addGenerator, ast, containsCircularRef, createResolver, defineExtension, defineGenerator, extractRefName, setMacros, setResolver, syncSchemaRef } from "kubb/kit";
+import "./rolldown-runtime-C0LytTxp.js";
+import { Diagnostics, Resolver, addGenerator, assertPluginOption, ast, containsCircularRef, createResolver, defineExtension, defineGenerator, extractRefName, setMacros, setResolver, syncSchemaRef } from "kubb/kit";
 import { Const, File, Function, Type, jsxRenderer } from "kubb/jsx";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
-//#region ../../internals/shared/src/params.ts
-/**
-* Drops parameters that share the same name, keeping the first.
-*
-* A malformed spec can declare the same parameter name twice within one `in` location. Both would
-* resolve to the same output property, so emitting both would yield an object type with a duplicate
-* member, which TypeScript rejects. This is a defensive guard against that case, not a casing guard:
-* parameter names flow through unchanged, so no two distinct names ever collide here anymore.
-*/
-function dedupeParams(params) {
-	const seen = /* @__PURE__ */ new Set();
-	return params.filter((param) => {
-		if (seen.has(param.name)) return false;
-		seen.add(param.name);
-		return true;
-	});
-}
-//#endregion
 //#region ../../internals/shared/src/operation.ts
 /**
 * Maps a content type to the PascalCase suffix used to name per-content-type variants
@@ -79,11 +61,19 @@ const operationParameterGroupsByNode = /* @__PURE__ */ new WeakMap();
 function getOperationParameters(node) {
 	const cached = operationParameterGroupsByNode.get(node);
 	if (cached) return cached;
+	const group = (location) => {
+		const seen = /* @__PURE__ */ new Set();
+		return node.parameters.filter((param) => {
+			if (param.in !== location || seen.has(param.name)) return false;
+			seen.add(param.name);
+			return true;
+		});
+	};
 	const groups = {
-		path: dedupeParams(node.parameters.filter((param) => param.in === "path")),
-		query: dedupeParams(node.parameters.filter((param) => param.in === "query")),
-		header: dedupeParams(node.parameters.filter((param) => param.in === "header")),
-		cookie: dedupeParams(node.parameters.filter((param) => param.in === "cookie"))
+		path: group("path"),
+		query: group("query"),
+		header: group("header"),
+		cookie: group("cookie")
 	};
 	operationParameterGroupsByNode.set(node, groups);
 	return groups;
@@ -227,7 +217,13 @@ function getSuccessResponses(responses) {
 * ```
 */
 function getOasAdapter(adapter) {
-	if (adapter.name !== "oas") throw new Error(`Expected the OpenAPI adapter (adapterOas), but received "${adapter.name}". Configure \`adapter: adapterOas()\` in your Kubb config.`);
+	if (adapter.name !== "oas") throw new Diagnostics.Error({
+		code: Diagnostics.code.adapterRequired,
+		severity: "error",
+		message: `Expected the OpenAPI adapter (adapterOas), but received "${adapter.name}".`,
+		help: "Set `adapter: adapterOas()` in kubb.config.ts.",
+		location: { kind: "config" }
+	});
 	return adapter;
 }
 //#endregion
@@ -650,20 +646,6 @@ function createCasedFile(caseLast) {
 	} };
 }
 //#endregion
-//#region ../../internals/shared/src/refs.ts
-/**
-* Collects the resolved target name of every pointer-carrying ref in a schema tree, in
-* first-occurrence order. Use this for name-only checks (e.g. redeclaration detection) where
-* `resolver.imports` would resolve file paths that are then discarded.
-*/
-function collectRefNames(schema) {
-	return ast.collectSync(schema, { schema: (node) => {
-		const refNode = ast.narrowSchema(node, "ref");
-		if (!refNode?.ref) return null;
-		return ast.resolveRefName(refNode);
-	} });
-}
-//#endregion
 //#region ../../internals/shared/src/group.ts
 /**
 * Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
@@ -807,13 +789,6 @@ function Zod({ name, node, printer, inferTypeName, typeGuards, isName, assertNam
 	] });
 }
 //#endregion
-//#region src/constants.ts
-/**
-* Import paths that use a namespace import (`import * as z from '...'`).
-* All other import paths use a named import (`import { z } from '...'`).
-*/
-const ZOD_NAMESPACE_IMPORTS = /* @__PURE__ */ new Set(["zod", "zod/mini"]);
-//#endregion
 //#region src/utils.ts
 /**
 * Returns `true` when the given coercion option enables coercion for the specified type.
@@ -823,8 +798,8 @@ function shouldCoerce(coercion, type) {
 	if (coercion === true) return true;
 	return !!coercion[type];
 }
-function hasPropertyNames(node) {
-	return "propertyNames" in node && Boolean(node.propertyNames);
+function propertyNamesOf(node) {
+	return "propertyNames" in node ? node.propertyNames : void 0;
 }
 /**
 * Whether the schema node represents a closed or finite set of keys (e.g. enum, literal,
@@ -854,7 +829,7 @@ function isPlainInlineObject(node) {
 	if (node.nullable || node.optional || node.nullish) return false;
 	const hasAdditionalProperties = node.additionalProperties !== void 0;
 	const hasPatternProperties = Boolean(node.patternProperties);
-	return !hasAdditionalProperties && !hasPatternProperties && !hasPropertyNames(node);
+	return !hasAdditionalProperties && !hasPatternProperties && !propertyNamesOf(node);
 }
 /**
 * Whether a node renders as a bare Zod object — one that accepts `.extend(…)` and can be a
@@ -869,7 +844,7 @@ function isObjectSchemaNode(node, cyclicSchemas) {
 		const hasProperties = Boolean(node.properties?.length);
 		const hasTypedAdditionalProperties = Boolean(node.additionalProperties && node.additionalProperties !== true);
 		const hasPatternProperties = Boolean(node.patternProperties);
-		return !(!hasProperties && (hasTypedAdditionalProperties || hasPatternProperties || hasPropertyNames(node)));
+		return !(!hasProperties && (hasTypedAdditionalProperties || hasPatternProperties || propertyNamesOf(node)));
 	}
 	if (node.type === "ref") {
 		const refName = ast.resolveRefName(node);
@@ -926,28 +901,20 @@ function defaultLiteral(node, value) {
 		const values = enumNode.namedEnumValues?.map((member) => member.value) ?? enumNode.enumValues ?? [];
 		if (values.length) {
 			const match = values.find((member) => member === value || String(member) === String(value));
-			return match != null ? formatLiteral(match) : null;
+			return match != null ? formatDefault(match) : null;
 		}
 	}
 	return formatDefault(value);
 }
 /**
-* Format a primitive enum/literal value.
-* Strings are quoted; numbers and booleans are emitted raw.
-*/
-function formatLiteral(v) {
-	if (typeof v === "string") return stringify(v);
-	return String(v);
-}
-/**
 * Build the Zod schema for a set of literal enum values.
 * `z.enum()` only accepts string members in Zod v4, so a numeric, boolean, or
 * mixed set is emitted as a single `z.literal(…)` or a `z.union([z.literal(…), …])`.
 * An all-string set keeps the more compact `z.enum([…])`.
 */
 function buildEnum(values) {
-	if (values.every((v) => typeof v === "string")) return `z.enum([${values.map(formatLiteral).join(", ")}])`;
-	const literals = values.map((v) => `z.literal(${formatLiteral(v)})`);
+	if (values.every((v) => typeof v === "string")) return `z.enum([${values.map((v) => formatDefault(v)).join(", ")}])`;
+	const literals = values.map((v) => `z.literal(${formatDefault(v)})`);
 	if (literals.length === 1) return literals[0];
 	return `z.union([${literals.join(", ")}])`;
 }
@@ -966,33 +933,26 @@ function integerFormatPattern(format) {
 	if (format === "uint64") return "^\\d+$";
 }
 /**
-* Map a `regexType` to the `func` argument of `toRegExpString`: `'constructor'` emits
-* `new RegExp(...)`, while `'literal'` (the default) emits a regex literal.
+* Renders a `pattern` as a regex literal, or as `new RegExp(...)` when `regexType` is `'constructor'`.
 */
-function regexFunc(regexType) {
-	return regexType === "constructor" ? "RegExp" : null;
+function regexSource(pattern, regexType) {
+	return toRegExpString(pattern, regexType === "constructor" ? "RegExp" : null);
+}
+function joinPatterns(patterns) {
+	return patterns.length === 1 ? patterns[0] : patterns.map((pattern) => `(${pattern})`).join("|");
 }
 /**
 * Builds a Zod record key schema that enforces the `patternProperties` regexes a plain
-* `.catchall()` would drop. Several patterns combine into one alternation (`(^a)|(^b)`).
+* `.catchall()` would drop.
 */
 function patternKeySchema({ patterns, regexType }) {
-	return `z.string().regex(${patternKeySource({
-		patterns,
-		regexType
-	})})`;
+	return `z.string().regex(${regexSource(joinPatterns(patterns), regexType)})`;
 }
 /**
 * `zod/mini` variant of {@link patternKeySchema}, wrapping the regex in `.check(z.regex(...))`.
 */
 function patternKeySchemaMini({ patterns, regexType }) {
-	return `z.string().check(z.regex(${patternKeySource({
-		patterns,
-		regexType
-	})}))`;
-}
-function patternKeySource({ patterns, regexType }) {
-	return toRegExpString(patterns.length === 1 ? patterns[0] : patterns.map((pattern) => `(${pattern})`).join("|"), regexFunc(regexType));
+	return `z.string().check(z.regex(${regexSource(joinPatterns(patterns), regexType)}))`;
 }
 /**
 * Build `.min()` / `.max()` / `.gt()` / `.lt()` constraint chains for numbers
@@ -1015,7 +975,7 @@ function lengthConstraints({ min, max, pattern, regexType }) {
 	return [
 		min !== void 0 ? `.min(${min})` : "",
 		max !== void 0 ? `.max(${max})` : "",
-		pattern !== void 0 ? `.regex(${toRegExpString(pattern, regexFunc(regexType))})` : ""
+		pattern !== void 0 ? `.regex(${regexSource(pattern, regexType)})` : ""
 	].join("");
 }
 /**
@@ -1037,7 +997,7 @@ function lengthChecksMini({ min, max, pattern, regexType }) {
 	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, regexFunc(regexType))})`);
+	if (pattern !== void 0) checks.push(`z.regex(${regexSource(pattern, regexType)})`);
 	return checks.length ? `.check(${checks.join(", ")})` : "";
 }
 /**
@@ -1091,63 +1051,44 @@ function applyMiniModifiers({ value, schema, nullable, optional, nullish, defaul
 	return literal !== null ? `z._default(${withModifier}, ${literal})` : withModifier;
 }
 /**
-* Builds an `object` schema node grouping the given parameter nodes.
-* The `primitive: 'object'` marker ensures the Zod printer emits `z.object(…)` rather than a record.
+* Calls for string `format`s with a dedicated Zod constructor; a `Map` so `constructor` cannot hit `Object.prototype`.
 */
-function buildGroupedParamsSchema({ params, optional }) {
-	return ast.factory.createSchema({
-		type: "object",
-		optional,
-		primitive: "object",
-		properties: params.map((param) => ast.factory.createProperty({
-			name: param.name,
-			required: param.required,
-			schema: param.schema
-		}))
-	});
-}
-//#endregion
-//#region src/printers/printerZod.ts
+const STRING_FORMAT_CALLS = /* @__PURE__ */ new Map([
+	["byte", "z.base64()"],
+	["base64", "z.base64()"],
+	["base64url", "z.base64url()"],
+	["jwt", "z.jwt()"],
+	["ulid", "z.ulid()"],
+	["iban", "z.iban()"],
+	["duration", "z.iso.duration()"]
+]);
 /**
-* A `oneOf` member that is an inline object is exhaustive, so it prints as a strict object.
-* Marking the node lets `object()` build `z.strictObject(...)` itself; appending `.strict()` to the
-* printed member instead would read `.shape` eagerly and run a self-reference's deferred getter
-* inside the temporal dead zone.
+* Marks an inline `oneOf` object strict, so `object()` builds `z.strictObject(...)` and no eager `.shape` read hits a deferred getter.
 */
-function strictOneOfNode$1(node) {
+function strictOneOfNode(node) {
 	return node.type === "object" && node.additionalProperties === void 0 ? {
 		...node,
 		additionalProperties: false
 	} : node;
 }
-__name(strictOneOfNode$1, "strictOneOfNode");
-function strictOneOfMember(member, node, cyclicSchemas) {
-	if (node.type === "ref") {
-		if (member.startsWith("z.lazy(")) return member;
-		const refName = ast.resolveRefName(node);
-		if (refName && cyclicSchemas?.has(refName)) return member;
-		const schema = syncSchemaRef(node);
-		if (schema.nullable || schema.optional || node.nullable || node.optional) return member;
-		if (schema.type === "object" && (schema.additionalProperties === void 0 || schema.additionalProperties === false)) return `${member}.strict()`;
-	}
-	return member;
-}
-function getMemberConstraint({ member, regexType }) {
-	if (member.primitive === "string") return lengthConstraints({
+/**
+* The constraint chain an `allOf` member adds to a bare string, number or array; each printer passes its own renderers.
+*/
+function getMemberConstraint({ member, regexType, lengths, numbers }) {
+	if (member.primitive === "string") return lengths({
 		...ast.narrowSchema(member, "string") ?? {},
 		regexType
 	}) || 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({
+	if (member.primitive === "number" || member.primitive === "integer") return numbers(ast.narrowSchema(member, "number") ?? ast.narrowSchema(member, "integer") ?? {}) || void 0;
+	if (member.primitive === "array") return lengths({
 		...ast.narrowSchema(member, "array") ?? {},
 		regexType
 	}) || void 0;
 }
 /**
-* Builds the `{ key: value, … }` shape for an object node, shared by the `z.object(...)` and
-* `.extend(...)` renderings so they stay in lockstep.
+* Builds the `{ key: value, … }` shape shared by the `z.object(...)` and `.extend(...)` renderings.
 */
-function buildZodObjectShape(ctx, node) {
+function buildObjectShape(ctx, node, modify) {
 	const objectNode = ast.narrowSchema(node, "object");
 	if (!objectNode) return "{}";
 	const isCyclic = (schema) => ctx.options.cyclicSchemas != null && containsCircularRef(schema, { circularSchemas: ctx.options.cyclicSchemas });
@@ -1160,17 +1101,11 @@ function buildZodObjectShape(ctx, node) {
 		return baseOutput;
 	}).map(({ name: propName, property, output: baseOutput }) => {
 		const { schema } = property;
-		const meta = syncSchemaRef(schema);
-		const descriptionToApply = schema.type !== "ref" && meta.type === "ref" ? void 0 : meta.description;
-		const value = applyModifiers({
+		const value = modify({
 			value: baseOutput,
 			schema,
-			nullable: meta.nullable,
-			optional: schema.optional || property.required === false,
-			nullish: schema.nullish,
-			defaultValue: meta.default,
-			description: descriptionToApply,
-			examples: meta.examples
+			required: property.required,
+			meta: syncSchemaRef(schema)
 		});
 		return isCyclic(schema) ? lazyGetter({
 			name: propName,
@@ -1179,6 +1114,51 @@ function buildZodObjectShape(ctx, node) {
 	}));
 }
 /**
+* Shared `print` body: transforms the node, applies `keysToOmit` as `.omit(...)`, then `modify` adds the modifiers.
+*/
+function printWithOmit(ctx, node, modify) {
+	const { keysToOmit } = ctx.options;
+	const transformed = ctx.transform(node);
+	if (!transformed) return null;
+	const meta = syncSchemaRef(node);
+	return modify((() => {
+		if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
+		const unwrap = omitUnwrapChain(node);
+		const omit = `.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
+		const lazyMatch = transformed.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
+		if (lazyMatch) return `z.lazy(() => ${lazyMatch[1]}${unwrap}${omit})`;
+		return `${transformed}${unwrap}${omit}`;
+	})(), meta);
+}
+//#endregion
+//#region src/printers/printerZod.ts
+function strictOneOfMember(member, node, cyclicSchemas) {
+	if (node.type === "ref") {
+		if (member.startsWith("z.lazy(")) return member;
+		const refName = ast.resolveRefName(node);
+		if (refName && cyclicSchemas?.has(refName)) return member;
+		const schema = syncSchemaRef(node);
+		if (schema.nullable || schema.optional || node.nullable || node.optional) return member;
+		if (schema.type === "object" && (schema.additionalProperties === void 0 || schema.additionalProperties === false)) return `${member}.strict()`;
+	}
+	return member;
+}
+/**
+* Builds the `{ key: value, … }` shape for an object node with the chainable modifiers.
+*/
+function buildZodObjectShape(ctx, node) {
+	return buildObjectShape(ctx, node, ({ value, schema, required, meta }) => applyModifiers({
+		value,
+		schema,
+		nullable: meta.nullable,
+		optional: schema.optional || required === false,
+		nullish: schema.nullish,
+		defaultValue: meta.default,
+		description: schema.type !== "ref" && meta.type === "ref" ? void 0 : meta.description,
+		examples: meta.examples
+	}));
+}
+/**
 * Types the direction probe skips. They delegate to their children rather than reading
 * `direction` themselves, so {@link containsDirectionalNode} walks into the children instead.
 */
@@ -1244,7 +1224,8 @@ function containsDirectionalNode({ node, printerOptions, seen = /* @__PURE__ */
 	if ("items" in node && node.items) children.push(...node.items);
 	if ("members" in node && node.members) children.push(...node.members);
 	if ("additionalProperties" in node && node.additionalProperties && node.additionalProperties !== true) children.push(node.additionalProperties);
-	if ("propertyNames" in node && node.propertyNames) children.push(node.propertyNames);
+	const propertyNames = propertyNamesOf(node);
+	if (propertyNames) children.push(propertyNames);
 	return children.some((child) => containsDirectionalNode({
 		node: child,
 		printerOptions,
@@ -1279,32 +1260,11 @@ const scalarNodes = {
 	boolean: () => "z.boolean()",
 	null: () => "z.null()",
 	string(node) {
-		if (!shouldCoerce(this.options.coercion, "strings")) {
-			if (node.format === "byte" || node.format === "base64") return `z.base64()${lengthConstraints({
-				...node,
-				regexType: this.options.regexType
-			})}`;
-			if (node.format === "base64url") return `z.base64url()${lengthConstraints({
-				...node,
-				regexType: this.options.regexType
-			})}`;
-			if (node.format === "jwt") return `z.jwt()${lengthConstraints({
-				...node,
-				regexType: this.options.regexType
-			})}`;
-			if (node.format === "ulid") return `z.ulid()${lengthConstraints({
-				...node,
-				regexType: this.options.regexType
-			})}`;
-			if (node.format === "iban") return `z.iban()${lengthConstraints({
-				...node,
-				regexType: this.options.regexType
-			})}`;
-			if (node.format === "duration") return `z.iso.duration()${lengthConstraints({
-				...node,
-				regexType: this.options.regexType
-			})}`;
-		}
+		const call = shouldCoerce(this.options.coercion, "strings") ? void 0 : STRING_FORMAT_CALLS.get(node.format);
+		if (call) return `${call}${lengthConstraints({
+			...node,
+			regexType: this.options.regexType
+		})}`;
 		const base = shouldCoerce(this.options.coercion, "strings") ? "z.coerce.string()" : "z.string()";
 		const pattern = node.pattern ?? integerFormatPattern(node.format);
 		return `${base}${lengthConstraints({
@@ -1368,7 +1328,7 @@ const scalarNodes = {
 	enum(node) {
 		const nonNullValues = (node.namedEnumValues?.map((v) => v.value) ?? node.enumValues ?? []).filter((v) => v !== null);
 		if (node.namedEnumValues?.length) {
-			const literals = nonNullValues.map((v) => `z.literal(${formatLiteral(v)})`);
+			const literals = nonNullValues.map((v) => `z.literal(${formatDefault(v)})`);
 			if (literals.length === 1) return literals[0];
 			return `z.union([${literals.join(", ")}])`;
 		}
@@ -1409,7 +1369,7 @@ const printerZod = ast.createPrinter((options) => {
 			object(node) {
 				const entries = node.properties ?? [];
 				const patterns = node.patternProperties ? Object.entries(node.patternProperties) : [];
-				const propertyNamesNode = "propertyNames" in node ? node.propertyNames : void 0;
+				const propertyNamesNode = propertyNamesOf(node);
 				const propertyNamesKeySchema = propertyNamesNode ? this.transform(propertyNamesNode) : null;
 				const isStrict = node.additionalProperties === false && patterns.length === 0;
 				const isLoose = node.additionalProperties === true;
@@ -1455,7 +1415,7 @@ const printerZod = ast.createPrinter((options) => {
 			},
 			union(node) {
 				const nodeMembers = node.members ?? [];
-				const members = mapSchemaMembers(node, (memberNode) => this.transform(node.strategy === "one" ? strictOneOfNode$1(memberNode) : memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember(output, schema, cyclicSchemaNames) : output).filter(Boolean);
+				const members = mapSchemaMembers(node, (memberNode) => this.transform(node.strategy === "one" ? strictOneOfNode(memberNode) : memberNode)).map(({ schema, output }) => output && node.strategy === "one" ? strictOneOfMember(output, schema, cyclicSchemaNames) : output).filter(Boolean);
 				if (members.length === 0) return "";
 				if (members.length === 1) return members[0];
 				const allDiscriminable = nodeMembers.every((m) => isObjectSchemaNode(m, cyclicSchemaNames));
@@ -1473,7 +1433,9 @@ const printerZod = ast.createPrinter((options) => {
 				return rest.reduce((acc, member) => {
 					const constraint = getMemberConstraint({
 						member,
-						regexType: this.options.regexType
+						regexType: this.options.regexType,
+						lengths: lengthConstraints,
+						numbers: numberConstraints
 					});
 					if (constraint) return acc + constraint;
 					const transformed = this.transform(member);
@@ -1483,19 +1445,8 @@ const printerZod = ast.createPrinter((options) => {
 		},
 		overrides: options.nodes,
 		print(node) {
-			const { keysToOmit } = this.options;
-			const transformed = this.transform(node);
-			if (!transformed) return null;
-			const meta = syncSchemaRef(node);
-			return applyModifiers({
-				value: (() => {
-					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
-					const unwrap = omitUnwrapChain(node);
-					const omit = `.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
-					const lazyMatch = transformed.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
-					if (lazyMatch) return `z.lazy(() => ${lazyMatch[1]}${unwrap}${omit})`;
-					return `${transformed}${unwrap}${omit}`;
-				})(),
+			return printWithOmit(this, node, (value, meta) => applyModifiers({
+				value,
 				schema: node,
 				nullable: meta.nullable,
 				optional: meta.optional,
@@ -1503,63 +1454,23 @@ const printerZod = ast.createPrinter((options) => {
 				defaultValue: meta.default,
 				description: meta.description,
 				examples: meta.examples
-			});
+			}));
 		}
 	};
 });
 //#endregion
 //#region src/printers/printerZodMini.ts
 /**
-* A `oneOf` member that is an inline object is exhaustive, so it prints as a strict object.
-* Marking the node lets `object()` build `z.strictObject(...)` itself, with no rewrite afterwards.
-*/
-function strictOneOfNode(node) {
-	return node.type === "object" && node.additionalProperties === void 0 ? {
-		...node,
-		additionalProperties: false
-	} : node;
-}
-function getMemberConstraintMini({ member, regexType }) {
-	if (member.primitive === "string") return lengthChecksMini({
-		...ast.narrowSchema(member, "string") ?? {},
-		regexType
-	}) || 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") ?? {},
-		regexType
-	}) || void 0;
-}
-/**
-* Builds the `{ key: value, … }` shape for an object node with the functional `zod/mini` modifiers,
-* shared by the `z.object(...)` and `z.extend(...)` renderings so they stay in lockstep.
+* Builds the `{ key: value, … }` shape for an object node with the functional `zod/mini` modifiers.
 */
 function buildZodMiniObjectShape(ctx, node) {
-	const objectNode = ast.narrowSchema(node, "object");
-	if (!objectNode) return "{}";
-	const isCyclic = (schema) => ctx.options.cyclicSchemas != null && containsCircularRef(schema, { circularSchemas: ctx.options.cyclicSchemas });
-	return buildObject(mapSchemaProperties(objectNode, (schema) => {
-		const hasSelfRef = isCyclic(schema);
-		const savedCyclicSchemas = ctx.options.cyclicSchemas;
-		if (hasSelfRef) ctx.options.cyclicSchemas = void 0;
-		const baseOutput = ctx.transform(schema) ?? ctx.transform(ast.factory.createSchema({ type: "unknown" }));
-		if (hasSelfRef) ctx.options.cyclicSchemas = savedCyclicSchemas;
-		return baseOutput;
-	}).map(({ name: propName, property, output: baseOutput }) => {
-		const { schema } = property;
-		const meta = syncSchemaRef(schema);
-		const value = applyMiniModifiers({
-			value: baseOutput,
-			schema,
-			nullable: meta.nullable,
-			optional: schema.optional || property.required === false,
-			nullish: schema.nullish,
-			defaultValue: meta.default
-		});
-		return isCyclic(schema) ? lazyGetter({
-			name: propName,
-			body: value
-		}) : `${objectKey(propName)}: ${value}`;
+	return buildObjectShape(ctx, node, ({ value, schema, required, meta }) => applyMiniModifiers({
+		value,
+		schema,
+		nullable: meta.nullable,
+		optional: schema.optional || required === false,
+		nullish: schema.nullish,
+		defaultValue: meta.default
 	}));
 }
 /**
@@ -1588,32 +1499,11 @@ const printerZodMini = ast.createPrinter((options) => {
 			null: () => "z.null()",
 			string(node) {
 				const coerce = shouldCoerce(this.options.coercion, "strings");
-				if (!coerce) {
-					if (node.format === "byte" || node.format === "base64") return `z.base64()${lengthChecksMini({
-						...node,
-						regexType: this.options.regexType
-					})}`;
-					if (node.format === "base64url") return `z.base64url()${lengthChecksMini({
-						...node,
-						regexType: this.options.regexType
-					})}`;
-					if (node.format === "jwt") return `z.jwt()${lengthChecksMini({
-						...node,
-						regexType: this.options.regexType
-					})}`;
-					if (node.format === "ulid") return `z.ulid()${lengthChecksMini({
-						...node,
-						regexType: this.options.regexType
-					})}`;
-					if (node.format === "iban") return `z.iban()${lengthChecksMini({
-						...node,
-						regexType: this.options.regexType
-					})}`;
-					if (node.format === "duration") return `z.iso.duration()${lengthChecksMini({
-						...node,
-						regexType: this.options.regexType
-					})}`;
-				}
+				const call = coerce ? void 0 : STRING_FORMAT_CALLS.get(node.format);
+				if (call) return `${call}${lengthChecksMini({
+					...node,
+					regexType: this.options.regexType
+				})}`;
 				const base = coerce ? "z.coerce.string()" : "z.string()";
 				const pattern = node.pattern ?? integerFormatPattern(node.format);
 				return `${base}${lengthChecksMini({
@@ -1669,7 +1559,7 @@ const printerZodMini = ast.createPrinter((options) => {
 			enum(node) {
 				const nonNullValues = (node.namedEnumValues?.map((v) => v.value) ?? node.enumValues ?? []).filter((v) => v !== null);
 				if (node.namedEnumValues?.length) {
-					const literals = nonNullValues.map((v) => `z.literal(${formatLiteral(v)})`);
+					const literals = nonNullValues.map((v) => `z.literal(${formatDefault(v)})`);
 					if (literals.length === 1) return literals[0];
 					return `z.union([${literals.join(", ")}])`;
 				}
@@ -1686,7 +1576,7 @@ const printerZodMini = ast.createPrinter((options) => {
 			object(node) {
 				const entries = node.properties ?? [];
 				const patterns = node.patternProperties ? Object.entries(node.patternProperties) : [];
-				const propertyNamesNode = "propertyNames" in node ? node.propertyNames : void 0;
+				const propertyNamesNode = propertyNamesOf(node);
 				const propertyNamesKeySchema = propertyNamesNode ? this.transform(propertyNamesNode) : null;
 				const isStrict = node.additionalProperties === false && patterns.length === 0;
 				const isLoose = node.additionalProperties === true;
@@ -1743,9 +1633,11 @@ const printerZodMini = ast.createPrinter((options) => {
 				if (!firstBase) return "";
 				if (rest.length > 0 && isObjectComposableIntersection(node, cyclicSchemaNames)) return rest.reduce((acc, member) => `z.extend(${acc}, ${buildZodMiniObjectShape(this, member)})`, firstBase);
 				return rest.reduce((acc, member) => {
-					const constraint = getMemberConstraintMini({
+					const constraint = getMemberConstraint({
 						member,
-						regexType: this.options.regexType
+						regexType: this.options.regexType,
+						lengths: lengthChecksMini,
+						numbers: numberChecksMini
 					});
 					if (constraint) return acc + constraint;
 					const transformed = this.transform(member);
@@ -1755,25 +1647,14 @@ const printerZodMini = ast.createPrinter((options) => {
 		},
 		overrides: options.nodes,
 		print(node) {
-			const { keysToOmit } = this.options;
-			const transformed = this.transform(node);
-			if (!transformed) return null;
-			const meta = syncSchemaRef(node);
-			return applyMiniModifiers({
-				value: (() => {
-					if (!keysToOmit?.length || meta.primitive !== "object" || meta.type === "union" && meta.discriminatorPropertyName) return transformed;
-					const unwrap = omitUnwrapChain(node);
-					const omit = `.omit({ ${keysToOmit.map((k) => `"${k}": true`).join(", ")} })`;
-					const lazyMatch = transformed.match(/^z\.lazy\(\(\)\s*=>\s*(.+)\)$/);
-					if (lazyMatch) return `z.lazy(() => ${lazyMatch[1]}${unwrap}${omit})`;
-					return `${transformed}${unwrap}${omit}`;
-				})(),
+			return printWithOmit(this, node, (value, meta) => applyMiniModifiers({
+				value,
 				schema: node,
 				nullable: meta.nullable,
 				optional: meta.optional,
 				nullish: meta.nullish,
 				defaultValue: meta.default
-			});
+			}));
 		}
 	};
 });
@@ -1845,7 +1726,7 @@ const zodGenerator = defineGenerator({
 		const { output, coercion, guidType, regexType, compile, mini, inferred, typeGuards, importPath, group, printer } = ctx.options;
 		const dateType = getOasAdapter(adapter).options.dateType;
 		if (!node.name) return;
-		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
+		const isZodImport = importPath === "zod" || importPath === "zod/mini";
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
 		const printerOptions = {
 			coercion,
@@ -1880,13 +1761,7 @@ const zodGenerator = defineGenerator({
 				group: group ?? void 0
 			}).path
 		})) : [];
-		const seenImports = /* @__PURE__ */ new Set();
-		const imports = [...importEntries, ...inputImportEntries].filter((imp) => {
-			const key = `${Array.isArray(imp.name) ? imp.name.join(",") : imp.name}|${imp.path}`;
-			if (seenImports.has(key)) return false;
-			seenImports.add(key);
-			return true;
-		});
+		const imports = [...new Map([...importEntries, ...inputImportEntries].map((imp) => [`${Array.isArray(imp.name) ? imp.name.join(",") : imp.name}|${imp.path}`, imp])).values()];
 		const meta = {
 			name: resolver.name(node.name),
 			file: resolver.file({
@@ -1982,7 +1857,7 @@ const zodGenerator = defineGenerator({
 		const { adapter, config, resolver, root } = ctx;
 		const { output, coercion, guidType, regexType, compile, mini, inferred, importPath, group, printer } = ctx.options;
 		const dateType = getOasAdapter(adapter).options.dateType;
-		const isZodImport = ZOD_NAMESPACE_IMPORTS.has(importPath);
+		const isZodImport = importPath === "zod" || importPath === "zod/mini";
 		const meta = { file: resolver.file({
 			name: node.operationId,
 			extname: ".ts",
@@ -2086,7 +1961,7 @@ const zodGenerator = defineGenerator({
 			})] });
 		}
 		function buildResponseUnion({ responses, name, fallbackUnknown }) {
-			if (new Set(responses.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? collectRefNames(entry.schema).map((refName) => resolver.name(refName)) : []))).has(name)) return null;
+			if (new Set(responses.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? ast.collectImportedRefNames(entry.schema).map((refName) => resolver.name(refName)) : []))).has(name)) return null;
 			const members = responses.map((res) => ast.factory.createSchema({
 				type: "ref",
 				name: resolver.response.status(node, res.statusCode)
@@ -2167,7 +2042,15 @@ const zodGenerator = defineGenerator({
 				params: header
 			}
 		].filter(({ params }) => params.length > 0).map(({ kind, params }) => renderSchemaEntry({
-			schema: buildGroupedParamsSchema({ params }),
+			schema: ast.factory.createSchema({
+				type: "object",
+				primitive: "object",
+				properties: params.map((param) => ast.factory.createProperty({
+					name: param.name,
+					required: param.required,
+					schema: param.schema
+				}))
+			}),
 			name: resolver.param[kind](node, params[0]),
 			direction: "encode"
 		})) : [];
@@ -2226,7 +2109,7 @@ var compatibility = {
 };
 //#endregion
 //#region package.json
-var version = "5.4.9";
+var version = "5.4.10";
 //#endregion
 //#region src/resolvers/resolverZod.ts
 /**
@@ -2326,6 +2209,18 @@ const pluginZod = defineExtension({
 			path: "zod",
 			barrel: { type: "named" }
 		}, group, exclude = [], include, override = [], compile = false, mini = false, guidType = "uuid", regexType = "literal", importPath = mini ? "zod/mini" : "zod", coercion = false, inferred = false, typeGuards = false, printer, resolver: userResolver, macros: userMacros } = options;
+		assertPluginOption({
+			plugin: pluginZodName,
+			option: "guidType",
+			value: guidType,
+			allowed: ["uuid", "guid"]
+		});
+		assertPluginOption({
+			plugin: pluginZodName,
+			option: "regexType",
+			value: regexType,
+			allowed: ["literal", "constructor"]
+		});
 		setResolver(userResolver ? Resolver.merge(resolverZod, userResolver) : resolverZod);
 		if (userMacros?.length) setMacros(userMacros);
 		addGenerator(zodGenerator);