@kubb/plugin-react-query 5.0.0-beta.79 → 5.0.0-beta.81

package/dist/index.cjs

@@ -28,7 +28,6 @@ let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
 let _kubb_core = require("@kubb/core");
 let _kubb_plugin_ts = require("@kubb/plugin-ts");
-let _kubb_plugin_zod = require("@kubb/plugin-zod");
 let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
 let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
 let node_fs = require("node:fs");
@@ -557,16 +556,6 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
-//#region ../../internals/client/src/builders/validatorOptions.ts
-/**
-* Returns `true` when any direction of the validator uses zod (used for dependency checks).
-*/
-function isValidatorEnabled(validator) {
-	if (!validator) return false;
-	if (validator === "zod") return true;
-	return Boolean(validator.request || validator.response);
-}
-//#endregion
 //#region ../../internals/client/src/resolveClient.ts
 /**
 * Resolves which client plugin a consumer (react-query, vue-query, swr, mcp) should call for an
@@ -692,12 +681,15 @@ function MutationKey({ name, node, transformer }) {
 * The grouped request options, ordered for both the destructured signature and the
 * call passed to the underlying client.
 */
-const requestGroupOrder = [
+const requestGroupOrder$1 = [
 	"path",
 	"query",
 	"body",
 	"headers"
 ];
+function maybeValueOrGetter(type) {
+	return `${type} | (() => ${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
@@ -710,7 +702,7 @@ const requestGroupOrder = [
 * `MaybeRefOrGetter` per group.
 */
 function buildGroupedRequestParam(node, options) {
-	const { resolver, keys = requestGroupOrder, memberTypeWrapper } = options;
+	const { resolver, keys = requestGroupOrder$1, memberTypeWrapper } = options;
 	const { groups, hasRequiredPath, hasRequiredQuery, hasRequiredHeader } = getRequestGroupOptionality(node);
 	const names = keys.filter((key) => groups[key]);
 	if (names.length === 0) return null;
@@ -722,7 +714,7 @@ function buildGroupedRequestParam(node, options) {
 	};
 	const isOptional = names.every((name) => !requiredByGroup[name]);
 	const requestConfigName = resolver.resolveRequestConfigName(node);
-	const omittedKeys = requestGroupOrder.filter((key) => !keys.includes(key));
+	const omittedKeys = requestGroupOrder$1.filter((key) => !keys.includes(key));
 	const requestConfigType = omittedKeys.length > 0 ? `Omit<${requestConfigName}, ${omittedKeys.map((key) => `'${key}'`).join(" | ")}>` : requestConfigName;
 	if (memberTypeWrapper) {
 		const members = names.map((name) => ({
@@ -778,7 +770,7 @@ function buildClientCall(node, options) {
 	const { groups } = getRequestGroupOptionality(node);
 	return `${clientName}({ ${[
 		"...config",
-		...requestGroupOrder.filter((key) => groups[key]),
+		...requestGroupOrder$1.filter((key) => groups[key]),
 		signal ? "signal: config.signal ?? signal" : null,
 		"throwOnError: true"
 	].filter((part) => part !== null).join(", ")} })`;
@@ -806,51 +798,6 @@ function resolveOperationOverrides(node, override) {
 	return override.find((ov) => matchesPattern(node, ov))?.options ?? {};
 }
 /**
-* Returns `'zod'` when response-direction parsing is enabled.
-* The string shorthand `'zod'` also enables response parsing.
-*/
-function resolveResponseParser(parser) {
-	if (!parser) return null;
-	if (parser === "zod") return "zod";
-	return parser.response ?? null;
-}
-/**
-* Returns `'zod'` when request body parsing is enabled.
-* The string shorthand `'zod'` also enables request body parsing (existing behavior).
-*/
-function resolveRequestParser(parser) {
-	if (!parser) return null;
-	if (parser === "zod") return "zod";
-	return parser.request ?? null;
-}
-/**
-* Returns `'zod'` when query-params parsing is enabled.
-* Only the object form `{ request: 'zod' }` enables this. `parser: 'zod'` does not.
-*/
-function resolveQueryParamsParser(parser) {
-	if (!parser || parser === "zod") return null;
-	return parser.request ?? null;
-}
-/**
-* Collects the Zod schema import names for an operation based on the active parser directions.
-*
-* - `parser: 'zod'`: response and request body names (backward-compatible behavior).
-* - `parser: { request: 'zod' }`: request body and query params names.
-* - `parser: { response: 'zod' }`: response name only.
-* - `parser: { request: 'zod', response: 'zod' }`: all three.
-*
-* Returns an empty array when no resolver is provided or `parser` is falsy.
-*/
-function resolveZodSchemaNames(node, zodResolver, parser) {
-	if (!zodResolver || !parser) return [];
-	const { query: queryParams } = getOperationParameters(node, { paramsCasing: "original" });
-	return [
-		resolveResponseParser(parser) === "zod" ? zodResolver.resolveResponseName?.(node) : null,
-		resolveRequestParser(parser) === "zod" && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
-		resolveQueryParamsParser(parser) === "zod" && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]) : null
-	].filter((n) => Boolean(n));
-}
-/**
 * 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
 * grouped `path`/`query`/`body` bindings.
@@ -1005,6 +952,30 @@ const customHookOptionsFileGenerator = (0, _kubb_core.defineGenerator)({
 	}
 });
 //#endregion
+//#region src/utils.ts
+const requestGroupOrder = [
+	"path",
+	"query",
+	"body",
+	"headers"
+];
+/**
+* Builds the object literal that resolves each request group to a concrete value, unwrapping a getter
+* once before the value reaches the plain `queryKey`/`queryOptions` helpers. A getter must never reach a
+* React Query key, which is hashed structurally. Returns `null` when the operation carries no request group.
+*
+* @example
+* ```ts
+* buildResolvedRequestParams(node) // { path: typeof path === 'function' ? path() : path }
+* ```
+*/
+function buildResolvedRequestParams(node) {
+	const groups = getRequestGroups(node);
+	const names = requestGroupOrder.filter((key) => groups[key]);
+	if (names.length === 0) return null;
+	return `{ ${names.map((name) => `${name}: typeof ${name} === 'function' ? ${name}() : ${name}`).join(", ")} }`;
+}
+//#endregion
 //#region src/generators/hookOptionsGenerator.tsx
 /**
 * Emits the `HookOptions` type used by `customOptions`. Enabled when
@@ -1017,8 +988,8 @@ const hookOptionsGenerator = (0, _kubb_core.defineGenerator)({
 	renderer: _kubb_renderer_jsx.jsxRenderer,
 	operations(nodes, ctx) {
 		const { resolver, config, root } = ctx;
-		const { output, customOptions, query, mutation, suspense, infinite, group, override } = ctx.options;
-		if (!customOptions) return null;
+		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({
 			name,
@@ -1162,51 +1133,8 @@ const hookOptionsGenerator = (0, _kubb_core.defineGenerator)({
 	}
 });
 //#endregion
-//#region src/components/QueryOptions.tsx
-const declarationPrinter$8 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$8 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
-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 queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$8.print(queryKeyParamsNode) ?? "";
-	const paramsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
-	const queryFnBody = `const { data } = await ${buildClientCall(node, {
-		clientName,
-		signal: true
-	})}
-          return data`;
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
-		name,
-		isExportable: true,
-		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_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/InfiniteQuery.tsx
-const declarationPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+const declarationPrinter$8 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function buildInfiniteQueryParamsNode(node, options) {
 	const { resolver, pageParamGeneric } = options;
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
@@ -1217,7 +1145,10 @@ function buildInfiniteQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, {
+		resolver,
+		memberTypeWrapper: maybeValueOrGetter
+	}), optionsParam].filter((param) => param !== null) });
 }
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, initialPageParam, queryParam, customOptions }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
@@ -1245,15 +1176,14 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
 		`TPageParam = ${pageParamType}`
 	];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$7.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$7.print(queryOptionsParamsNode) ?? "";
+	const resolvedParams = buildResolvedRequestParams(node);
+	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildInfiniteQueryParamsNode(node, {
 		resolver: tsResolver,
 		pageParamGeneric: "TPageParam"
 	});
-	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
+	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
 		name,
 		isExportable: true,
@@ -1267,11 +1197,11 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       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({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
@@ -1284,9 +1214,51 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	});
 }
 //#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 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 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_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+		name,
+		isExportable: true,
+		isIndexable: true,
+		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_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$6 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+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);
@@ -1305,7 +1277,7 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$6.print(queryKeyParamsNode) ?? "";
+	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, {
@@ -1377,7 +1349,7 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 //#endregion
 //#region src/components/MutationOptions.tsx
 const declarationPrinter$5 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$5 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+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)({
 		name: "config",
@@ -1396,7 +1368,7 @@ function MutationOptions({ name, clientName, node, tsResolver, mutationKeyName }
 	const hasMutationParams = groupedParam !== null;
 	const groupedParamsNode = (0, _kubb_plugin_ts.createFunctionParameters)({ params: groupedParam ? [groupedParam] : [] });
 	const TRequest = hasMutationParams ? tsResolver.resolveRequestConfigName(node) : "undefined";
-	const argBindingStr = hasMutationParams ? callPrinter$5.print(groupedParamsNode) ?? "" : "_";
+	const argBindingStr = hasMutationParams ? callPrinter$2.print(groupedParamsNode) ?? "" : "_";
 	const mutationFnBody = `const { data } = await ${buildClientCall(node, {
 		clientName,
 		signal: false
@@ -1426,7 +1398,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 callPrinter$4 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+const callPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function resolveMutationRequestType(node, resolver) {
 	return buildGroupedRequestParam(node, { resolver }) ? resolver.resolveRequestConfigName(node) : "undefined";
 }
@@ -1461,7 +1433,7 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 	].join(", ");
 	const returnType = `UseMutationResult<${generics}>`;
 	const mutationOptionsConfigNode = buildMutationConfigParamsNode(node);
-	const mutationOptionsParamsCall = callPrinter$4.print(mutationOptionsConfigNode) ?? "";
+	const mutationOptionsParamsCall = callPrinter$1.print(mutationOptionsConfigNode) ?? "";
 	const paramsNode = buildMutationParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$4.print(paramsNode) ?? "";
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
@@ -1493,7 +1465,6 @@ function Mutation({ name, mutationOptionsName, node, tsResolver, mutationKeyName
 //#endregion
 //#region src/components/Query.tsx
 const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
@@ -1513,7 +1484,10 @@ function buildQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, {
+		resolver,
+		memberTypeWrapper: maybeValueOrGetter
+	}), optionsParam].filter((param) => param !== null) });
 }
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, tsResolver, customOptions }) {
 	const successNames = resolveSuccessNames(node, tsResolver);
@@ -1526,10 +1500,9 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 		`TQueryData = ${TData}`,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`
 	];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$3.print(queryOptionsParamsNode) ?? "";
+	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_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
@@ -1545,11 +1518,11 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       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}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as QueryObserverOptions, queryClient) as ${returnType}
@@ -1564,7 +1537,6 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 //#endregion
 //#region src/components/SuspenseInfiniteQuery.tsx
 const declarationPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildSuspenseInfiniteQueryParamsNode(node, options) {
 	const { resolver, pageParamGeneric } = options;
 	const optionsParam = (0, _kubb_plugin_ts.createFunctionParameter)({
@@ -1575,7 +1547,10 @@ function buildSuspenseInfiniteQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	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 successNames = resolveSuccessNames(node, tsResolver);
@@ -1603,10 +1578,9 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
 		`TPageParam = ${pageParamType}`
 	];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$2.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter$2.print(queryOptionsParamsNode) ?? "";
+	const resolvedParams = buildResolvedRequestParams(node);
+	const queryKeyArgs = resolvedParams ? "resolvedParams" : "";
+	const queryOptionsArgs = resolvedParams ? "resolvedParams, config" : "config";
 	const paramsNode = buildSuspenseInfiniteQueryParamsNode(node, {
 		resolver: tsResolver,
 		pageParamGeneric: "TPageParam"
@@ -1625,11 +1599,11 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       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({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as UseSuspenseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
@@ -1644,7 +1618,7 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 //#endregion
 //#region src/components/SuspenseInfiniteQueryOptions.tsx
 const declarationPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter$1 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
+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);
@@ -1670,7 +1644,7 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 	})}
     return data`;
 	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter$1.print(queryKeyParamsNode) ?? "";
+	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
@@ -1735,7 +1709,6 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 //#endregion
 //#region src/components/SuspenseQuery.tsx
 const declarationPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
-const callPrinter = (0, _kubb_plugin_ts.functionPrinter)({ mode: "call" });
 function buildSuspenseQueryParamsNode(node, options) {
 	const { resolver } = options;
 	const successNames = resolveSuccessNames(node, resolver);
@@ -1754,7 +1727,10 @@ function buildSuspenseQueryParamsNode(node, options) {
 }`,
 		default: "{}"
 	});
-	return (0, _kubb_plugin_ts.createFunctionParameters)({ params: [buildGroupedRequestParam(node, { resolver }), optionsParam].filter((param) => param !== null) });
+	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 successNames = resolveSuccessNames(node, tsResolver);
@@ -1763,10 +1739,9 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	const TData = responseName;
 	const returnType = `UseSuspenseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
 	const generics = [`TData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`];
-	const queryKeyParamsNode = buildQueryKeyParams(node, { resolver: tsResolver });
-	const queryKeyParamsCall = callPrinter.print(queryKeyParamsNode) ?? "";
-	const queryOptionsParamsNode = getQueryOptionsParams(node, { resolver: tsResolver });
-	const queryOptionsParamsCall = callPrinter.print(queryOptionsParamsNode) ?? "";
+	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_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
@@ -1782,11 +1757,11 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
-       const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       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}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsArgs}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as UseSuspenseQueryOptions, queryClient) as ${returnType}
@@ -1812,7 +1787,7 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, validator, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, infinite, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1862,14 +1837,6 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
-		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
-			root,
-			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group ?? void 0
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -1892,11 +1859,6 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -1946,31 +1908,33 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: ["useInfiniteQuery"],
-					path: importPath
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: [
-						"QueryKey",
-						"QueryClient",
-						"InfiniteQueryObserverOptions",
-						"UseInfiniteQueryResult"
-					],
-					path: importPath,
-					isTypeOnly: true
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(InfiniteQuery, {
-					name: queryName,
-					queryOptionsName,
-					queryKeyName,
-					queryKeyTypeName,
-					node,
-					tsResolver,
-					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam,
-					customOptions
-				})
+				hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+						name: ["useInfiniteQuery"],
+						path: importPath
+					}),
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+						name: [
+							"QueryKey",
+							"QueryClient",
+							"InfiniteQueryObserverOptions",
+							"UseInfiniteQueryResult"
+						],
+						path: importPath,
+						isTypeOnly: true
+					}),
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(InfiniteQuery, {
+						name: queryName,
+						queryOptionsName,
+						queryKeyName,
+						queryKeyTypeName,
+						node,
+						tsResolver,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam,
+						customOptions
+					})
+				] })
 			]
 		});
 	}
