@kubb/plugin-mcp 5.0.0-beta.85 → 5.0.0-beta.87

package/dist/index.js

@@ -1,9 +1,9 @@
 import "./rolldown-runtime-C0LytTxp.js";
-import path from "node:path";
-import { ast, defineGenerator, definePlugin, defineResolver } from "kubb/kit";
+import { Resolver, ast, createResolver, defineGenerator, definePlugin } from "kubb/kit";
 import { Const, File, Function, jsxRenderer } from "kubb/jsx";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 import { createFunctionParameter, createFunctionParameters, createObjectBindingPattern, functionPrinter, pluginTsName } from "@kubb/plugin-ts";
+import path from "node:path";
 import { pluginZodName } from "@kubb/plugin-zod";
 //#region ../../internals/utils/src/casing.ts
 /**
@@ -32,31 +32,6 @@ function camelCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
 //#endregion
-//#region ../../internals/utils/src/fs.ts
-/**
-* 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 `/`.
-*
-* 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 Nested path from a dotted name
-* `toFilePath('pet.petId') // 'pet/petId'`
-*
-* @example PascalCase the final segment
-* `toFilePath('pet.Pet', pascalCase) // 'pet/Pet'`
-*
-* @example Suffix applied to the final segment only
-* `toFilePath('tag.tag', (part) => camelCase(part, { suffix: 'schema' })) // 'tag/tagSchema'`
-*/
-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
 /**
 * JavaScript and Java reserved words.
@@ -157,6 +132,22 @@ const reservedWords = /* @__PURE__ */ new Set([
 */
 function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
+	return isIdentifier(name);
+}
+/**
+* Returns `true` when `name` is syntactically a valid identifier, ignoring reserved words.
+*
+* Reserved words and globals (`class`, `name`, `Date`, …) are valid as bare object-literal keys
+* even though they are not valid variable names, so use this (not {@link isValidVarName}) when
+* deciding whether an object key needs quoting.
+*
+* @example
+* ```ts
+* isIdentifier('name')   // true
+* isIdentifier('x-total')// false
+* ```
+*/
+function isIdentifier(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
 //#endregion
@@ -312,13 +303,13 @@ function dedupeByCasedName(params) {
 //#region ../../internals/shared/src/operation.ts
 /**
 * Builds the `ResolverFileParams` every operation generator passes to
-* `resolver.resolveFile`: a file named `name`, tagged by the operation's first
+* `resolver.file`: a file named `name`, tagged by the operation's first
 * tag (or `'default'`), at the operation's path. Centralizes the entry object
 * that was repeated at dozens of call sites across the client and query plugins.
 *
 * @example
 * ```ts
-* resolver.resolveFile(operationFileEntry(node, node.operationId), { root, output, group })
+* resolver.file(operationFileEntry(node, node.operationId), { root, output, group })
 * ```
 */
 function operationFileEntry(node, name, extname = ".ts") {
@@ -335,8 +326,11 @@ function getOperationLink(node, link) {
 	if (link === "urlPath") return node.path ? `{@link ${Url.toPath(node.path)}}` : null;
 	return node.path ? `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}` : null;
 }
-function getContentTypeInfo(node) {
-	const contentTypes = node.requestBody?.content?.map((e) => e.contentType) ?? [];
+/**
+* Derives the shared `ContentTypeInfo` shape from a list of content types, tracking whether several
+* are present and the union, default, and form-data flags the client uses to pick one.
+*/
+function buildContentTypeInfo(contentTypes) {
 	const isMultipleContentTypes = contentTypes.length > 1;
 	return {
 		contentTypes,
@@ -346,20 +340,15 @@ function getContentTypeInfo(node) {
 		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
 	};
 }
+function getContentTypeInfo(node) {
+	return buildContentTypeInfo(node.requestBody?.content?.map((e) => e.contentType) ?? []);
+}
 /**
 * The request-body counterpart for the primary success response: the content types it documents and
 * whether several are present, so the client can let a caller pick which one to accept.
 */
 function getResponseContentTypeInfo(node) {
-	const contentTypes = getPrimarySuccessResponse(node)?.content?.map((e) => e.contentType) ?? [];
-	const isMultipleContentTypes = contentTypes.length > 1;
-	return {
-		contentTypes,
-		isMultipleContentTypes,
-		contentTypeUnion: isMultipleContentTypes ? contentTypes.map((ct) => JSON.stringify(ct)).join(" | ") : "",
-		defaultContentType: contentTypes[0] ?? "application/json",
-		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
-	};
+	return buildContentTypeInfo(getPrimarySuccessResponse(node)?.content?.map((e) => e.contentType) ?? []);
 }
 function buildRequestConfigType(node) {
 	const request = getContentTypeInfo(node);
@@ -401,7 +390,7 @@ function getRequestGroupOptionality(node) {
 }
 /**
 * Builds the grouped `{ path, query, body, headers }` parameter for a generated client
-* function, typed from the operation's `RequestConfig` (minus `url`). Only the groups the
+* function, typed from the operation's `Options` (minus `url`). Only the groups the
 * operation actually has are destructured. The trailing `config` parameter carries the
 * runtime `RequestConfig` overrides plus `client`.
 */
@@ -415,7 +404,7 @@ function buildRequestParamsSignature(node, resolver, options = {}) {
 		"headers"
 	].filter((key) => groups[key]);
 	return {
-		signature: [names.length > 0 ? `{ ${names.join(", ")} }: ${resolver.resolveRequestConfigName(node)}${isOptional ? " = {}" : ""}` : null, isConfigurable ? `config: ${buildRequestConfigType(node)} = {}` : null].filter(Boolean).join(", "),
+		signature: [names.length > 0 ? `{ ${names.join(", ")} }: ${resolver.response.options(node)}${isOptional ? " = {}" : ""}` : null, isConfigurable ? `config: ${buildRequestConfigType(node)} = {}` : null].filter(Boolean).join(", "),
 		groups
 	};
 }
@@ -744,15 +733,15 @@ function resolveClientOperation(options) {
 	const { clientPlugin, driver, node, root, output } = options;
 	if (!clientPlugin) return null;
 	const resolver = driver.getResolver(clientPlugin.pluginName);
-	if (!resolver) return null;
 	const plugin = driver.getPlugin(clientPlugin.pluginName);
-	const file = resolver.resolveFile(operationFileEntry(node, node.operationId), {
+	const file = resolver.file({
+		...operationFileEntry(node, node.operationId),
 		root,
 		output: plugin?.options?.output ?? output,
 		group: plugin?.options?.group ?? void 0
 	});
 	return {
-		name: resolver.resolveName(node.operationId),
+		name: resolver.name(node.operationId),
 		path: file.path,
 		clientPath: path.resolve(root, ".kubb/client.ts")
 	};
@@ -783,25 +772,23 @@ const mcpGenerator = defineGenerator({
 			output
 		});
 		if (!contractOp) return null;
-		const requestConfigName = tsResolver.resolveRequestConfigName(node);
+		const optionsName = tsResolver.response.options(node);
 		const meta = {
-			name: resolver.resolveHandlerName(node),
-			file: resolver.resolveFile({
+			name: resolver.handler.name(node),
+			file: resolver.file({
 				name: node.operationId,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output,
 				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile({
+			fileTs: tsResolver.file({
 				name: node.operationId,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output: pluginTs.options?.output ?? output,
 				group: pluginTs.options?.group ?? void 0
@@ -812,8 +799,8 @@ const mcpGenerator = defineGenerator({
 			path: meta.file.path,
 			meta: meta.file.meta,
 			children: [
-				meta.fileTs && requestConfigName && /* @__PURE__ */ jsx(File.Import, {
-					name: [requestConfigName],
+				meta.fileTs && optionsName && /* @__PURE__ */ jsx(File.Import, {
+					name: [optionsName],
 					root: meta.file.path,
 					path: meta.fileTs.path,
 					isTypeOnly: true
@@ -878,32 +865,30 @@ const serverGenerator = defineGenerator({
 		};
 		const operationsMapped = nodes.filter(ast.isHttpOperationNode).map((node) => {
 			const { path: pathParams, query: queryParams, header: headerParams } = getOperationParameters(node);
-			const mcpFile = resolver.resolveFile({
+			const mcpFile = resolver.file({
 				name: node.operationId,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output,
 				group: group ?? void 0
 			});
-			const zodFile = zodResolver.resolveFile({
+			const zodFile = zodResolver.file({
 				name: node.operationId,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output: pluginZod.options?.output ?? output,
 				group: pluginZod.options?.group ?? void 0
 			});
-			const requestName = node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName(node) : null;
+			const requestName = node.requestBody?.content?.[0]?.schema ? zodResolver.response.body(node) : null;
 			const successStatus = findSuccessStatusCode(node.responses);
-			const responseName = successStatus ? zodResolver.resolveResponseStatusName(node, successStatus) : null;
+			const responseName = successStatus ? zodResolver.response.status(node, successStatus) : null;
 			const resolveParams = (params) => params.map((p) => ({
 				name: p.name,
-				schemaName: zodResolver.resolveParamName(node, p)
+				schemaName: zodResolver.param.name(node, p)
 			}));
 			return {
 				tool: {
@@ -912,7 +897,7 @@ const serverGenerator = defineGenerator({
 					description: node.description || `Make a ${node.method.toUpperCase()} request to ${node.path}`
 				},
 				mcp: {
-					name: resolver.resolveHandlerName(node),
+					name: resolver.handler.name(node),
 					file: mcpFile
 				},
 				zod: {
@@ -949,7 +934,7 @@ const serverGenerator = defineGenerator({
 			baseName: serverFile.baseName,
 			path: serverFile.path,
 			meta: serverFile.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
+			banner: resolver.default.banner(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -957,7 +942,7 @@ const serverGenerator = defineGenerator({
 					baseName: serverFile.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1018,26 +1003,18 @@ const serverGenerator = defineGenerator({
 * ```ts
 * import { resolverMcp } from '@kubb/plugin-mcp'
 *
-* resolverMcp.default('addPet', 'function') // 'addPetHandler'
+* resolverMcp.name('addPet') // 'addPetHandler'
 * ```
 */
-const resolverMcp = defineResolver(() => ({
-	name: "default",
+const resolverMcp = createResolver({
 	pluginName: "plugin-mcp",
-	default(name, type) {
-		if (type === "file") return toFilePath(name);
+	name(name) {
 		return camelCase(name, { suffix: "handler" });
 	},
-	resolveName(name) {
-		return this.default(name, "function");
-	},
-	resolvePathName(name, type) {
-		return this.default(name, type);
-	},
-	resolveHandlerName(node) {
-		return this.resolveName(node.operationId);
-	}
-}));
+	handler: { name(node) {
+		return this.name(node.operationId);
+	} }
+});
 //#endregion
 //#region src/plugin.ts
 /**
@@ -1083,10 +1060,7 @@ const pluginMcp = definePlugin((options) => {
 		options,
 		dependencies: [pluginTsName, pluginZodName],
 		hooks: { "kubb:plugin:setup"(ctx) {
-			const resolver = userResolver ? {
-				...resolverMcp,
-				...userResolver
-			} : resolverMcp;
+			const resolver = userResolver ? Resolver.merge(resolverMcp, userResolver) : resolverMcp;
 			const resolvedClient = resolveClient({
 				client,
 				pluginNames: (ctx.config.plugins ?? []).map((p) => p.name).filter((name) => Boolean(name))