@kubb/plugin-react-query 5.0.0-beta.94 → 5.0.0-beta.98

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");
@@ -58,6 +58,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
 /**
@@ -627,6 +637,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
 /**
@@ -654,33 +678,6 @@ function resolveClientOperation(options) {
 	};
 }
 //#endregion
-//#region ../../internals/tanstack-query/src/components/MutationKey.tsx
-const declarationPrinter$10 = (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$10.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
@@ -764,6 +761,9 @@ function buildQueryOptionsParams(node, options) {
 * 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 })
@@ -771,15 +771,101 @@ function buildQueryOptionsParams(node, options) {
 * ```
 */
 function buildClientCall(node, options) {
-	const { clientName, signal = false } = options;
+	const { clientName, signal = false, unwrapName } = options;
 	const { groups } = getRequestGroupOptionality(node);
 	return `${clientName}({ ${[
 		"...config",
-		...requestGroupOrder$1.filter((key) => groups[key]),
+		...requestGroupOrder$1.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
+	};
+}
 function matchesPattern(node, ov) {
 	const { type, pattern } = ov;
 	const matches = (value) => typeof pattern === "string" ? value === pattern : pattern.test(value);
@@ -820,8 +906,163 @@ function buildQueryKeyParams(node, options) {
 	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedParam ? [groupedParam] : [] });
 }
 //#endregion
+//#region ../../internals/tanstack-query/src/components/InfiniteQueryOptions.tsx
+const declarationPrinter$7 = (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, 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$3.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  ")}
+})
+`
+		})
+	});
+}
+//#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`;
+		}
+	};
+}
+//#endregion
 //#region ../../internals/tanstack-query/src/components/QueryKey.tsx