@@ -1988,7 +1952,7 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, validator, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -2024,14 +1988,6 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
-		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
-			root,
-			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group ?? void 0
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -2054,11 +2010,6 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -2096,7 +2047,7 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 					node,
 					tsResolver
 				}),
-				mutation && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+				mutation && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 						name: ["useMutation"],
 						path: importPath
@@ -2137,7 +2088,7 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, validator, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -2175,14 +2126,6 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
-		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
-			root,
-			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group ?? void 0
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -2205,11 +2148,6 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -2249,7 +2187,7 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 					node,
 					tsResolver
 				}),
-				query && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+				query && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 						name: ["useQuery"],
 						path: importPath
@@ -2283,7 +2221,7 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 /**
 * Built-in generator for `useSuspenseInfiniteQuery` hooks. Enabled when both
 * `suspense` and `infinite` are configured. Combines suspense semantics with
-* cursor-based pagination — handlers throw promises while loading and pull
+* cursor-based pagination. Handlers throw promises while loading and pull
 * additional pages on demand.
 */
 const suspenseInfiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
@@ -2292,7 +2230,7 @@ const suspenseInfiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, suspense, validator, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, infinite, suspense, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -2342,14 +2280,6 @@ const suspenseInfiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
-		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
-			root,
-			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group ?? void 0
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -2372,11 +2302,6 @@ const suspenseInfiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -2426,31 +2351,33 @@ const suspenseInfiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: ["useSuspenseInfiniteQuery"],
-					path: importPath
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: [
-						"QueryKey",
-						"QueryClient",
-						"UseSuspenseInfiniteQueryOptions",
-						"UseSuspenseInfiniteQueryResult"
-					],
-					path: importPath,
-					isTypeOnly: true
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(SuspenseInfiniteQuery, {
-					name: queryName,
-					queryOptionsName,
-					queryKeyName,
-					queryKeyTypeName,
-					node,
-					tsResolver,
-					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam,
-					customOptions
-				})
+				hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+						name: ["useSuspenseInfiniteQuery"],
+						path: importPath
+					}),
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+						name: [
+							"QueryKey",
+							"QueryClient",
+							"UseSuspenseInfiniteQueryOptions",
+							"UseSuspenseInfiniteQueryResult"
+						],
+						path: importPath,
+						isTypeOnly: true
+					}),
+					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(SuspenseInfiniteQuery, {
+						name: queryName,
+						queryOptionsName,
+						queryKeyName,
+						queryKeyTypeName,
+						node,
+						tsResolver,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam,
+						customOptions
+					})
+				] })
 			]
 		});
 	}
