@kubb/plugin-mcp 5.3.2 → 5.3.3

package/dist/index.js

@@ -4,8 +4,7 @@ import { Const, File, Function, jsxRenderer } from "kubb/jsx";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 import { pluginZodName } from "@kubb/plugin-zod";
 import { pluginTsName } from "@kubb/plugin-ts";
-//#endregion
-//#region ../../internals/shared/src/operation.ts
+// ../../internals/shared/src/operation.ts
 /**
 * Builds the `ResolverFileParams` every operation generator passes to
 * `resolver.file`: a file named `name`, tagged by the operation's first
@@ -127,8 +126,9 @@ function buildRequestParamsSignature(node, resolver, options = {}) {
 		"body",
 		"headers"
 	].filter((key) => groups[key]);
+	const optionsType = hasRequestContentTypeChoice(node) ? `Pick<${resolver.response.options(node)}, ${names.map((name) => `'${name}'`).join(" | ")}>` : resolver.response.options(node);
 	return {
-		signature: [names.length > 0 ? `{ ${names.join(", ")} }: ${resolver.response.options(node)}${isOptional ? " = {}" : ""}` : null, isConfigurable ? `config: ${buildRequestConfigType(node)} = {}` : null].filter(Boolean).join(", "),
+		signature: [names.length > 0 ? `{ ${names.join(", ")} }: ${optionsType}${isOptional ? " = {}" : ""}` : null, isConfigurable ? `config: ${buildRequestConfigType(node)} = {}` : null].filter(Boolean).join(", "),
 		groups
 	};
 }
@@ -176,6 +176,22 @@ function getOperationParameters(node) {
 	operationParameterGroupsByNode.set(node, groups);
 	return groups;
 }
+/**
+* Builds the combined `{ body, path, query, headers }` options object schema for an operation,
+* referencing the already-resolved body and grouped param names. Shared by `@kubb/plugin-ts`'s
+* `Options` type and `@kubb/plugin-zod`'s inferred options schema, so both printers emit the same
+* shape from the same inputs. `primitive: 'object'` is a no-op for the TS printer and tells the Zod
+* printer to emit `z.object(…)` rather than a record.
+*/
+function hasRequestContentTypeChoice(node) {
+	return (node.requestBody?.content ?? []).filter((entry) => entry.schema).length > 1;
+}
+/**
+* Casts a call argument to the client's parameter type; a `'plain'` client is non-generic.
+*/
+function castToClientOptions(callArg, clientName, returnType = "full") {
+	return `${callArg} as Parameters<typeof ${clientName}${returnType === "plain" ? "" : "<true>"}>[0]`;
+}
 function getStatusCodeNumber(statusCode) {
 	const code = Number(statusCode);
 	return Number.isNaN(code) ? null : code;
@@ -193,8 +209,7 @@ function getOperationSuccessResponses(node) {
 function getPrimarySuccessResponse(node) {
 	return getOperationSuccessResponses(node)[0] ?? null;
 }
-//#endregion
-//#region ../../internals/utils/src/casing.ts
+// ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
 * Splits on common word boundaries (spaces, hyphens, underscores, dots, slashes, colons)
@@ -231,8 +246,7 @@ function toCamelOrPascal(text, pascal) {
 function camelCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
-//#endregion
-//#region ../../internals/utils/src/fs.ts
+// ../../internals/utils/src/fs.ts
 function toSlash(p) {
 	if (p.startsWith("\\\\?\\")) return p;
 	return p.replaceAll("\\", "/");
@@ -251,8 +265,26 @@ function getRelativePath(rootDir, filePath) {
 	const relativePath = posix.relative(toSlash(rootDir), toSlash(filePath));
 	return relativePath.startsWith("../") ? relativePath : `./${relativePath}`;
 }
-//#endregion
-//#region ../../internals/shared/src/group.ts
+// ../../internals/shared/src/resolver.ts
+/**
+* Builds the allocation key for a declaration an operation owns. `scope` names which declaration
+* it is, so two of them never share an allocation even when a custom resolver gives both the same
+* name. Leave `scope` empty for the operation's own declaration.
+*
+* @example
+* ```ts
+* resolver.resolveName({ key: operationKey(node, 'response', 'status', 404), name })
+* ```
+*/
+function operationKey(node, ...scope) {
+	return [
+		"operation",
+		node.method,
+		node.path,
+		...scope.map(String)
+	];
+}
+// ../../internals/shared/src/group.ts
 /**
 * Builds the `group` config a Kubb plugin passes to `ctx.setOptions`, applying the
 * shared default naming so every plugin groups output consistently:
@@ -282,8 +314,7 @@ function createGroupConfig(group) {
 		name: group.name ? group.name : defaultName
 	};
 }
-//#endregion
-//#region src/components/McpHandler.tsx
+// src/components/McpHandler.tsx
 const requestGroupOrder = [
 	"path",
 	"query",
@@ -298,6 +329,7 @@ function McpHandler({ name, clientName, node, resolver, returnType = "full" }) {
 		"signal: ctx.mcpReq.signal",
 		"throwOnError: true"
 	].join(", ")} }`;
+	const callArg = hasRequestContentTypeChoice(node) ? castToClientOptions(callConfig, clientName, returnType) : callConfig;
 	const body = returnType === "data" ? "res" : "res.data";
 	const callToolResult = `return {
   content: [
@@ -320,15 +352,14 @@ function McpHandler({ name, clientName, node, resolver, returnType = "full" }) {
 			JSDoc: { comments: buildOperationComments(node) },
 			returnType: "CallToolResult",
 			children: [
-				`const res = await ${clientName}(${callConfig})`,
+				`const res = await ${clientName}(${callArg})`,
 				/* @__PURE__ */ jsx("br", {}),
 				callToolResult
 			]
 		})
 	});
 }
