@kubb/plugin-vue-query 5.0.0-beta.94 → 5.0.0-beta.95

package/dist/index.cjs

@@ -5,6 +5,10 @@ Object.defineProperties(exports, {
 //#region \0rolldown/runtime.js
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", {
+	value,
+	configurable: true
+});
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
@@ -56,6 +60,16 @@ function toCamelOrPascal(text, pascal) {
 function camelCase(text, { prefix = "", suffix = "" } = {}) {
 	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
+/**
+* Uppercases only the first character of `text`, leaving the rest untouched.
+* Unlike {@link pascalCase} it never re-splits word boundaries or strips characters.
+*
+* @example
+* `capitalize('getPetById') // 'GetPetById'`
+*/
+function capitalize(text) {
+	return `${text.charAt(0).toUpperCase()}${text.slice(1)}`;
+}
 //#endregion
 //#region ../../internals/utils/src/reserved.ts
 /**
@@ -559,39 +573,12 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
-//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
-const declarationPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const mutationKeyTransformer = ({ node }) => {
-	if (!node.path) return [];
-	return [`{ url: '${Url.toPath(node.path)}' }`];
-};
-function MutationKey({ name, node, transformer }) {
-	const paramsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: [] });
-	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
-	const keys = (transformer ?? mutationKeyTransformer)({
-		node,
-		casing: "camelcase"
-	});
-	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function.Arrow, {
-			name,
-			export: true,
-			params: paramsSignature,
-			singleLine: true,
-			children: `[${keys.join(", ")}] as const`
-		})
-	});
-}
-//#endregion
 //#region ../../internals/tanstack-query/src/utils.ts
 /**
 * The grouped request options, ordered for both the destructured signature and the
 * call passed to the underlying client.
 */
-const requestGroupOrder$1 = [
+const requestGroupOrder = [
 	"path",
 	"query",
 	"body",
@@ -622,7 +609,7 @@ function maybeRefOrGetter(type) {
 * `MaybeRefOrGetter` per group.
 */
 function buildGroupedRequestParam(node, options) {
-	const { resolver, keys = requestGroupOrder$1, memberTypeWrapper } = options;
+	const { resolver, keys = requestGroupOrder, memberTypeWrapper } = options;
 	const { groups, hasRequiredPath, hasRequiredQuery, hasRequiredHeader } = getRequestGroupOptionality(node);
 	const names = keys.filter((key) => groups[key]);
 	if (names.length === 0) return null;
@@ -634,7 +621,7 @@ function buildGroupedRequestParam(node, options) {
 	};
 	const isOptional = names.every((name) => !requiredByGroup[name]);
 	const optionsName = resolver.response.options(node);
-	const omittedKeys = requestGroupOrder$1.filter((key) => !keys.includes(key));
+	const omittedKeys = requestGroupOrder.filter((key) => !keys.includes(key));
 	const optionsType = omittedKeys.length > 0 ? `Omit<${optionsName}, ${omittedKeys.map((key) => `'${key}'`).join(" | ")}>` : optionsName;
 	if (memberTypeWrapper) {
 		const members = names.map((name) => ({
@@ -673,6 +660,273 @@ function buildQueryOptionsParams(node, options) {
 		default: "{}"
 	})].filter((param) => param !== null) });
 }
+/**
+* Builds the call to a client `<op>` function inside a query/mutation hook body. The function takes
+* a single grouped options object, so the operation's request groups are passed as
+* shorthand alongside the spread `config`, with `throwOnError: true` pinned last so a caller's config
+* can't flip the query's error semantics. Queries thread the TanStack `signal`; mutations omit it.
+*
+* When `unwrapName` is set, each request group is passed as an explicit member unwrapped through it,
+* used by vue-query to resolve refs and getters with `toValue(...)` at call time.
+*
+* @example
+* ```ts
+* buildClientCall(node, { clientName: 'getPetById', signal: true })
+* // getPetById({ path, ...config, signal: config.signal ?? signal, throwOnError: true })
+* ```
+*/
+function buildClientCall(node, options) {
+	const { clientName, signal = false, unwrapName } = options;
+	const { groups } = getRequestGroupOptionality(node);
+	return `${clientName}({ ${[
+		"...config",
+		...requestGroupOrder.filter((key) => groups[key]).map((name) => unwrapName ? `${name}: ${unwrapName(name)}` : name),
+		signal ? "signal: config.signal ?? signal" : null,
+		"throwOnError: true"
+	].filter((part) => part !== null).join(", ")} })`;
+}
+/**
+* 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
+	};
+}
+/**
+* Applies the shared query defaults during plugin setup: `false` disables query generation, and an
+* object merges over `methods: ['GET']` and the plugin's runtime `importPath`.
+*/
+function resolveQueryConfig(query, options) {
+	if (query === false) return false;
+	return {
+		importPath: options.importPath,
+		methods: ["GET"],
+		...query
+	};
+}
+/**
+* Applies the shared mutation defaults during plugin setup: `false` disables mutation generation,
+* and an object merges over `methods: ['POST', 'PUT', 'PATCH', 'DELETE']` and the plugin's runtime
+* `importPath`.
+*/
+function resolveMutationConfig(mutation, options) {
+	if (mutation === false) return false;
+	return {
+		importPath: options.importPath,
+		methods: [
+			"POST",
+			"PUT",
+			"PATCH",
+			"DELETE"
+		],
+		...mutation
+	};
+}
+/**
+* Applies the shared infinite-query defaults during plugin setup: a falsy value disables infinite
+* queries, and an object merges over `queryParam: 'id'` and `initialPageParam: 0` with the cursor
+* paths cleared.
+*/
+function resolveInfiniteConfig(infinite) {
+	if (!infinite) return false;
+	return {
+		queryParam: "id",
+		initialPageParam: 0,
+		cursorParam: null,
+		nextParam: null,
+		previousParam: null,
+		...infinite
+	};
+}
+//#endregion
+//#region ../../internals/tanstack-query/src/components/InfiniteQueryOptions.tsx
+const declarationPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const callPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+function InfiniteQueryOptions$1({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, queryParam, queryKeyName, queryKeyType = "typeof queryKey", memberTypeWrapper, unwrapName }) {
+	const { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
+	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
+		resolver: tsResolver,
+		initialPageParam,
+		queryParam
+	});
+	const groupedKeyParam = buildGroupedRequestParam(node, {
+		resolver: tsResolver,
+		keys: [
+			"path",
+			"query",
+			"body"
+		],
+		memberTypeWrapper
+	});
+	const queryKeyParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedKeyParam ? [groupedKeyParam] : [] });
+	const queryKeyParamsCall = callPrinter$4.print(queryKeyParamsNode) ?? "";
+	const paramsNode = buildQueryOptionsParams(node, {
+		resolver: tsResolver,
+		memberTypeWrapper
+	});
+	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
+	const queryFnBody = `const { data } = await ${buildClientCall(node, {
+		clientName,
+		signal: true,
+		unwrapName
+	})}
+    return data`;
+	const hasNewParams = nextParam != null || previousParam != null;
+	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
+		if (hasNewParams) {
+			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}']`];
+		return ["getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage) && lastPage.length === 0 ? undefined : lastPageParam + 1", "getPreviousPageParam: (_firstPage, _allPages, firstPageParam) => firstPageParam <= 1 ? undefined : firstPageParam - 1"];
+	})();
+	const queryOptionsArr = [
+		`initialPageParam: ${typeof initialPageParam === "string" ? JSON.stringify(initialPageParam) : initialPageParam}`,
+		getNextPageParamExpr,
+		getPreviousPageParamExpr
+	].filter(Boolean);
+	const infiniteOverrideParams = queryParam && queryParamsTypeName ? `query = {
+      ...(query ?? {}),
+      ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
+    } as ${queryParamsTypeName}` : "";
+	const queryFnArgs = infiniteOverrideParams ? "{ signal, pageParam }" : "{ signal }";
+	const queryFnStatements = infiniteOverrideParams ? `${infiniteOverrideParams}\n    ${queryFnBody}` : queryFnBody;
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
+			name,
+			export: true,
+			params: paramsSignature,
+			children: `
+const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, ${queryKeyType}, ${pageParamType}>({
+  queryKey,
+  queryFn: async (${queryFnArgs}) => {
+    ${queryFnStatements}
+  },
+  ${queryOptionsArr.join(",\n  ")}
+})
+`
+		})
+	});
+}
+__name(InfiniteQueryOptions$1, "InfiniteQueryOptions");
+//#endregion
+//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
+const declarationPrinter$6 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const mutationKeyTransformer = ({ node }) => {
+	if (!node.path) return [];
+	return [`{ url: '${Url.toPath(node.path)}' }`];
+};
+function MutationKey({ name, node, transformer }) {
+	const paramsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: [] });
+	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
+	const keys = (transformer ?? mutationKeyTransformer)({
+		node,
+		casing: "camelcase"
+	});
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function.Arrow, {
+			name,
+			export: true,
+			params: paramsSignature,
+			singleLine: true,
+			children: `[${keys.join(", ")}] as const`
+		})
+	});
+}
+//#endregion
+//#region ../../internals/tanstack-query/src/resolver.ts
+/**
+* Builds the shared query namespace for a variant. Spread the result into
+* `createResolver` once per variant the plugin supports.
+*
+* @example
+* ```ts
+* createResolver<PluginReactQuery>({
+*   query: createQueryResolver(),
+*   suspenseQuery: createQueryResolver('Suspense'),
+* })
+* ```
+*/
+function createQueryResolver(variant = "") {
+	return {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}${variant}`;
+		},
+		optionsName(node) {
+			return `${this.name(node.operationId)}${variant}QueryOptions`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}${variant}QueryKey`;
+		},
+		keyTypeName(node) {
+			return `${capitalize(this.name(node.operationId))}${variant}QueryKey`;
+		},
+		clientName(node) {
+			return `${this.name(node.operationId)}${variant}`;
+		}
+	};
+}
+/**
+* Builds the shared mutation namespace. Spread the result into
+* `createResolver` and add plugin-specific methods (`optionsName`,
+* `typeName`, `argTypeName`) next to it.
+*
+* @example
+* ```ts
+* createResolver<PluginSwr>({ mutation: { ...createMutationResolver(), argTypeName(node) {...} } })
+* ```
+*/
+function createMutationResolver() {
+	return {
+		name(node) {
+			return `use${capitalize(this.name(node.operationId))}`;
+		},
+		keyName(node) {
+			return `${this.name(node.operationId)}MutationKey`;
+		}
+	};
+}
 (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const queryKeyTransformer = ({ node }) => {
 	if (!node.path) return [];
@@ -752,6 +1006,20 @@ function resolveClient(options) {
 		message: "No client plugin is registered. Add `@kubb/plugin-axios` or `@kubb/plugin-fetch` to `plugins` so the generated code has an HTTP client to call."
 	};
 }
+/**
+* Resolves the contract client during a consumer plugin's setup hook. Extracts the plugin names
+* from the raw `plugins` config, applies {@link resolveClient}, and throws the diagnostic on a
+* misconfiguration so every consumer fails fast with the same message.
+*/
+function resolveContractClient(options) {
+	const { client, plugins = [] } = options;
+	const resolved = resolveClient({
+		client,
+		pluginNames: plugins.map((plugin) => plugin.name).filter((name) => Boolean(name))
+	});
+	if (resolved.kind === "error") throw new Error(resolved.message);
+	return resolved;
+}
 //#endregion
 //#region ../../internals/client/src/resolveClientOperation.ts
 /**
@@ -780,12 +1048,6 @@ function resolveClientOperation(options) {
 }
 //#endregion
 //#region src/utils.ts
-const requestGroupOrder = [
-	"path",
-	"query",
-	"body",
-	"headers"
-];
 /**
 * Builds the call to a contract client `<op>` function inside a vue-query composable body. The
 * function takes a single grouped options object, so `config` is spread first, then the operation's
@@ -794,18 +1056,14 @@ const requestGroupOrder = [
 * Mutations omit the `signal`.
 */
 function buildVueClientCall(node, options) {
-	const { clientName, signal = false } = options;
-	const groups = getRequestGroups(node);
-	return `${clientName}({ ${[
-		"...config",
-		...requestGroupOrder.filter((key) => groups[key]).map((name) => `${name}: toValue(${name})`),
-		signal ? "signal: config.signal ?? signal" : null,
-		"throwOnError: true"
-	].filter((part) => part !== null).join(", ")} })`;
+	return buildClientCall(node, {
+		...options,
+		unwrapName: (name) => `toValue(${name})`
+	});
 }
 //#endregion
 //#region src/components/QueryKey.tsx
-const declarationPrinter$5 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function buildQueryKeyParamsNode(node, options) {
 	const groupedParam = buildGroupedRequestParam(node, {
 		resolver: options.resolver,
@@ -820,7 +1078,7 @@ function buildQueryKeyParamsNode(node, options) {
 }
 function QueryKey({ name, node, tsResolver, typeName, transformer }) {
 	const paramsNode = buildQueryKeyParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$5.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$4.print(paramsNode) ?? "";
 	const keys = (transformer ?? queryKeyTransformer)({
 		node,
 		casing: "camelcase"
@@ -850,8 +1108,8 @@ function QueryKey({ name, node, tsResolver, typeName, transformer }) {
 }
 //#endregion
 //#region src/components/QueryOptions.tsx
-const declarationPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const callPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function getQueryOptionsParams(node, options) {
 	return buildQueryOptionsParams(node, {
 		resolver: options.resolver,
@@ -859,15 +1117,11 @@ function getQueryOptionsParams(node, options) {
 	});
 }
 function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	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"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const queryKeyParamsNode = buildQueryKeyParamsNode(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$4.print(queryKeyParamsNode) ?? "";
+	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$4.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
 	const queryFnBody = `const { data } = await ${buildVueClientCall(node, {
 		clientName,
 		signal: true
@@ -895,19 +1149,17 @@ function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 }
 //#endregion
 //#region src/components/InfiniteQuery.tsx
-const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+const declarationPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const callPrinter$2 = (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.response.response(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
   query?: Partial<UseInfiniteQueryOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			"TQueryData",
 			"TQueryKey",
 			"TQueryData"
@@ -922,11 +1174,7 @@ function buildInfiniteQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	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"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const returnType = `UseInfiniteQueryReturnType<${["TData", TError].join(", ")}> & { queryKey: TQueryKey }`;
 	const generics = [
 		`TData = InfiniteData<${TData}>`,
@@ -934,11 +1182,11 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`
 	];
 	const queryKeyParamsNode = buildQueryKeyParamsNode(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
+	const queryKeyParamsCall = callPrinter$2.print(queryKeyParamsNode) ?? "";
 	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$3.print(queryOptionsParamsNode) ?? "";
+	const queryOptionsParamsCall = callPrinter$2.print(queryOptionsParamsNode) ?? "";
 	const paramsNode = buildInfiniteQueryParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$2.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -969,93 +1217,17 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 }
 //#endregion
 //#region src/components/InfiniteQueryOptions.tsx
-const declarationPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-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.response.response(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.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;
-	const queryKeyParamsNode = buildQueryKeyParamsNode(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$2.print(queryKeyParamsNode) ?? "";
-	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$2.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildVueClientCall(node, {
-		clientName,
-		signal: true
-	})}
-    return data`;
-	const hasNewParams = nextParam != null || previousParam != null;
-	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
-		if (hasNewParams) {
-			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}']`];
-		return ["getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage) && lastPage.length === 0 ? undefined : lastPageParam + 1", "getPreviousPageParam: (_firstPage, _allPages, firstPageParam) => firstPageParam <= 1 ? undefined : firstPageParam - 1"];
-	})();
-	const queryOptionsArr = [
-		`initialPageParam: ${typeof initialPageParam === "string" ? JSON.stringify(initialPageParam) : initialPageParam}`,
-		getNextPageParamExpr,
-		getPreviousPageParamExpr
-	].filter(Boolean);
-	const infiniteOverrideParams = queryParam && queryParamsTypeName ? `query = {
-      ...(query ?? {}),
-      ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
-    } as ${queryParamsTypeName}` : "";
-	if (infiniteOverrideParams) return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
-			name,
-			export: true,
-			params: paramsSignature,
-			children: `
-const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, QueryKey, ${pageParamType}>({
-  queryKey,
-  queryFn: async ({ signal, pageParam }) => {
-    ${infiniteOverrideParams}
-    ${queryFnBody}
-  },
-  ${queryOptionsArr.join(",\n  ")}
-})
-`
-		})
-	});
-	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
-			name,
-			export: true,
-			params: paramsSignature,
-			children: `
-const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, QueryKey, ${pageParamType}>({
-  queryKey,
-  queryFn: async ({ signal }) => {
-    ${queryFnBody}
-  },
-  ${queryOptionsArr.join(",\n  ")}
-})
-`
-		})
+/**
+* The vue-query flavor of the shared `infiniteQueryOptions` component: request groups accept
+* `MaybeRefOrGetter` values, are unwrapped with `toValue(...)` in the client call, and the emitted
+* `TQueryKey` generic is the imported `QueryKey` type instead of `typeof queryKey`.
+*/
+function InfiniteQueryOptions(props) {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(InfiniteQueryOptions$1, {
+		...props,
+		queryKeyType: "QueryKey",
+		memberTypeWrapper: maybeRefOrGetter,
+		unwrapName: (name) => `toValue(${name})`
 	});
 }
 //#endregion
