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

package/dist/index.cjs

@@ -24,9 +24,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
+let kubb_kit = require("kubb/kit");
 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");
@@ -59,31 +59,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.
@@ -184,9 +159,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);
@@ -339,13 +347,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") {
@@ -362,8 +370,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,
@@ -373,20 +384,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);
@@ -483,13 +489,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 = {}) {
@@ -506,11 +512,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,
@@ -634,15 +640,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")
 	};
@@ -692,12 +698,12 @@ function maybeValueOrGetter(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) {
@@ -712,13 +718,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)({
@@ -730,7 +736,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: "{}" } : {}
 	});
@@ -798,7 +804,7 @@ function resolveOperationOverrides(node, override) {
 }
 /**
 * 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) {
@@ -870,19 +876,18 @@ const customHookOptionsFileGenerator = (0, kubb_kit.defineGenerator)({
 		const { output, customOptions, query, group } = ctx.options;
 		if (!customOptions) return null;
 		const { importPath, name } = customOptions;
-		const hookOptionsName = resolver.resolveHookOptionsName();
-		const customHookOptionsName = resolver.resolveCustomHookOptionsName();
+		const hookOptionsName = resolver.hook.optionsName();
+		const customHookOptionsName = resolver.hook.customOptionsName();
 		const reactQueryImportPath = query ? query.importPath : "@tanstack/react-query";
 		let hookFilePath;
 		const firstNode = nodes[0];
 		if (firstNode) {
-			const hookName = resolver.resolveQueryName(firstNode);
-			hookFilePath = resolver.resolveFile({
+			const hookName = resolver.query.name(firstNode);
+			hookFilePath = resolver.file({
 				name: hookName,
 				extname: ".ts",
 				tag: firstNode.tags[0] ?? "default",
-				path: firstNode.path
-			}, {
+				path: firstNode.path,
 				root,
 				output,
 				group: group ?? void 0
@@ -974,6 +979,59 @@ function buildResolvedRequestParams(node) {
 	if (names.length === 0) return null;
 	return `{ ${names.map((name) => `${name}: typeof ${name} === 'function' ? ${name}() : ${name}`).join(", ")} }`;
 }
+/**
+* Classifies an operation as a query or a mutation from the resolved `query` / `mutation` method lists.
+* `query: false` still marks the operation as a query so the query-family generators keep matching it,
+* and a method already claimed by `query` never counts as a mutation.
+*/
+function classifyOperation(node, { query, mutation }) {
+	const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
+	const queryMethods = new Set(query ? query.methods : []);
+	return {
+		isQuery,
+		isMutation: mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase())
+	};
+}
+/**
+* Builds the `TData` / `TError` type expressions shared by every generated hook, joining the resolved
+* success responses into `TData` and wrapping the error responses in `ResponseErrorConfig<...>`.
+*/
+function buildResponseTypes(node, resolver) {
+	const successNames = resolveSuccessNames(node, resolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(node);
+	const errorNames = resolveErrorNames(node, resolver);
+	return {
+		TData: responseName,
+		TError: `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`
+	};
+}
+function resolveFallbackPageParamType(initialPageParam) {
+	if (typeof initialPageParam === "number") return "number";
+	if (typeof initialPageParam === "boolean") return "boolean";
+	if (typeof initialPageParam !== "string") return "unknown";
+	if (!initialPageParam.includes(" as ")) return "string";
+	return initialPageParam.split(" as ").at(-1) ?? "unknown";
+}
+/**
+* Resolves the `TPageParam` generic for the infinite-query hooks. Prefers the type read from the
+* configured `queryParam` on the operation's query object, and falls back to the type inferred from
+* `initialPageParam` when that parameter type is unavailable. Also returns the query params type name
+* so callers can reuse it when rewriting the paginated request.
+*/
+function resolvePageParamType(node, { resolver, initialPageParam, queryParam }) {
+	const firstQueryParam = getOperationParameters(node, { paramsCasing: "original" }).query[0];
+	const groupName = firstQueryParam ? resolver.param.query(node, firstQueryParam) : null;
+	const queryParamsTypeName = groupName !== (firstQueryParam ? resolver.param.name(node, firstQueryParam) : null) ? groupName : null;
+	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
+	if (!queryParamType) return {
+		queryParamsTypeName,
+		pageParamType: resolveFallbackPageParamType(initialPageParam)
+	};
+	return {
+		queryParamsTypeName,
+		pageParamType: initialPageParam !== void 0 && initialPageParam !== null ? `NonNullable<${queryParamType}>` : queryParamType
+	};
+}
 //#endregion
 //#region src/generators/hookOptionsGenerator.tsx
 /**
@@ -989,11 +1047,10 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 		const { resolver, config, root } = ctx;
 		const { output, customOptions, query, mutation, suspense, infinite, group, override, hooks } = ctx.options;
 		if (!customOptions || !hooks) return null;
-		const name = resolver.resolveHookOptionsName();
-		const resolvedFile = resolver.resolveFile({
+		const name = resolver.hook.optionsName();
+		const resolvedFile = resolver.file({
 			name,
-			extname: ".ts"
-		}, {
+			extname: ".ts",
 			root,
 			output,
 			group: group ?? void 0
@@ -1018,9 +1075,10 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 			const isSuspenseOp = !!suspense;
 			const isInfiniteOp = !!nodeInfiniteOptions;
 			if (isQueryOp) {
-				const queryOptionsName = resolver.resolveQueryOptionsName(node);
-				const queryHookName = resolver.resolveQueryName(node);
-				const queryHookFile = resolver.resolveFile(operationFileEntry(node, queryHookName), {
+				const queryOptionsName = resolver.query.optionsName(node);
+				const queryHookName = resolver.query.name(node);
+				const queryHookFile = resolver.file({
+					...operationFileEntry(node, queryHookName),
 					root,
 					output,
 					group: group ?? void 0
@@ -1032,9 +1090,10 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 				}));
 				hookOptions[queryHookName] = `Partial<ReturnType<typeof ${queryOptionsName}>>`;
 				if (isSuspenseOp) {
-					const suspenseOptionsName = resolver.resolveSuspenseQueryOptionsName(node);
-					const suspenseHookName = resolver.resolveSuspenseQueryName(node);
-					const suspenseHookFile = resolver.resolveFile(operationFileEntry(node, suspenseHookName), {
+					const suspenseOptionsName = resolver.suspenseQuery.optionsName(node);
+					const suspenseHookName = resolver.suspenseQuery.name(node);
+					const suspenseHookFile = resolver.file({
+						...operationFileEntry(node, suspenseHookName),
 						root,
 						output,
 						group: group ?? void 0
@@ -1050,9 +1109,10 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 					const normalizeKey = (key) => key.replace(/\?$/, "");
 					const queryParamKeys = getOperationParameters(node, { paramsCasing: "original" }).query.map((p) => p.name);
 					if (nodeInfiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === nodeInfiniteOptions.queryParam) : false) {
-						const infiniteOptionsName = resolver.resolveInfiniteQueryOptionsName(node);
-						const infiniteHookName = resolver.resolveInfiniteQueryName(node);
-						const infiniteHookFile = resolver.resolveFile(operationFileEntry(node, infiniteHookName), {
+						const infiniteOptionsName = resolver.infiniteQuery.optionsName(node);
+						const infiniteHookName = resolver.infiniteQuery.name(node);
+						const infiniteHookFile = resolver.file({
+							...operationFileEntry(node, infiniteHookName),
 							root,
 							output,
 							group: group ?? void 0
@@ -1064,9 +1124,10 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 						}));
 						hookOptions[infiniteHookName] = `Partial<ReturnType<typeof ${infiniteOptionsName}>>`;
 						if (isSuspenseOp) {
-							const suspenseInfiniteOptionsName = resolver.resolveSuspenseInfiniteQueryOptionsName(node);
-							const suspenseInfiniteHookName = resolver.resolveSuspenseInfiniteQueryName(node);
-							const suspenseInfiniteHookFile = resolver.resolveFile(operationFileEntry(node, suspenseInfiniteHookName), {
+							const suspenseInfiniteOptionsName = resolver.suspenseInfiniteQuery.optionsName(node);
+							const suspenseInfiniteHookName = resolver.suspenseInfiniteQuery.name(node);
+							const suspenseInfiniteHookFile = resolver.file({
+								...operationFileEntry(node, suspenseInfiniteHookName),
 								root,
 								output,
 								group: group ?? void 0
@@ -1082,9 +1143,10 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 				}
 			}
 			if (isMutationOp) {
-				const mutationOptionsName = resolver.resolveMutationOptionsName(node);
-				const mutationHookName = resolver.resolveMutationName(node);
-				const mutationHookFile = resolver.resolveFile(operationFileEntry(node, mutationHookName), {
+				const mutationOptionsName = resolver.mutation.optionsName(node);
+				const mutationHookName = resolver.mutation.name(node);
+				const mutationHookFile = resolver.file({
+					...operationFileEntry(node, mutationHookName),
 					root,
 					output,
 					group: group ?? void 0
@@ -1101,7 +1163,7 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 			baseName: hookOptionsFile.baseName,
 			path: hookOptionsFile.path,
 			meta: hookOptionsFile.meta,
-			banner: resolver.resolveBanner(ctx.meta, {
+			banner: resolver.default.banner(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1109,7 +1171,7 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 					baseName: hookOptionsFile.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -1150,23 +1212,12 @@ function buildInfiniteQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, initialPageParam, queryParam, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const responseType = responseName;
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "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;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: responseType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const returnType = "UseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
 	const generics = [
 		`TQueryFnData = ${responseType}`,
@@ -1220,11 +1271,7 @@ function getQueryOptionsParams(node, options) {
 	return buildQueryOptionsParams(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 errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter$4.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
@@ -1259,22 +1306,12 @@ function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 const declarationPrinter$6 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter$3 = (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 errorNames = resolveErrorNames(node, tsResolver);
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "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;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
 	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
@@ -1287,8 +1324,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}']`];
@@ -1357,16 +1394,13 @@ function buildMutationConfigParamsNode(node) {
 	})] });
 }
 function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const TData = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const configParamsNode = buildMutationConfigParamsNode(node);
 	const paramsSignature = declarationPrinter$5.print(configParamsNode) ?? "";
 	const groupedParam = buildGroupedRequestParam(node, { resolver: tsResolver });
 	const hasMutationParams = groupedParam !== null;
 	const groupedParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedParam ? [groupedParam] : [] });
-	const TRequest = hasMutationParams ? tsResolver.resolveRequestConfigName(node) : "undefined";
+	const TRequest = hasMutationParams ? tsResolver.response.options(node) : "undefined";
 	const argBindingStr = hasMutationParams ? callPrinter$2.print(groupedParamsNode) ?? "" : "_";
 	const mutationFnBody = `const { data } = await ${buildClientCall(node, {
 		clientName,
@@ -1399,19 +1433,17 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 const declarationPrinter$4 = (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 errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [(0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
   mutation?: UseMutationOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			resolveMutationRequestType(node, resolver),
 			"TContext"
 		].join(", ")}> & { client?: QueryClient },
@@ -1421,12 +1453,10 @@ function buildMutationParamsNode(node, options) {
 	})] });
 }
 function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const generics = [
-		responseName,
-		`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+		TData,
+		TError,
 		resolveMutationRequestType(node, tsResolver),
 		"TContext"
 	].join(", ");
@@ -1466,15 +1496,13 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
-	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
   query?: Partial<QueryObserverOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			"TData",
 			"TQueryData",
 			"TQueryKey"
@@ -1489,11 +1517,8 @@ function buildQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const returnType = `UseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
+	const returnType = `UseQueryResult<TData, ${TError}> & { queryKey: TQueryKey }`;
 	const generics = [
 		`TData = ${TData}`,
 		`TQueryData = ${TData}`,
@@ -1552,23 +1577,12 @@ function buildSuspenseInfiniteQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions, initialPageParam, queryParam }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const responseType = responseName;
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "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;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: responseType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const returnType = "UseSuspenseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
 	const generics = [
 		`TQueryFnData = ${responseType}`,
@@ -1619,22 +1633,12 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function SuspenseInfiniteQueryOptions({ 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 errorNames = resolveErrorNames(node, tsResolver);
-	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
-	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
-		const parts = initialPageParam.split(" as ");
-		return parts[parts.length - 1] ?? "unknown";
-	})() : "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;
-	})() : null;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
-	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
+	const { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	const queryFnBody = `const { data } = await ${buildClientCall(node, {
@@ -1647,8 +1651,8 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 	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}']`];
@@ -1710,15 +1714,13 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function buildSuspenseQueryParamsNode(node, options) {
 	const { resolver } = options;
-	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
   query?: Partial<UseSuspenseQueryOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			"TData",
 			"TQueryKey"
 		].join(", ")}>> & { client?: QueryClient },
@@ -1732,11 +1734,8 @@ function buildSuspenseQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
-	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = responseName;
-	const returnType = `UseSuspenseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
+	const returnType = `UseSuspenseQueryResult<TData, ${TError}> & { queryKey: TQueryKey }`;
 	const generics = [`TData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`];
 	const resolvedParams = buildResolvedRequestParams(node);
 	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
@@ -1790,16 +1789,15 @@ const infiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.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());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
 		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/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1809,26 +1807,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],
@@ -1841,7 +1841,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: {
@@ -1849,7 +1849,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: {
@@ -1955,9 +1955,11 @@ const mutationGenerator = (0, kubb_kit.defineGenerator)({
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
-		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const queryMethods = new Set(query ? query.methods : []);
-		if (!(mutation !== false && !isQuery && (mutation ? mutation.methods : []).some((method) => !queryMethods.has(method) && node.method.toLowerCase() === method.toLowerCase()))) return null;
+		const { isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
+		if (!isMutation) return null;
 		const importPath = mutation ? mutation.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -1967,23 +1969,25 @@ const mutationGenerator = (0, kubb_kit.defineGenerator)({
 			output
 		});
 		if (!contractOp) return null;
-		const mutationHookName = resolver.resolveMutationName(node);
-		const mutationTypeName = resolver.resolveMutationTypeName(node);
-		const mutationOptionsName = resolver.resolveMutationOptionsName(node);
-		const mutationKeyName = resolver.resolveMutationKeyName(node);
+		const mutationHookName = resolver.mutation.name(node);
+		const mutationTypeName = resolver.mutation.typeName(node);
+		const mutationOptionsName = resolver.mutation.optionsName(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));
@@ -1992,7 +1996,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: {
@@ -2000,7 +2004,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: {
@@ -2091,9 +2095,10 @@ const queryGenerator = (0, kubb_kit.defineGenerator)({
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.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());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		if (!isQuery || isMutation) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
@@ -2104,23 +2109,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
@@ -2130,7 +2137,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: {
@@ -2138,7 +2145,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: {
@@ -2233,17 +2240,16 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.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());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		const isSuspense = !!suspense;
 		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
 		if (!isQuery || isMutation || !isSuspense || !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/react-query";
 		const contractOp = resolveClientOperation({
 			clientPlugin: { pluginName: client.pluginName },
@@ -2253,26 +2259,28 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 			output
 		});
 		if (!contractOp) return null;
-		const queryName = resolver.resolveSuspenseInfiniteQueryName(node);
-		const queryOptionsName = resolver.resolveSuspenseInfiniteQueryOptionsName(node);
-		const queryKeyName = resolver.resolveSuspenseInfiniteQueryKeyName(node);
-		const queryKeyTypeName = resolver.resolveSuspenseInfiniteQueryKeyTypeName(node);
+		const queryName = resolver.suspenseInfiniteQuery.name(node);
+		const queryOptionsName = resolver.suspenseInfiniteQuery.optionsName(node);
+		const queryKeyName = resolver.suspenseInfiniteQuery.keyName(node);
+		const queryKeyTypeName = resolver.suspenseInfiniteQuery.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, {
 				order: "body-response-first",
@@ -2284,7 +2292,7 @@ const suspenseInfiniteQueryGenerator = (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: {
@@ -2292,7 +2300,7 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -2399,9 +2407,10 @@ const suspenseQueryGenerator = (0, kubb_kit.defineGenerator)({
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.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());
+		const { isQuery, isMutation } = classifyOperation(node, {
+			query,
+			mutation
+		});
 		if (!isQuery || isMutation || !!!suspense) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
 		const contractOp = resolveClientOperation({
@@ -2412,23 +2421,25 @@ const suspenseQueryGenerator = (0, kubb_kit.defineGenerator)({
 			output
 		});
 		if (!contractOp) return null;
-		const queryName = resolver.resolveSuspenseQueryName(node);
-		const queryOptionsName = resolver.resolveSuspenseQueryOptionsName(node);
-		const queryKeyName = resolver.resolveSuspenseQueryKeyName(node);
-		const queryKeyTypeName = resolver.resolveSuspenseQueryKeyTypeName(node);
+		const queryName = resolver.suspenseQuery.name(node);
+		const queryOptionsName = resolver.suspenseQuery.optionsName(node);
+		const queryKeyName = resolver.suspenseQuery.keyName(node);
+		const queryKeyTypeName = resolver.suspenseQuery.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
@@ -2438,7 +2449,7 @@ const suspenseQueryGenerator = (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: {
@@ -2446,7 +2457,7 @@ const suspenseQueryGenerator = (0, kubb_kit.defineGenerator)({
 					baseName: meta.file.baseName
 				}
 			}),
-			footer: resolver.resolveFooter(ctx.meta, {
+			footer: resolver.default.footer(ctx.meta, {
 				output,
 				config,
 				file: {
@@ -2534,110 +2545,112 @@ function capitalize(name) {
 * `useFooSuspense`, `useFooInfinite`, ...) and its companion helpers
 * (`fooQueryKey`, `fooQueryOptions`).
 *
-* Functions and files use camelCase; hooks get the `use` prefix; suspense and
-* infinite variants are suffixed with `Suspense`/`Infinite`.
+* Functions and files use the built-in camelCase casing; hooks get the `use`
+* prefix; suspense and infinite variants are suffixed with `Suspense`/`Infinite`.
 *
 * @example Resolve hook and helper names
 * ```ts
 * import { resolverReactQuery } from '@kubb/plugin-react-query'
 *
-* resolverReactQuery.resolveQueryName(operationNode)       // 'useGetPetById'
-* resolverReactQuery.resolveMutationName(operationNode)    // 'useUpdatePet'
-* resolverReactQuery.resolveQueryKeyName(operationNode)    // 'getPetByIdQueryKey'
-* resolverReactQuery.resolveQueryOptionsName(operationNode) // 'getPetByIdQueryOptions'
+* resolverReactQuery.query.name(operationNode)       // 'useGetPetById'
+* resolverReactQuery.mutation.name(operationNode)    // 'useUpdatePet'
+* resolverReactQuery.query.keyName(operationNode)     // 'getPetByIdQueryKey'
+* resolverReactQuery.query.optionsName(operationNode) // 'getPetByIdQueryOptions'
 * ```
 */
-const resolverReactQuery = (0, kubb_kit.defineResolver)(() => ({
-	name: "default",
+const resolverReactQuery = (0, kubb_kit.createResolver)({
 	pluginName: "plugin-react-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))}`;
-	},
-	resolveSuspenseQueryName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}Suspense`;
-	},
-	resolveInfiniteQueryName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}Infinite`;
-	},
-	resolveSuspenseInfiniteQueryName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}SuspenseInfinite`;
-	},
-	resolveMutationName(node) {
-		return `use${capitalize(this.resolveName(node.operationId))}`;
-	},
-	resolveQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}QueryOptions`;
-	},
-	resolveSuspenseQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}SuspenseQueryOptions`;
-	},
-	resolveInfiniteQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}InfiniteQueryOptions`;
-	},
-	resolveSuspenseInfiniteQueryOptionsName(node) {
-		return `${this.resolveName(node.operationId)}SuspenseInfiniteQueryOptions`;
-	},
-	resolveMutationOptionsName(node) {
-		return `${this.resolveName(node.operationId)}MutationOptions`;
-	},
-	resolveQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}QueryKey`;
-	},
-	resolveSuspenseQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}SuspenseQueryKey`;
-	},
-	resolveInfiniteQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}InfiniteQueryKey`;
-	},
-	resolveSuspenseInfiniteQueryKeyName(node) {
-		return `${this.resolveName(node.operationId)}SuspenseInfiniteQueryKey`;
-	},
-	resolveMutationKeyName(node) {
-		return `${this.resolveName(node.operationId)}MutationKey`;
-	},
-	resolveQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}QueryKey`;
-	},
-	resolveSuspenseQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}SuspenseQueryKey`;
-	},
-	resolveInfiniteQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}InfiniteQueryKey`;
-	},
-	resolveSuspenseInfiniteQueryKeyTypeName(node) {
-		return `${capitalize(this.resolveName(node.operationId))}SuspenseInfiniteQueryKey`;
-	},
-	resolveMutationTypeName(node) {
-		return capitalize(this.resolveName(node.operationId));
-	},
-	resolveClientName(node) {
-		return this.resolveName(node.operationId);
+	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);
+		}
 	},