-//#endregion
-//#region src/components/Server.tsx
+// src/components/Server.tsx
 /**
 * Composes individual param schemas into `z.object({ ... })`.
 */
@@ -417,8 +448,7 @@ return server`
 		})
 	] });
 }
-//#endregion
-//#region ../../internals/client/src/resolveOperationTypes.ts
+// ../../internals/client/src/resolveOperationTypes.ts
 /**
 * A `plugin-ts` shaped resolver whose operation type names point at the types `pluginZod({ inferred })`
 * exports next to each schema, so code written against `plugin-ts` names picks up the zod types.
@@ -484,8 +514,7 @@ function resolveOperationTypes(driver, pluginName) {
 		group: pluginZod.options.group ?? void 0
 	};
 }
-//#endregion
-//#region ../../internals/client/src/resolveClient.ts
+// ../../internals/client/src/resolveClient.ts
 /**
 * Resolves which client plugin a consumer (react-query, vue-query, swr, mcp) should call for an
 * operation, shared so the selection rules and diagnostics stay in one place.
@@ -595,8 +624,7 @@ function resolveContractClient(options) {
 	}
 	return resolved;
 }
-//#endregion
-//#region ../../internals/client/src/resolveClientOperation.ts
+// ../../internals/client/src/resolveClientOperation.ts
 function isRelativeImport(importPath) {
 	return importPath.startsWith(".");
 }
@@ -643,8 +671,12 @@ function resolveClientOperation(options) {
 			group: operationOptions.group ?? void 0
 		});
 		const { importPath } = operationOptions;
+		const name = resolver.name(node.operationId);
 		return {
-			name: resolver.name(node.operationId),
+			name: resolver.resolveName({
+				key: operationKey(node),
+				name
+			}),
 			path: file.path,
 			clientPath: importPath === void 0 ? path.resolve(root, ".kubb/client.ts") : resolveImportPath({
 				importPath,
@@ -655,8 +687,7 @@ function resolveClientOperation(options) {
 		};
 	});
 }
-//#endregion
-//#region src/generators/mcpGenerator.tsx
+// src/generators/mcpGenerator.tsx
 /**
 * Built-in operation generator for `@kubb/plugin-mcp`. Emits one MCP tool
 * handler per OpenAPI operation. The handler takes the grouped `{ path, query,
@@ -747,8 +778,7 @@ const mcpGenerator = defineGenerator({
 		});
 	}
 });
-//#endregion
-//#region src/generators/serverGenerator.tsx
+// src/generators/serverGenerator.tsx
 /**
 * Default v5 server generator for `@kubb/plugin-mcp`.
 *
@@ -921,17 +951,14 @@ const serverGenerator = defineGenerator({
 		] });
 	}
 });
-//#endregion
-//#region kubb-extension.json
+// kubb-extension.json
 var compatibility = {
-	"kubb": ">=5.8.3",
+	"kubb": ">=5.14.6",
 	"node": ">=22.22"
 };
-//#endregion
-//#region package.json
-var version = "5.3.2";
-//#endregion
-//#region src/resolvers/resolverMcp.ts
+// package.json
+var version = "5.3.3";
+// src/resolvers/resolverMcp.ts
 /**
 * Default resolver used by `@kubb/plugin-mcp`. Decides the names and file
 * paths for every generated MCP tool handler. Function names get a `Handler`
@@ -950,11 +977,14 @@ const resolverMcp = createResolver({
 		return camelCase(name, { suffix: "handler" });
 	},
 	handler: { name(node) {
-		return this.name(node.operationId);
+		const name = this.name(node.operationId);
+		return this.resolveName({
+			key: operationKey(node, "handler", "name"),
+			name
+		});
 	} }
 });
-//#endregion
-//#region src/plugin.ts
+// src/plugin.ts
 /**
 * Canonical plugin name for `@kubb/plugin-mcp`. Used for driver lookups and
 * cross-plugin dependency references.
@@ -1023,7 +1053,6 @@ const pluginMcp = defineExtension({
 		};
 	}
 });
-//#endregion
 export { McpHandler, Server, pluginMcp as default, pluginMcp, mcpGenerator, pluginMcpName, resolverMcp, serverGenerator };
 
 //# sourceMappingURL=index.js.map