@@ -1067,15 +1239,13 @@ function resolveMutationRequestType(node, resolver) {
 }
 function buildMutationParamsNode(node, options) {
 	const { resolver } = options;
-	const successNames = resolveSuccessNames(node, resolver);
-	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.response.response(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?: MutationObserverOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			resolveMutationRequestType(node, resolver),
 			"TContext"
 		].join(", ")}> & { client?: QueryClient },
@@ -1085,11 +1255,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.response.response(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 groupedParam = buildGroupedRequestParam(node, { resolver: tsResolver });
 	const hasMutationParams = groupedParam !== null;
 	const groupedParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedParam ? [groupedParam] : [] });
@@ -1139,15 +1305,13 @@ const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declara
 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.response.response(node);
-	const errorNames = resolveErrorNames(node, resolver);
+	const { TData, TError } = buildResponseTypes(node, resolver);
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
   query?: Partial<UseQueryOptions<${[
-			responseName,
-			`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`,
+			TData,
+			TError,
 			"TData",
 			"TQueryData",
 			"TQueryKey"
@@ -1162,11 +1326,7 @@ function buildQueryParamsNode(node, options) {
 	}), optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver }) {
-	const successNames = resolveSuccessNames(node, tsResolver);
-	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"}>`;
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const returnType = `UseQueryReturnType<${["TData", TError].join(", ")}> & { queryKey: TQueryKey }`;
 	const generics = [
 		`TData = ${TData}`,
@@ -1654,9 +1814,6 @@ const queryGenerator = (0, kubb_kit.defineGenerator)({
 });
 //#endregion
 //#region src/resolvers/resolverVueQuery.ts
-function capitalize(name) {
-	return `${name.charAt(0).toUpperCase()}${name.slice(1)}`;
-}
 /**
 * Default resolver used by `@kubb/plugin-vue-query`. Decides the names and
 * file paths for every generated TanStack Query composable (`useFoo`,
@@ -1677,47 +1834,10 @@ function capitalize(name) {
 */
 const resolverVueQuery = (0, kubb_kit.createResolver)({
 	pluginName: "plugin-vue-query",
-	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);
-		}
-	},
-	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`;
-		}
-	},
+	query: createQueryResolver(),
+	infiniteQuery: createQueryResolver("Infinite"),
 	mutation: {
-		name(node) {
-			return `use${capitalize(this.name(node.operationId))}`;
-		},
-		keyName(node) {
-			return `${this.name(node.operationId)}MutationKey`;
-		},
+		...createMutationResolver(),
 		typeName(node) {
 			return capitalize(this.name(node.operationId));
 		}
@@ -1771,43 +1891,17 @@ const pluginVueQuery = (0, kubb_kit.definePlugin)((options) => {
 		dependencies: [_kubb_plugin_ts.pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
 			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))
-			});
-			if (resolvedClient.kind === "error") throw new Error(resolvedClient.message);
-			const resolvedClientDescriptor = {
-				kind: "contract",
-				pluginName: resolvedClient.pluginName
-			};
 			ctx.setOptions({
 				output,
-				client: resolvedClientDescriptor,
+				client: resolveContractClient({
+					client,
+					plugins: ctx.config.plugins
+				}),
 				queryKey,
-				query: query === false ? false : {
-					importPath: "@tanstack/vue-query",
-					methods: ["GET"],
-					...query
-				},
+				query: resolveQueryConfig(query, { importPath: "@tanstack/vue-query" }),
 				mutationKey,
-				mutation: mutation === false ? false : {
-					importPath: "@tanstack/vue-query",
-					methods: [
-						"POST",
-						"PUT",
-						"PATCH",
-						"DELETE"
-					],
-					...mutation
-				},
-				infinite: infinite ? {
-					queryParam: "id",
-					initialPageParam: 0,
-					cursorParam: null,
-					nextParam: null,
-					previousParam: null,
-					...infinite
-				} : false,
+				mutation: resolveMutationConfig(mutation, { importPath: "@tanstack/vue-query" }),
+				infinite: resolveInfiniteConfig(infinite),
 				hooks,
 				group: groupConfig,
 				exclude,
@@ -1825,5 +1919,6 @@ const pluginVueQuery = (0, kubb_kit.definePlugin)((options) => {
 exports.default = pluginVueQuery;
 exports.pluginVueQuery = pluginVueQuery;
 exports.pluginVueQueryName = pluginVueQueryName;
+exports.resolverVueQuery = resolverVueQuery;
 
 //# sourceMappingURL=index.cjs.map