@kubb/plugin-zod 5.0.0-beta.87 → 5.0.0-beta.95

package/dist/index.d.ts

@@ -82,12 +82,6 @@ type PrinterZodOptions = {
    * variant for each date-bearing component.
    */
   direction?: 'input' | 'output';
-  /**
-   * Maps a component `$ref` path to its collision-resolved name. When two components collide
-   * (across sections or by case), the adapter renames one of them; the `ref()` handler resolves
-   * the referenced name through this map so the emitted schema reference matches the renamed component.
-   */
-  nameMapping?: ReadonlyMap<string, string>;
   /**
    * Custom handler map for node type overrides.
    */
@@ -162,12 +156,6 @@ type PrinterZodMiniOptions = {
    * Properties referencing these emit lazy getters wrapping refs in `z.lazy(() => …)`.
    */
   cyclicSchemas?: ReadonlySet<string>;
-  /**
-   * Maps a component `$ref` path to its collision-resolved name. When two components collide
-   * (across sections or by case), the adapter renames one of them; the `ref()` handler resolves
-   * the referenced name through this map so the emitted schema reference matches the renamed component.
-   */
-  nameMapping?: ReadonlyMap<string, string>;
   /**
    * Custom handler map for node type overrides.
    */

package/dist/index.js

@@ -431,7 +431,7 @@ function getSuccessResponses(responses) {
 //#region ../../internals/shared/src/adapter.ts
 /**
 * Narrows the generic `Adapter` from a generator context to the OpenAPI adapter,
-* so OAS-only options (`dateType`, `nameMapping`) and the parsed `document` are typed.
+* so OAS-only options (`dateType`, `enums`) and the parsed `document` are typed.
 *
 * Throws when a non-OAS adapter is configured, turning a silently wrong cast into a
 * clear, actionable error at the point of use.
@@ -446,6 +446,72 @@ function getOasAdapter(adapter) {
 	return adapter;
 }
 //#endregion
+//#region ../../internals/shared/src/resolver.ts
+/**
+* Resolves a single operation parameter name with the
+* `<operationId> <in> <name>` template.
+*
+* @example
+* `operationParamName.call(resolver, node, param) // → 'DeletePetPathPetId'`
+*/
+function operationParamName(node, param) {
+	return this.name(`${node.operationId} ${param.in} ${param.name}`);
+}
+/**
+* Builds the shared `response` namespace. Spread the result into
+* `createResolver` and add plugin-specific methods (`options`, `error`) next
+* to it.
+*
+* @example
+* ```ts
+* createResolver<PluginTs>({ response: { ...createOperationResponseResolver(), options(node) {...} }, ... })
+* ```
+*/
+function createOperationResponseResolver() {
+	return {
+		status(node, statusCode) {
+			return this.name(`${node.operationId} Status ${statusCode}`);
+		},
+		body(node) {
+			return this.name(`${node.operationId} Body`);
+		},
+		responses(node) {
+			return this.name(`${node.operationId} Responses`);
+		},
+		response(node) {
+			return this.name(`${node.operationId} Response`);
+		}
+	};
+}
+/**
+* Builds a resolver `file` override whose base name runs every path segment
+* through `toFilePath`, casing the final segment with `caseLast`.
+*
+* @example
+* ```ts
+* createResolver<PluginTs>({ file: createCasedFile(pascalCase), ... })
+* ```
+*/
+function createCasedFile(caseLast) {
+	return { baseName({ name, extname }) {
+		return `${toFilePath(name, caseLast)}${extname}`;
+	} };
+}
+//#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.collect(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
@@ -581,7 +647,7 @@ function containsCodec(node, seen = /* @__PURE__ */ new Set()) {
 * them to their input (encode) variant.
 */
 function collectCodecRefNames(node) {
-	return ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? ast.extractRefName(n.ref) ?? void 0 : void 0 });
+	return ast.collect(node, { schema: (n) => n.type === "ref" && n.ref && containsCodec(n) ? ast.resolveRefName(n) ?? void 0 : void 0 });
 }
 /**
 * Whether the node is a plain inline object whose shape can be lifted into an `.extend({ … })`
@@ -602,7 +668,7 @@ function isObjectSchemaNode(node, cyclicSchemas) {
 	if (node.nullable || node.optional || node.nullish) return false;
 	if (node.type === "object") return true;
 	if (node.type === "ref") {
-		const refName = (node.ref ? ast.extractRefName(node.ref) : void 0) ?? node.name;
+		const refName = ast.resolveRefName(node);
 		if (refName && cyclicSchemas?.has(refName)) return false;
 		const resolved = ast.syncSchemaRef(node);
 		return resolved.type === "ref" || isObjectSchemaNode(resolved, cyclicSchemas);
@@ -810,7 +876,7 @@ function strictOneOfMember$1(member, node, cyclicSchemas) {
 	if (node.type === "object" && node.additionalProperties === void 0) return `${member}.strict()`;
 	if (node.type === "ref") {
 		if (member.startsWith("z.lazy(")) return member;
-		const refName = (node.ref ? ast.extractRefName(node.ref) : void 0) ?? node.name;
+		const refName = ast.resolveRefName(node);
 		if (refName && cyclicSchemas?.has(refName)) return member;
 		const schema = ast.syncSchemaRef(node);
 		if (schema.nullable || schema.optional || node.nullable || node.optional) return member;
@@ -955,7 +1021,8 @@ const printerZod = ast.createPrinter((options) => {
 			},
 			ref(node) {
 				if (!node.name) return null;
-				const refName = node.ref ? this.options.nameMapping?.get(node.ref) ?? ast.extractRefName(node.ref) ?? node.name : node.name;
+				const refName = ast.resolveRefName(node);
+				if (!refName) return null;
 				const useInputVariant = node.ref != null && this.options.direction === "input" && containsCodec(node);
 				const resolvedName = node.ref ? useInputVariant ? this.options.resolver?.schema.inputName(refName) ?? refName : this.options.resolver?.name(refName) ?? refName : node.name;
 				if (node.ref && this.options.cyclicSchemas?.has(refName)) return `z.lazy(() => ${resolvedName})`;
@@ -1183,7 +1250,8 @@ const printerZodMini = ast.createPrinter((options) => {
 			},
 			ref(node) {
 				if (!node.name) return null;
-				const refName = node.ref ? this.options.nameMapping?.get(node.ref) ?? ast.extractRefName(node.ref) ?? node.name : node.name;
+				const refName = ast.resolveRefName(node);
+				if (!refName) return null;
 				const resolvedName = node.ref ? this.options.resolver?.name(refName) ?? refName : node.name;
 				if (node.ref && this.options.cyclicSchemas?.has(refName)) return `z.lazy(() => ${resolvedName})`;
 				return resolvedName;
@@ -1347,16 +1415,12 @@ const zodGenerator = defineGenerator({
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
 		const hasCodec = !mini && containsCodec(node);
 		const codecRefNames = new Set(hasCodec ? collectCodecRefNames(node) : []);
-		const importEntries = adapter.getImports(node, (schemaName) => ({
-			name: resolver.name(schemaName),
-			path: resolver.file({
-				name: schemaName,
-				extname: ".ts",
-				root,
-				output,
-				group: group ?? void 0
-			}).path
-		}));
+		const importEntries = resolver.imports({
+			node,
+			root,
+			output,
+			group: group ?? void 0
+		});
 		const inputImportEntries = hasCodec ? [...codecRefNames].map((schemaName) => ({
 			name: [resolver.schema.inputName(schemaName)],
 			path: resolver.file({
@@ -1385,21 +1449,18 @@ const zodGenerator = defineGenerator({
 			})
 		};
 		const inferTypeName = inferred ? resolver.schema.typeName(node.name) : null;
-		const nameMapping = getOasAdapter(adapter).options.nameMapping;
 		const stdPrinters = mini ? null : getStdPrinters(resolver, {
 			coercion,
 			guidType,
 			regexType,
 			dateType,
 			cyclicSchemas,
-			nameMapping,
 			nodes: printer?.nodes
 		});
 		const schemaPrinter = mini ? getMiniPrinter(resolver, {
 			guidType,
 			regexType,
 			cyclicSchemas,
-			nameMapping,
 			nodes: printer?.nodes
 		}) : stdPrinters.output;
 		return /* @__PURE__ */ jsxs(File, {
@@ -1471,34 +1532,28 @@ const zodGenerator = defineGenerator({
 			group: group ?? void 0
 		}) };
 		const cyclicSchemas = new Set(ctx.meta.circularNames);
-		const nameMapping = getOasAdapter(adapter).options.nameMapping;
 		function renderSchemaEntry({ schema, name, keysToOmit, direction = "output" }) {
 			if (!schema) return null;
 			const inferTypeName = inferred ? resolver.schema.type(name) : null;
 			const codecRefNames = direction === "input" && !mini ? new Set(collectCodecRefNames(schema)) : null;
-			const imports = adapter.getImports(schema, (schemaName) => ({
-				name: codecRefNames?.has(schemaName) ? resolver.schema.inputName(schemaName) : resolver.name(schemaName),
-				path: resolver.file({
-					name: schemaName,
-					extname: ".ts",
-					root,
-					output,
-					group: group ?? void 0
-				}).path
-			}));
+			const imports = resolver.imports({
+				node: schema,
+				root,
+				output,
+				group: group ?? void 0,
+				name: (schemaName) => codecRefNames?.has(schemaName) ? resolver.schema.inputName(schemaName) : resolver.name(schemaName)
+			});
 			const schemaPrinter = mini ? keysToOmit?.length ? printerZodMini({
 				guidType,
 				regexType,
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
-				nameMapping,
 				nodes: printer?.nodes
 			}) : getMiniPrinter(resolver, {
 				guidType,
 				regexType,
 				cyclicSchemas,
-				nameMapping,
 				nodes: printer?.nodes
 			}) : keysToOmit?.length ? printerZod({
 				coercion,
@@ -1508,7 +1563,6 @@ const zodGenerator = defineGenerator({
 				resolver,
 				keysToOmit,
 				cyclicSchemas,
-				nameMapping,
 				nodes: printer?.nodes,
 				direction
 			}) : getStdPrinters(resolver, {
@@ -1517,7 +1571,6 @@ const zodGenerator = defineGenerator({
 				regexType,
 				dateType,
 				cyclicSchemas,
-				nameMapping,
 				nodes: printer?.nodes
 			})[direction];
 			return /* @__PURE__ */ jsxs(Fragment, { children: [imports.map((imp) => /* @__PURE__ */ jsx(File.Import, {
@@ -1557,10 +1610,7 @@ const zodGenerator = defineGenerator({
 			})] });
 		}
 		function buildResponseUnion({ responses, name, fallbackUnknown }) {
-			if (new Set(responses.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? adapter.getImports(entry.schema, (schemaName) => ({
-				name: resolver.name(schemaName),
-				path: ""
-			})).flatMap((imp) => Array.isArray(imp.name) ? imp.name : [imp.name]) : []))).has(name)) return null;
+			if (new Set(responses.flatMap((res) => (res.content ?? []).flatMap((entry) => entry.schema ? collectRefNames(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)
@@ -1683,9 +1733,7 @@ const resolverZod = createResolver({
 	name(name) {
 		return ensureValidVarName(camelCase(name, { suffix: "schema" }));
 	},
-	file: { baseName({ name, extname }) {
-		return `${toFilePath(name, (part) => camelCase(part, { suffix: "schema" }))}${extname}`;
-	} },
+	file: createCasedFile((part) => camelCase(part, { suffix: "schema" })),
 	schema: {
 		typeName(name) {
 			return ensureValidVarName(pascalCase(name, { suffix: "schema type" }));
@@ -1701,9 +1749,7 @@ const resolverZod = createResolver({
 		}
 	},
 	param: {
-		name(node, param) {
-			return this.name(`${node.operationId} ${param.in} ${param.name}`);
-		},
+		name: operationParamName,
 		path(node, param) {
 			return this.param.name(node, param);
 		},
@@ -1715,18 +1761,7 @@ const resolverZod = createResolver({
 		}
 	},
 	response: {
-		status(node, statusCode) {
-			return this.name(`${node.operationId} Status ${statusCode}`);
-		},
-		body(node) {
-			return this.name(`${node.operationId} Body`);
-		},
-		responses(node) {
-			return this.name(`${node.operationId} Responses`);
-		},
-		response(node) {
-			return this.name(`${node.operationId} Response`);
-		},
+		...createOperationResponseResolver(),
 		error(node) {
 			return this.name(`${node.operationId} Error`);
 		}