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

package/dist/index.js

@@ -1,7 +1,7 @@
 import { t as __name } from "./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 { createFunctionParameter, createFunctionParameters, createObjectBindingPattern, createTypeLiteral, functionPrinter, pluginTsName } from "@kubb/plugin-ts";
+import path from "node:path";
 import { File, Function, Type, jsxRenderer } from "kubb/jsx";
 import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 //#region ../../internals/utils/src/casing.ts
@@ -31,31 +31,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.
@@ -156,6 +131,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
@@ -311,13 +302,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") {
@@ -334,8 +325,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,
@@ -345,20 +339,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);
@@ -455,10 +444,10 @@ function getPrimarySuccessResponse(node) {
 	return getOperationSuccessResponses(node)[0] ?? null;
 }
 function resolveErrorNames(node, resolver) {
-	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.response.status(node, response.statusCode));
 }
 function resolveStatusCodeNames(node, resolver) {
-	return node.responses.map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+	return node.responses.map((response) => resolver.response.status(node, response.statusCode));
 }
 const typeNamesByResolver = /* @__PURE__ */ new WeakMap();
 function resolveOperationTypeNames(node, resolver, options = {}) {
@@ -475,11 +464,11 @@ function resolveOperationTypeNames(node, resolver, options = {}) {
 	const responseStatusNames = options.responseStatusNames === "error" ? resolveErrorNames(node, resolver) : options.responseStatusNames === false ? [] : resolveStatusCodeNames(node, resolver);
 	const exclude = new Set(options.exclude ?? []);
 	const paramNames = options.includeParams === false ? [] : [
-		...path.map((param) => resolver.resolvePathParamsName(node, param)),
-		...query.map((param) => resolver.resolveQueryParamsName(node, param)),
-		...header.map((param) => resolver.resolveHeaderParamsName(node, param))
+		...path.map((param) => resolver.param.path(node, param)),
+		...query.map((param) => resolver.param.query(node, param)),
+		...header.map((param) => resolver.param.headers(node, param))
 	];
-	const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null, resolver.resolveResponseName(node)];
+	const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.response.body(node) : null, resolver.response.response(node)];
 	const result = (options.order === "body-response-first" ? [
 		...bodyAndResponseNames,
 		...paramNames,
@@ -603,15 +592,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")
 	};
@@ -659,12 +648,12 @@ const requestGroupOrder = [
 /**
 * Builds the grouped `{ path, query, body, headers }` parameter that mirrors the client
 * function signature. Only the groups the operation carries are emitted, typed from the
-* operation's `RequestConfig`. `keys` narrows the emitted groups, used by the query key which
+* operation's `Options`. `keys` narrows the emitted groups, used by the query key which
 * never carries `headers`.
 *
-* By default the whole group is typed as the single `RequestConfig` reference. When
+* By default the whole group is typed as the single `Options` reference. When
 * `memberTypeWrapper` is set, each group is emitted as its own member typed from the matching
-* `RequestConfig['<group>']` slice and wrapped, used by vue-query to apply
+* `Options['<group>']` slice and wrapped, used by vue-query to apply
 * `MaybeRefOrGetter` per group.
 */
 function buildGroupedRequestParam(node, options) {
@@ -679,13 +668,13 @@ function buildGroupedRequestParam(node, options) {
 		headers: hasRequiredHeader
 	};
 	const isOptional = names.every((name) => !requiredByGroup[name]);
-	const requestConfigName = resolver.resolveRequestConfigName(node);
+	const optionsName = resolver.response.options(node);
 	const omittedKeys = requestGroupOrder.filter((key) => !keys.includes(key));
-	const requestConfigType = omittedKeys.length > 0 ? `Omit<${requestConfigName}, ${omittedKeys.map((key) => `'${key}'`).join(" | ")}>` : requestConfigName;
+	const optionsType = omittedKeys.length > 0 ? `Omit<${optionsName}, ${omittedKeys.map((key) => `'${key}'`).join(" | ")}>` : optionsName;
 	if (memberTypeWrapper) {
 		const members = names.map((name) => ({
 			name,
-			type: memberTypeWrapper(`${requestConfigType}['${name}']`),
+			type: memberTypeWrapper(`${optionsType}['${name}']`),
 			optional: !requiredByGroup[name]
 		}));
 		return createFunctionParameter({
@@ -697,7 +686,7 @@ function buildGroupedRequestParam(node, options) {
 	}
 	return createFunctionParameter({
 		name: createObjectBindingPattern({ elements: names.map((name) => ({ name })) }),
-		type: requestConfigType,
+		type: optionsType,
 		optional: false,
 		...isOptional ? { default: "{}" } : {}
 	});
@@ -743,7 +732,7 @@ function buildClientCall(node, options) {
 }
 /**
 * Build QueryKey params as the grouped `{ path, query, body }` object (NO headers, NO config),
-* typed from the operation's `RequestConfig` minus `url`. The query key transformer reads the
+* typed from the operation's `Options` minus `url`. The query key transformer reads the
 * grouped `path`/`query`/`body` bindings.
 */
 function buildQueryKeyParams(node, options) {
@@ -805,7 +794,7 @@ const declarationPrinter$2 = functionPrinter({ mode: "declaration" });
 const callPrinter$1 = functionPrinter({ mode: "call" });
 function buildMutationParamsNode(node, options) {
 	const { mutationKeyTypeName, mutationArgTypeName, resolver } = options;
-	const responseName = resolver.resolveResponseName(node);
+	const responseName = resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
 	return createFunctionParameters({ params: [createFunctionParameter({
 		name: "options",
@@ -818,14 +807,14 @@ function buildMutationParamsNode(node, options) {
 	})] });
 }
 function Mutation({ name, clientName, mutationKeyName, mutationKeyTypeName, mutationArgTypeName, node, tsResolver }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const responseName = tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TData = responseName;
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const groupedParam = buildGroupedRequestParam(node, { resolver: tsResolver });
 	const hasMutationParams = groupedParam !== null;
 	const groupedParamsNode = createFunctionParameters({ params: groupedParam ? [groupedParam] : [] });
-	const argTypeBody = hasMutationParams ? tsResolver.resolveRequestConfigName(node) : "";
+	const argTypeBody = hasMutationParams ? tsResolver.response.options(node) : "";
 	const argBindingStr = hasMutationParams ? callPrinter$1.print(groupedParamsNode) ?? "" : "";
 	const mutationFnBody = `const { data } = await ${buildClientCall(node, {
 		clientName,
@@ -898,44 +887,12 @@ function MutationKey({ name, typeName, node, transformer }) {
 	})] });
 }
 //#endregion
-//#region src/components/QueryOptions.tsx
-const declarationPrinter$1 = functionPrinter({ mode: "declaration" });
-function getQueryOptionsParams(node, options) {
-	return buildQueryOptionsParams(node, options);
-}
-function QueryOptions({ name, clientName, node, tsResolver }) {
-	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
-	const fetcherBody = `const { data } = await ${buildClientCall(node, {
-		clientName,
-		signal: false
-	})}
-          return data`;
-	return /* @__PURE__ */ jsx(File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ jsx(Function, {
-			name,
-			export: true,
-			params: paramsSignature,
-			children: `
-      return {
-        fetcher: async () => {
-          ${fetcherBody}
-        },
-      }
-`
-		})
-	});
-}
-//#endregion
 //#region src/components/Query.tsx
-const declarationPrinter = functionPrinter({ mode: "declaration" });
+const declarationPrinter$1 = functionPrinter({ mode: "declaration" });
 const callPrinter = functionPrinter({ mode: "call" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
-	const responseName = resolver.resolveResponseName(node);
+	const responseName = resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
 	const optionsParam = createFunctionParameter({
 		name: "options",
@@ -950,7 +907,7 @@ function buildQueryParamsNode(node, options) {
 	return createFunctionParameters({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const responseName = tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const generics = [
 		responseName,
@@ -959,10 +916,10 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 	];
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
+	const queryOptionsParamsNode = buildQueryOptionsParams(node, { resolver: tsResolver });
 	const queryOptionsParamsCall = callPrinter.print(queryOptionsParamsNode) ?? "";
 	const paramsNode = buildQueryParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -994,6 +951,35 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 	});
 }
 //#endregion
+//#region src/components/QueryOptions.tsx
+const declarationPrinter = functionPrinter({ mode: "declaration" });
+function QueryOptions({ name, clientName, node, tsResolver }) {
+	const paramsNode = buildQueryOptionsParams(node, { resolver: tsResolver });
+	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
+	const fetcherBody = `const { data } = await ${buildClientCall(node, {
+		clientName,
+		signal: false
+	})}
+          return data`;
+	return /* @__PURE__ */ jsx(File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ jsx(Function, {
+			name,
+			export: true,
+			params: paramsSignature,
+			children: `
+      return {
+        fetcher: async () => {
+          ${fetcherBody}
+        },
+      }
+`
+		})
+	});
+}
+//#endregion
 //#region src/generators/mutationGenerator.tsx
 /**
 * Built-in generator for `useSWRMutation` hooks. Emits one `useFooMutation` hook
@@ -1022,33 +1008,31 @@ const mutationGenerator = defineGenerator({
 			output
 		});
 		if (!contractOp) return null;
-		const mutationHookName = resolver.resolveMutationName(node);
-		const mutationKeyName = resolver.resolveMutationKeyName(node);
-		const mutationKeyTypeName = resolver.resolveMutationKeyTypeName(node);
-		const mutationArgTypeName = resolver.resolveMutationArgTypeName(node);
+		const mutationHookName = resolver.mutation.name(node);
+		const mutationKeyName = resolver.mutation.keyName(node);
+		const mutationKeyTypeName = resolver.mutation.keyTypeName(node);
+		const mutationArgTypeName = resolver.mutation.argTypeName(node);
 		const meta = {
-			file: resolver.resolveFile({
+			file: resolver.file({
 				name: mutationHookName,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output,
 				group
 			}),
-			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
 			})
 		};
-		const importedTypeNames = [tsResolver.resolveRequestConfigName(node), ...resolveOperationTypeNames(node, tsResolver, {
+		const importedTypeNames = [tsResolver.response.options(node), ...resolveOperationTypeNames(node, tsResolver, {
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
@@ -1057,7 +1041,7 @@ const mutationGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
+			banner: resolver.default.banner(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1065,7 +1049,7 @@ const mutationGenerator = defineGenerator({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1133,14 +1117,11 @@ const queryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, client, group } = ctx.options;
+		const { output, query, client, group } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		const isMutation = mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase());
-		if (!isQuery || isMutation) return null;
+		if (!(query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase()))) return null;
 		const importPath = query ? query.importPath : "swr";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1150,33 +1131,31 @@ const queryGenerator = defineGenerator({
 			output
 		});
 		if (!contractOp) return null;
-		const queryName = resolver.resolveQueryName(node);
-		const queryOptionsName = resolver.resolveQueryOptionsName(node);
-		const queryKeyName = resolver.resolveQueryKeyName(node);
-		const queryKeyTypeName = resolver.resolveQueryKeyTypeName(node);
+		const queryName = resolver.query.name(node);
+		const queryOptionsName = resolver.query.optionsName(node);
+		const queryKeyName = resolver.query.keyName(node);
+		const queryKeyTypeName = resolver.query.keyTypeName(node);
 		const meta = {
-			file: resolver.resolveFile({
+			file: resolver.file({
 				name: queryName,
 				extname: ".ts",
 				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+				path: node.path,
 				root,
 				output,
 				group
 			}),
-			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
 			})
 		};
-		const importedTypeNames = [tsResolver.resolveRequestConfigName(node), ...resolveOperationTypeNames(node, tsResolver, {
+		const importedTypeNames = [tsResolver.response.options(node), ...resolveOperationTypeNames(node, tsResolver, {
 			exclude: [queryKeyTypeName],
 			order: "body-response-first",
 			includeParams: false
@@ -1186,7 +1165,7 @@ const queryGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
+			banner: resolver.default.banner(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1194,7 +1173,7 @@ const queryGenerator = defineGenerator({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1262,53 +1241,55 @@ function capitalize(name) {
 	return `${name.charAt(0).toUpperCase()}${name.slice(1)}`;
 }
 /**
-* Naming convention resolver for the SWR plugin.
+* Default resolver used by `@kubb/plugin-swr`. Decides the names and file paths for every generated
+* SWR hook (`useFoo`, `useFooMutation`) and its companion helpers (`fooQueryKey`, `fooQueryOptions`,
+* `fooMutationKey`).
 *
-* Provides default naming helpers using camelCase for functions and file paths.
+* Functions and files use the built-in camelCase casing; hooks get the `use` prefix.
 *
-* @example
-* `resolverSwr.default('list pets', 'function')  // → 'listPets'`
+* @example Resolve hook and helper names
+* ```ts
+* import { resolverSwr } from '@kubb/plugin-swr'
+*
+* resolverSwr.query.name(operationNode)       // 'useGetPetById'
+* resolverSwr.query.keyName(operationNode)     // 'getPetByIdQueryKey'
+* resolverSwr.mutation.name(operationNode)     // 'useUpdatePet'
+* ```
 */
-const resolverSwr = defineResolver(() => ({
-	name: "default",
+const resolverSwr = createResolver({
 	pluginName: "plugin-swr",
-	default(name, type) {
-		return type === "file" ? toFilePath(name) : camelCase(name);
-	},
-	resolveName(name) {
-		return this.default(name, "function");
-	},
-	resolvePathName(name, type) {
-		return this.default(name, type);
-	},
-	resolveQueryName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}`;
-	},
-	resolveMutationName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}`;
-	},
-	resolveQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}QueryOptions`;
-	},
-	resolveQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}QueryKey`;
-	},
-	resolveMutationKeyName(node) {
-		return `${this.resolveName(node.operationId)}MutationKey`;
-	},
-	resolveQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}QueryKey`;
-	},
-	resolveMutationKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}MutationKey`;
-	},
-	resolveMutationArgTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}MutationArg`;
+	query: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}QueryOptions`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}QueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}QueryKey`;
+		},
+		clientName(node) {
+			return this.name(node.operationId);
+		}
 	},
-	resolveClientName(node) {
-		return this.resolveName(node.operationId);
+	mutation: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}MutationKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}MutationKey`;
+		},
+		argTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}MutationArg`;
+		}
 	}
-}));
+});
 //#endregion
 //#region src/plugin.ts
 /**
@@ -1342,17 +1323,14 @@ const pluginSwr = definePlugin((options) => {
 		path: "hooks",
 		barrel: { type: "named" }
 	}, group, exclude = [], include, override = [], mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, client, resolver: userResolver, macros: userMacros } = options;
-	const selectedGenerators = [queryGenerator, mutationGenerator].filter((generator) => Boolean(generator));
+	const selectedGenerators = [queryGenerator, mutationGenerator];
 	const groupConfig = createGroupConfig(group) ?? void 0;
 	return {
 		name: pluginSwrName,
 		options,
 		dependencies: [pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
-			const resolver = userResolver ? {
-				...resolverSwr,
-				...userResolver
-			} : resolverSwr;
+			const resolver = userResolver ? Resolver.merge(resolverSwr, userResolver) : resolverSwr;
 			const resolvedClient = resolveClient({
 				client,
 				pluginNames: (ctx.config.plugins ?? []).map((p) => p.name).filter((name) => Boolean(name))