-const declarationPrinter$9 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$5 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const queryKeyTransformer = ({ node }) => {
 	if (!node.path) return [];
 	const hasPathParams = getOperationParameters(node).path.length > 0;
@@ -835,7 +1076,7 @@ const queryKeyTransformer = ({ node }) => {
 };
 function QueryKey({ name, node, tsResolver, typeName, transformer }) {
 	const paramsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$9.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$5.print(paramsNode) ?? "";
 	const keys = (transformer ?? queryKeyTransformer)({
 		node,
 		casing: "camelcase"
@@ -992,46 +1233,6 @@ function classifyOperation(node, { query, mutation }) {
 		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
 /**
@@ -1195,13 +1396,13 @@ const hookOptionsGenerator = (0, kubb_kit.defineGenerator)({
 });
 //#endregion
 //#region src/components/InfiniteQuery.tsx
-const declarationPrinter$8 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function buildInfiniteQueryParamsNode(node, options) {
-	const { resolver, pageParamGeneric } = options;
+	const { resolver, pageParamGeneric, observerOptionsName } = options;
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
-  query?: Partial<InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, ${pageParamGeneric}>> & { client?: QueryClient },
+  query?: Partial<${observerOptionsName}<TQueryFnData, TError, TData, TQueryKey, ${pageParamGeneric}>> & { client?: QueryClient },
   client?: ${buildClientOptionType()}
 }`,
 		default: "{}"
@@ -1211,14 +1412,16 @@ function buildInfiniteQueryParamsNode(node, options) {
 		memberTypeWrapper: maybeValueOrGetter
 	}), optionsParam].filter((param) => param !== null) });
 }
-function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, initialPageParam, queryParam, customOptions }) {
+function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, initialPageParam, queryParam, customOptions, suspense }) {
 	const { TData: responseType, TError: errorType } = buildResponseTypes(node, tsResolver);
 	const { pageParamType } = resolvePageParamType(node, {
 		resolver: tsResolver,
 		initialPageParam,
 		queryParam
 	});
-	const returnType = "UseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
+	const hookName = suspense ? "useSuspenseInfiniteQuery" : "useInfiniteQuery";
+	const observerOptionsName = suspense ? "UseSuspenseInfiniteQueryOptions" : "InfiniteQueryObserverOptions";
+	const returnType = `${suspense ? "UseSuspenseInfiniteQueryResult" : "UseInfiniteQueryResult"}<TData, TError> & { queryKey: TQueryKey }`;
 	const generics = [
 		`TQueryFnData = ${responseType}`,
 		`TError = ${errorType}`,
@@ -1231,9 +1434,10 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildInfiniteQueryParamsNode(node, {
 		resolver: tsResolver,
-		pageParamGeneric: "TPageParam"
+		pageParamGeneric: "TPageParam",
+		observerOptionsName
 	});
-	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$4.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1250,141 +1454,22 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
        const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
        const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
-       const queryResult = useInfiniteQuery({
+       const queryResult = ${hookName}({
         ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
-       } as unknown as InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
+       } as unknown as ${observerOptionsName}<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
 
        queryResult.queryKey = queryKey as TQueryKey
 
-       return queryResult
-       `
-		})
-	});
-}
-//#endregion
-//#region src/components/QueryOptions.tsx
-const declarationPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
-function getQueryOptionsParams(node, options) {
-	return buildQueryOptionsParams(node, options);
-}
-function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
-	const { TData, TError } = buildResponseTypes(node, tsResolver);
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$4.print(queryKeyParamsNode) ?? "";
-	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildClientCall(node, {
-		clientName,
-		signal: true
-	})}
-          return data`;
-	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 queryOptions<${TData}, ${TError}, ${TData}, typeof queryKey>({
-       queryKey,
-       queryFn: async ({ signal }) => {
-          ${queryFnBody}
-       },
-      })
-`
-		})
-	});
-}
-//#endregion
-//#region src/components/InfiniteQueryOptions.tsx
-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 { 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 });
-	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildClientCall(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}>, typeof 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}>, typeof queryKey, ${pageParamType}>({
-  queryKey,
-  queryFn: async ({ signal }) => {
-    ${queryFnBody}
-  },
-  ${queryOptionsArr.join(",\n  ")}
-})
-`
+       return queryResult
+       `
 		})
 	});
 }
 //#endregion
 //#region src/components/MutationOptions.tsx
-const declarationPrinter$5 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const callPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildMutationConfigParamsNode(node) {
 	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [(0, _kubb_plugin_ts.createFunctionParameter)({
@@ -1396,7 +1481,7 @@ function buildMutationConfigParamsNode(node) {
 function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }) {
 	const { TData, TError } = buildResponseTypes(node, tsResolver);
 	const configParamsNode = buildMutationConfigParamsNode(node);
-	const paramsSignature = declarationPrinter$5.print(configParamsNode) ?? "";
+	const paramsSignature = declarationPrinter$3.print(configParamsNode) ?? "";
 	const groupedParam = buildGroupedRequestParam(node, { resolver: tsResolver });
 	const hasMutationParams = groupedParam !== null;
 	const groupedParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedParam ? [groupedParam] : [] });
@@ -1430,7 +1515,7 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 }
 //#endregion
 //#region src/components/Mutation.tsx
-const declarationPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$2 = (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.response.options(node) : "undefined";
@@ -1464,7 +1549,7 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 	const mutationOptionsConfigNode = buildMutationConfigParamsNode(node);
 	const mutationOptionsParamsCall = callPrinter$1.print(mutationOptionsConfigNode) ?? "";
 	const paramsNode = buildMutationParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$4.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$2.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1493,20 +1578,13 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 }
 //#endregion
 //#region src/components/Query.tsx
-const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function buildQueryParamsNode(node, options) {
-	const { resolver } = options;
-	const { TData, TError } = buildResponseTypes(node, resolver);
+	const { resolver, observerOptionsType } = options;
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
 		name: "options",
 		type: `{
-  query?: Partial<QueryObserverOptions<${[
-			TData,
-			TError,
-			"TData",
-			"TQueryData",
-			"TQueryKey"
-		].join(", ")}>> & { client?: QueryClient },
+  query?: Partial<${observerOptionsType}> & { client?: QueryClient },
   client?: ${buildClientOptionType()}
 }`,
 		default: "{}"
@@ -1516,10 +1594,24 @@ function buildQueryParamsNode(node, options) {
 		memberTypeWrapper: maybeValueOrGetter
 	}), optionsParam].filter((param) => param !== null) });
 }
-function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
+function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions, suspense }) {
 	const { TData, TError } = buildResponseTypes(node, tsResolver);
-	const returnType = `UseQueryResult<TData, ${TError}> & { queryKey: TQueryKey }`;
-	const generics = [
+	const hookName = suspense ? "useSuspenseQuery" : "useQuery";
+	const observerOptionsName = suspense ? "UseSuspenseQueryOptions" : "QueryObserverOptions";
+	const observerOptionsType = suspense ? `${observerOptionsName}<${[
+		TData,
+		TError,
+		"TData",
+		"TQueryKey"
+	].join(", ")}>` : `${observerOptionsName}<${[
+		TData,
+		TError,
+		"TData",
+		"TQueryData",
+		"TQueryKey"
+	].join(", ")}>`;
+	const returnType = `${suspense ? "UseSuspenseQueryResult" : "UseQueryResult"}<TData, ${TError}> & { queryKey: TQueryKey }`;
+	const generics = suspense ? [`TData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`] : [
 		`TData = ${TData}`,
 		`TQueryData = ${TData}`,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`
@@ -1527,78 +1619,11 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 	const resolvedParams = buildResolvedRequestParams(node);
 	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
 	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
-	const paramsNode = buildQueryParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
-	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,
-			generics: generics.join(", "),
-			params: paramsSignature,
-			returnType: void 0,
-			JSDoc: { comments: buildOperationComments(node) },
-			children: `
-       const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
-
-       const queryResult = useQuery({
-        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
-        ...resolvedOptions,
-        queryKey,
-       } as unknown as QueryObserverOptions, queryClient) as ${returnType}
-
-       queryResult.queryKey = queryKey as TQueryKey
-
-       return queryResult
-       `
-		})
-	});
-}
-//#endregion
-//#region src/components/SuspenseInfiniteQuery.tsx
-const declarationPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-function buildSuspenseInfiniteQueryParamsNode(node, options) {
-	const { resolver, pageParamGeneric } = options;
-	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
-		name: "options",
-		type: `{
-  query?: Partial<UseSuspenseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, ${pageParamGeneric}>> & { client?: QueryClient },
-  client?: ${buildClientOptionType()}
-}`,
-		default: "{}"
-	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, {
-		resolver,
-		memberTypeWrapper: maybeValueOrGetter
-	}), optionsParam].filter((param) => param !== null) });
-}
-function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions, initialPageParam, queryParam }) {
-	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}`,
-		`TError = ${errorType}`,
-		"TData = InfiniteData<TQueryFnData>",
-		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
-		`TPageParam = ${pageParamType}`
-	];
-	const resolvedParams = buildResolvedRequestParams(node);
-	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
-	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
-	const paramsNode = buildSuspenseInfiniteQueryParamsNode(node, {
+	const paramsNode = buildQueryParamsNode(node, {
 		resolver: tsResolver,
-		pageParamGeneric: "TPageParam"
+		observerOptionsType
 	});
-	const paramsSignature = declarationPrinter$2.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1615,11 +1640,11 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
        const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
        const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
-       const queryResult = useSuspenseInfiniteQuery({
+       const queryResult = ${hookName}({
         ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
-       } as unknown as UseSuspenseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
+       } as unknown as ${observerOptionsName}, queryClient) as ${returnType}
 
        queryResult.queryKey = queryKey as TQueryKey
 
@@ -1629,65 +1654,23 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 	});
 }
 //#endregion
-//#region src/components/SuspenseInfiniteQueryOptions.tsx
-const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
+//#region src/components/QueryOptions.tsx
+const declarationPrinter = (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 { TData: queryFnDataType, TError: errorType } = buildResponseTypes(node, tsResolver);
-	const { queryParamsTypeName, pageParamType } = resolvePageParamType(node, {
-		resolver: tsResolver,
-		initialPageParam,
-		queryParam
-	});
+function getQueryOptionsParams(node, options) {
+	return buildQueryOptionsParams(node, options);
+}
+function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
+	const { TData, TError } = buildResponseTypes(node, tsResolver);
+	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
+	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
 	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
 	const queryFnBody = `const { data } = await ${buildClientCall(node, {
 		clientName,
 		signal: true
 	})}
-    return data`;
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
-	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}>, typeof queryKey, ${pageParamType}>({
-  queryKey,
-  queryFn: async ({ signal, pageParam }) => {
-    ${infiniteOverrideParams}
-    ${queryFnBody}
-  },
-  ${queryOptionsArr.join(",\n  ")}
-})
-`
-		})
-	});
+          return data`;
 	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1697,81 +1680,18 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 			export: true,
 			params: paramsSignature,
 			children: `
-const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-  queryKey,
-  queryFn: async ({ signal }) => {
-    ${queryFnBody}
-  },
-  ${queryOptionsArr.join(",\n  ")}
-})
+      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+      return queryOptions<${TData}, ${TError}, ${TData}, typeof queryKey>({
+       queryKey,
+       queryFn: async ({ signal }) => {
+          ${queryFnBody}
+       },
+      })
 `
 		})
 	});
 }
 //#endregion
-//#region src/components/SuspenseQuery.tsx
-const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-function buildSuspenseQueryParamsNode(node, options) {
-	const { resolver } = options;
-	const { TData, TError } = buildResponseTypes(node, resolver);
-	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
-		name: "options",
-		type: `{
-  query?: Partial<UseSuspenseQueryOptions<${[
-			TData,
-			TError,
-			"TData",
-			"TQueryKey"
-		].join(", ")}>> & { client?: QueryClient },
-  client?: ${buildClientOptionType()}
-}`,
-		default: "{}"
-	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, {
-		resolver,
-		memberTypeWrapper: maybeValueOrGetter
-	}), optionsParam].filter((param) => param !== null) });
-}
-function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
-	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" : "";
-	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
-	const paramsNode = buildSuspenseQueryParamsNode(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
-	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,
-			generics: generics.join(", "),
-			params: paramsSignature,
-			returnType: void 0,
-			JSDoc: { comments: buildOperationComments(node) },
-			children: `
-       const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig${resolvedParams ? `\n       const resolvedParams = ${resolvedParams}` : ""}
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyArgs})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
-
-       const queryResult = useSuspenseQuery({
-        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
-        ...resolvedOptions,
-        queryKey,
-       } as unknown as UseSuspenseQueryOptions, queryClient) as ${returnType}
-
-       queryResult.queryKey = queryKey as TQueryKey
-
-       return queryResult
-       `
-		})
-	});
-}
-//#endregion
 //#region src/generators/infiniteQueryGenerator.tsx
 /**
 * Built-in generator for `useInfiniteQuery` hooks. Enabled when
@@ -2346,7 +2266,7 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 					name: ["infiniteQueryOptions"],
 					path: importPath
 				}),
-				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(SuspenseInfiniteQueryOptions, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(InfiniteQueryOptions, {
 					name: queryOptionsName,
 					clientName: calledClientName,
 					queryKeyName,
@@ -2373,7 +2293,7 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(SuspenseInfiniteQuery, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(InfiniteQuery, {
 						name: queryName,
 						queryOptionsName,
 						queryKeyName,
@@ -2382,7 +2302,8 @@ const suspenseInfiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 						tsResolver,
 						initialPageParam: infiniteOptions.initialPageParam,
 						queryParam: infiniteOptions.queryParam,
-						customOptions
+						customOptions,
+						suspense: true
 					})
 				] })
 			]
@@ -2520,14 +2441,15 @@ const suspenseQueryGenerator = (0, kubb_kit.defineGenerator)({
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(SuspenseQuery, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Query, {
 						name: queryName,
 						queryOptionsName,
 						queryKeyName,
 						queryKeyTypeName,
 						node,
 						tsResolver,
-						customOptions
+						customOptions,
+						suspense: true
 					})
 				] })
 			]
@@ -2536,9 +2458,6 @@ const suspenseQueryGenerator = (0, kubb_kit.defineGenerator)({
 });
 //#endregion
 //#region src/resolvers/resolverReactQuery.ts
-function capitalize(name) {
-	return `${name.charAt(0).toUpperCase()}${name.slice(1)}`;
-}
 /**
 * Default resolver used by `@kubb/plugin-react-query`. Decides the names and
 * file paths for every generated TanStack Query hook (`useFoo`,
@@ -2560,84 +2479,15 @@ function capitalize(name) {
 */
 const resolverReactQuery = (0, kubb_kit.createResolver)({
 	pluginName: "plugin-react-query",
-	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);
-		}
-	},
-	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`;
-		}
-	},
-	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`;
-		}
-	},
-	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`;
-		}
-	},
+	query: createQueryResolver(),
+	suspenseQuery: createQueryResolver("Suspense"),
+	infiniteQuery: createQueryResolver("Infinite"),
+	suspenseInfiniteQuery: createQueryResolver("SuspenseInfinite"),
 	mutation: {
-		name(node) {
-			return `use${capitalize(this.name(node.operationId))}`;
-		},
+		...createMutationResolver(),
 		optionsName(node) {
 			return `${this.name(node.operationId)}MutationOptions`;
 		},
-		keyName(node) {
-			return `${this.name(node.operationId)}MutationKey`;
-		},
 		typeName(node) {
 			return capitalize(this.name(node.operationId));
 		}
@@ -2704,43 +2554,17 @@ const pluginReactQuery = (0, kubb_kit.definePlugin)((options) => {
 		dependencies: [_kubb_plugin_ts.pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
 			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))
-			});
-			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/react-query",
-					methods: ["GET"],
-					...query
-				},
+				query: resolveQueryConfig(query, { importPath: "@tanstack/react-query" }),
 				mutationKey,
-				mutation: mutation === false ? false : {
-					importPath: "@tanstack/react-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/react-query" }),
+				infinite: resolveInfiniteConfig(infinite),
 				suspense,
 				customOptions: customOptions ? {
 					name: "useCustomHookOptions",
@@ -2763,5 +2587,6 @@ const pluginReactQuery = (0, kubb_kit.definePlugin)((options) => {
 exports.default = pluginReactQuery;
 exports.pluginReactQuery = pluginReactQuery;
 exports.pluginReactQueryName = pluginReactQueryName;
+exports.resolverReactQuery = resolverReactQuery;
 
 //# sourceMappingURL=index.cjs.map