@@ -2469,7 +2396,7 @@ const suspenseQueryGenerator = (0, _kubb_core.defineGenerator)({
 	operation(node, ctx) {
 		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, suspense, validator, client, group, customOptions } = ctx.options;
+		const { output, query, mutation, suspense, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -2507,14 +2434,6 @@ const suspenseQueryGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.pluginZodName) : null;
-		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
-			root,
-			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group ?? void 0
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
 			baseName: meta.file.baseName,
@@ -2537,11 +2456,6 @@ const suspenseQueryGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -2581,7 +2495,7 @@ const suspenseQueryGenerator = (0, _kubb_core.defineGenerator)({
 					node,
 					tsResolver
 				}),
-				suspense && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
+				suspense && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
 						name: ["useSuspenseQuery"],
 						path: importPath
@@ -2734,8 +2648,8 @@ const resolverReactQuery = (0, _kubb_core.defineResolver)(() => ({
 const pluginReactQueryName = "plugin-react-query";
 /**
 * Generates one TanStack Query hook per OpenAPI operation for React. Queries
-* become `useFooQuery`/`useFooSuspenseQuery`/`useFooInfiniteQuery`; mutations
-* become `useFooMutation`. Each hook is fully typed: query keys, input
+* become `useFoo`, with `useFooSuspense` and `useFooInfinite` variants.
+* Mutations become `useFoo`. Each hook is fully typed: query keys, input
 * variables, response data, and error shape all come from the spec.
 *
 * @example
@@ -2761,7 +2675,7 @@ const pluginReactQuery = (0, _kubb_core.definePlugin)((options) => {
 	const { output = {
 		path: "hooks",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], validator = false, suspense = {}, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, customOptions, client, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], suspense = {}, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, customOptions, hooks = false, client, resolver: userResolver, macros: userMacros } = options;
 	const selectedGenerators = [
 		queryGenerator,
 		suspenseQueryGenerator,
@@ -2775,7 +2689,7 @@ const pluginReactQuery = (0, _kubb_core.definePlugin)((options) => {
 	return {
 		name: pluginReactQueryName,
 		options,
-		dependencies: [_kubb_plugin_ts.pluginTsName, isValidatorEnabled(validator) ? _kubb_plugin_zod.pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [_kubb_plugin_ts.pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverReactQuery,
@@ -2823,7 +2737,7 @@ const pluginReactQuery = (0, _kubb_core.definePlugin)((options) => {
 					name: "useCustomHookOptions",
 					...customOptions
 				} : null,
-				validator,
+				hooks,
 				group: groupConfig,
 				exclude,
 				include,