@kubb/plugin-vue-query 5.0.0-beta.85 → 5.0.0-beta.87

package/dist/index.cjs

@@ -24,12 +24,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-let node_path = require("node:path");
-node_path = __toESM(node_path, 1);
 let kubb_kit = require("kubb/kit");
 let _kubb_plugin_ts = require("@kubb/plugin-ts");
 let kubb_jsx = require("kubb/jsx");
 let kubb_jsx_jsx_runtime = require("kubb/jsx/jsx-runtime");
+let node_path = require("node:path");
+node_path = __toESM(node_path, 1);
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -57,31 +57,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.
@@ -182,9 +157,42 @@ 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
+//#region ../../internals/utils/src/strings.ts
+/**
+* Renders a dotted path or string array as an optional-chaining accessor expression rooted at
+* `accessor`. Returns `null` for an empty path.
+*
+* @example
+* ```ts
+* getNestedAccessor('pagination.next.id', 'lastPage')
+* // "lastPage?.['pagination']?.['next']?.['id']"
+* ```
+*/
+function getNestedAccessor(param, accessor) {
+	const parts = Array.isArray(param) ? param : param.split(".");
+	if (parts.length === 0 || parts.length === 1 && parts[0] === "") return null;
+	return `${accessor}?.['${`${parts.join("']?.['")}']`}`;
+}
+//#endregion
 //#region ../../internals/utils/src/url.ts
 function transformParam(raw, casing) {
 	const param = isValidVarName(raw) ? raw : camelCase(raw);
@@ -337,13 +345,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") {
@@ -360,8 +368,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,
@@ -371,20 +382,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);
@@ -481,13 +487,13 @@ 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 resolveSuccessNames(node, resolver) {
-	return node.responses.filter((response) => isSuccessStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+	return node.responses.filter((response) => isSuccessStatusCode(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 = {}) {
@@ -504,11 +510,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,
@@ -607,12 +613,12 @@ function maybeRefOrGetter(type) {
 /**
 * 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) {
@@ -627,13 +633,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$1.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 (0, _kubb_plugin_ts.createFunctionParameter)({
@@ -645,7 +651,7 @@ function buildGroupedRequestParam(node, options) {
 	}
 	return (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: (0, _kubb_plugin_ts.createObjectBindingPattern)({ elements: names.map((name) => ({ name })) }),
-		type: requestConfigType,
+		type: optionsType,
 		optional: false,
 		...isOptional ? { default: "{}" } : {}
 	});
@@ -759,15 +765,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: node_path.default.resolve(root, ".kubb/client.ts")
 	};
@@ -854,7 +860,7 @@ function getQueryOptionsParams(node, options) {
 }
 function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TData = responseName;
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
@@ -894,7 +900,7 @@ const callPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildInfiniteQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
@@ -917,7 +923,7 @@ function buildInfiniteQueryParamsNode(node, options) {
 }
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TData = responseName;
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
@@ -967,7 +973,7 @@ const declarationPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "decla
 const callPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, queryParam, queryKeyName }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
-	const queryFnDataType = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const queryFnDataType = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
@@ -977,8 +983,8 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
 	const rawQueryParams = getOperationParameters(node, { paramsCasing: "original" }).query;
 	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
-		const groupName = tsResolver.resolveQueryParamsName(node, rawQueryParams[0]);
-		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : null;
+		const groupName = tsResolver.param.query(node, rawQueryParams[0]);
+		return groupName !== tsResolver.param.name(node, rawQueryParams[0]) ? groupName : null;
 	})() : null;
 	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
@@ -994,8 +1000,8 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
-			const nextAccessor = nextParam ? kubb_kit.ast.getNestedAccessor(nextParam, "lastPage") : null;
-			const prevAccessor = previousParam ? kubb_kit.ast.getNestedAccessor(previousParam, "firstPage") : null;
+			const nextAccessor = nextParam ? getNestedAccessor(nextParam, "lastPage") : null;
+			const prevAccessor = previousParam ? getNestedAccessor(previousParam, "firstPage") : null;
 			return [nextAccessor ? `getNextPageParam: (lastPage) => ${nextAccessor}` : null, prevAccessor ? `getPreviousPageParam: (firstPage) => ${prevAccessor}` : null];
 		}
 		if (cursorParam) return [`getNextPageParam: (lastPage) => lastPage['${cursorParam}']`, `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`];
@@ -1057,12 +1063,12 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function resolveMutationRequestType(node, resolver) {
-	return buildGroupedRequestParam(node, { resolver }) ? resolver.resolveRequestConfigName(node) : "undefined";
+	return buildGroupedRequestParam(node, { resolver }) ? resolver.response.options(node) : "undefined";
 }
 function buildMutationParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
 	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [(0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
@@ -1080,7 +1086,7 @@ function buildMutationParamsNode(node, options) {
 }
 function Mutation({ name, clientName, node, tsResolver, mutationKeyName }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TData = responseName;
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
@@ -1099,8 +1105,6 @@ function Mutation({ name, clientName, node, tsResolver, mutationKeyName }) {
 		resolveMutationRequestType(node, tsResolver),
 		"TContext"
 	].join(", ");
-	const mutationKeyParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: [] });
-	const mutationKeyParamsCall = callPrinter$1.print(mutationKeyParamsNode) ?? "";
 	const paramsNode = buildMutationParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
@@ -1116,10 +1120,10 @@ function Mutation({ name, clientName, node, tsResolver, mutationKeyName }) {
 			children: `
         const { mutation = {}, client: config = {} } = options ?? {}
         const { client: queryClient, ...mutationOptions } = mutation;
-        const mutationKey = mutationOptions?.mutationKey ?? ${mutationKeyName}(${mutationKeyParamsCall})
+        const mutationKey = mutationOptions?.mutationKey ?? ${mutationKeyName}()
 
         return useMutation<${generics}>({
-          mutationFn: async(${hasMutationParams ? argBindingStr : ""}) => {
+          mutationFn: async(${argBindingStr}) => {
             ${mutationFnBody}
           },
           mutationKey,
@@ -1136,7 +1140,7 @@ const callPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
 	const errorNames = resolveErrorNames(node, resolver);
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
@@ -1159,7 +1163,7 @@ function buildQueryParamsNode(node, options) {
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.response.response(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TData = responseName;
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
@@ -1228,9 +1232,7 @@ const infiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 		if (!isQuery || isMutation || !infiniteOptions) return null;
 		const normalizeKey = (key) => key.replace(/\?$/, "");
 		const queryParamKeys = getOperationParameters(node, { paramsCasing: "original" }).query.map((p) => p.name);
-		const hasQueryParam = infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false;
-		const hasCursorParam = !infiniteOptions.cursorParam || true;
-		if (!hasQueryParam || !hasCursorParam) return null;
+		if (!(infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false)) return null;
 		const importPath = query ? query.importPath : "@tanstack/vue-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1240,26 +1242,28 @@ const infiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 			output
 		});
 		if (!contractOp) return null;
-		const queryName = resolver.resolveInfiniteQueryName(node);
-		const queryOptionsName = resolver.resolveInfiniteQueryOptionsName(node);
-		const queryKeyName = resolver.resolveInfiniteQueryKeyName(node);
-		const queryKeyTypeName = resolver.resolveInfiniteQueryKeyTypeName(node);
+		const queryName = resolver.infiniteQuery.name(node);
+		const queryOptionsName = resolver.infiniteQuery.optionsName(node);
+		const queryKeyName = resolver.infiniteQuery.keyName(node);
+		const queryKeyTypeName = resolver.infiniteQuery.keyTypeName(node);
 		const meta = {
-			file: resolver.resolveFile(operationFileEntry(node, queryName), {
+			file: resolver.file({
+				...operationFileEntry(node, queryName),
 				root,
 				output,
 				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
+			fileTs: tsResolver.file({
+				...operationFileEntry(node, node.operationId),
 				root,
 				output: pluginTs.options?.output ?? output,
 				group: pluginTs.options?.group ?? void 0
 			})
 		};
 		const rawQueryParams = getOperationParameters(node, { paramsCasing: "original" }).query;
-		const queryParamsTypeName = rawQueryParams.length > 0 && tsResolver.resolveQueryParamsName(node, rawQueryParams[0]) !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? tsResolver.resolveQueryParamsName(node, rawQueryParams[0]) : null;
+		const queryParamsTypeName = rawQueryParams.length > 0 && tsResolver.param.query(node, rawQueryParams[0]) !== tsResolver.param.name(node, rawQueryParams[0]) ? tsResolver.param.query(node, rawQueryParams[0]) : null;
 		const importedTypeNames = [
-			tsResolver.resolveRequestConfigName(node),
+			tsResolver.response.options(node),
 			queryParamsTypeName,
 			...resolveOperationTypeNames(node, tsResolver, {
 				exclude: [queryKeyTypeName],
@@ -1272,7 +1276,7 @@ const infiniteQueryGenerator = (0, kubb_kit.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: {
@@ -1280,7 +1284,7 @@ const infiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1402,22 +1406,24 @@ const mutationGenerator = (0, kubb_kit.defineGenerator)({
 			output
 		});
 		if (!contractOp) return null;
-		const mutationHookName = resolver.resolveMutationName(node);
-		const mutationTypeName = resolver.resolveMutationTypeName(node);
-		const mutationKeyName = resolver.resolveMutationKeyName(node);
+		const mutationHookName = resolver.mutation.name(node);
+		const mutationTypeName = resolver.mutation.typeName(node);
+		const mutationKeyName = resolver.mutation.keyName(node);
 		const meta = {
-			file: resolver.resolveFile(operationFileEntry(node, mutationHookName), {
+			file: resolver.file({
+				...operationFileEntry(node, mutationHookName),
 				root,
 				output,
 				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
+			fileTs: tsResolver.file({
+				...operationFileEntry(node, node.operationId),
 				root,
 				output: pluginTs.options?.output ?? output,
 				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		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));
@@ -1428,7 +1434,7 @@ const mutationGenerator = (0, kubb_kit.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: {
@@ -1436,7 +1442,7 @@ const mutationGenerator = (0, kubb_kit.defineGenerator)({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1529,23 +1535,25 @@ const queryGenerator = (0, kubb_kit.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(operationFileEntry(node, queryName), {
+			file: resolver.file({
+				...operationFileEntry(node, queryName),
 				root,
 				output,
 				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
+			fileTs: tsResolver.file({
+				...operationFileEntry(node, node.operationId),
 				root,
 				output: pluginTs.options?.output ?? output,
 				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		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
@@ -1555,7 +1563,7 @@ const queryGenerator = (0, kubb_kit.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: {
@@ -1563,7 +1571,7 @@ const queryGenerator = (0, kubb_kit.defineGenerator)({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1654,69 +1662,67 @@ function capitalize(name) {
 * file paths for every generated TanStack Query composable (`useFoo`,
 * `useFooInfinite`) and its companion helpers.
 *
-* Functions and files use camelCase; composables get the `use` prefix.
+* The `default` helpers are supplied by `createResolver`. Functions and files use camelCase;
+* composables get the `use` prefix. Operation-specific naming is grouped under the `query`,
+* `infiniteQuery`, and `mutation` namespaces.
 *
 * @example Resolve composable and helper names
 * ```ts
 * import { resolverVueQuery } from '@kubb/plugin-vue-query'
 *
-* resolverVueQuery.resolveQueryName(operationNode)       // 'useGetPetById'
-* resolverVueQuery.resolveQueryKeyName(operationNode)    // 'getPetByIdQueryKey'
-* resolverVueQuery.resolveQueryOptionsName(operationNode) // 'getPetByIdQueryOptions'
+* resolverVueQuery.query.name(operationNode)        // 'useGetPetById'
+* resolverVueQuery.query.keyName(operationNode)     // 'getPetByIdQueryKey'
+* resolverVueQuery.query.optionsName(operationNode) // 'getPetByIdQueryOptions'
 * ```
 */
-const resolverVueQuery = (0, kubb_kit.defineResolver)(() => ({
-	name: "default",
+const resolverVueQuery = (0, kubb_kit.createResolver)({
 	pluginName: "plugin-vue-query",
-	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))}`;
-	},
-	resolveInfiniteQueryName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}Infinite`;
-	},
-	resolveMutationName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}`;
-	},
-	resolveQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}QueryOptions`;
-	},
-	resolveInfiniteQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}InfiniteQueryOptions`;
-	},
-	resolveQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}QueryKey`;
-	},
-	resolveInfiniteQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}InfiniteQueryKey`;
-	},
-	resolveMutationKeyName(node) {
-		return `${this.resolveName(node.operationId)}MutationKey`;
-	},
-	resolveQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}QueryKey`;
-	},
-	resolveInfiniteQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}InfiniteQueryKey`;
-	},
-	resolveMutationTypeName(node) {
-		return capitalize(this.resolveName(node.operationId));
+	query: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}QueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}QueryKey`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}QueryOptions`;
+		},
+		clientName(node) {
+			return this.name(node.operationId);
+		}
 	},
-	resolveClientName(node) {
-		return this.resolveName(node.operationId);
+	infiniteQuery: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}Infinite`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}InfiniteQueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}InfiniteQueryKey`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}InfiniteQueryOptions`;
+		},
+		clientName(node) {
+			return `${this.name(node.operationId)}Infinite`;
+		}
 	},
-	resolveInfiniteClientName(node) {
-		return `${this.resolveName(node.operationId)}Infinite`;
+	mutation: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}MutationKey`;
+		},
+		typeName(node) {
+			return capitalize(this.name(node.operationId));
+		}
 	}
-}));
+});
 //#endregion
 //#region src/plugin.ts
 /**
@@ -1757,17 +1763,14 @@ const pluginVueQuery = (0, kubb_kit.definePlugin)((options) => {
 		queryGenerator,
 		infiniteQueryGenerator,
 		mutationGenerator
-	].filter((generator) => Boolean(generator));
+	];
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginVueQueryName,
 		options,
 		dependencies: [_kubb_plugin_ts.pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
-			const resolver = userResolver ? {
-				...resolverVueQuery,
-				...userResolver
-			} : resolverVueQuery;
+			const resolver = userResolver ? kubb_kit.Resolver.merge(resolverVueQuery, userResolver) : resolverVueQuery;
 			const resolvedClient = resolveClient({
 				client,
 				pluginNames: (ctx.config.plugins ?? []).map((p) => p.name).filter((name) => Boolean(name))