-	resolveSuspenseClientName(node) {
-		return `${this.resolveName(node.operationId)}Suspense`;
+	suspenseQuery: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}Suspense`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}SuspenseQueryOptions`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}SuspenseQueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}SuspenseQueryKey`;
+		},
+		clientName(node) {
+			return `${this.name(node.operationId)}Suspense`;
+		}
 	},
-	resolveInfiniteClientName(node) {
-		return `${this.resolveName(node.operationId)}Infinite`;
+	infiniteQuery: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}Infinite`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}InfiniteQueryOptions`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}InfiniteQueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}InfiniteQueryKey`;
+		},
+		clientName(node) {
+			return `${this.name(node.operationId)}Infinite`;
+		}
 	},
-	resolveSuspenseInfiniteClientName(node) {
-		return `${this.resolveName(node.operationId)}SuspenseInfinite`;
+	suspenseInfiniteQuery: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}SuspenseInfinite`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}SuspenseInfiniteQueryOptions`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}SuspenseInfiniteQueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}SuspenseInfiniteQueryKey`;
+		},
+		clientName(node) {
+			return `${this.name(node.operationId)}SuspenseInfinite`;
+		}
 	},
-	resolveHookOptionsName() {
-		return "HookOptions";
+	mutation: {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}MutationOptions`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}MutationKey`;
+		},
+		typeName(node) {
+			return capitalize(this.name(node.operationId));
+		}
 	},
-	resolveCustomHookOptionsName() {
-		return "getCustomHookOptions";
+	hook: {
+		optionsName() {
+			return "HookOptions";
+		},
+		customOptionsName() {
+			return "getCustomHookOptions";
+		}
 	}
-}));
+});
 //#endregion
 //#region src/plugin.ts
 /**
@@ -2683,17 +2696,14 @@ const pluginReactQuery = (0, kubb_kit.definePlugin)((options) => {
 		mutationGenerator,
 		hookOptionsGenerator,
 		customHookOptionsFileGenerator
-	].filter((generator) => Boolean(generator));
+	];
 	const groupConfig = createGroupConfig(group);
 	return {
 		name: pluginReactQueryName,
 		options,
 		dependencies: [_kubb_plugin_ts.pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
-			const resolver = userResolver ? {
-				...resolverReactQuery,
-				...userResolver
-			} : resolverReactQuery;
+			const resolver = userResolver ? kubb_kit.Resolver.merge(resolverReactQuery, userResolver) : resolverReactQuery;
 			const resolvedClient = resolveClient({
 				client,
 				pluginNames: (ctx.config.plugins ?? []).map((p) => p.name).filter((name) => Boolean(name))