@kubb/plugin-react-query 4.4.1 → 4.5.0

package/dist/{generators-hTZEzfNP.cjs → generators-BIuKpozF.cjs}

@@ -1,6 +1,8 @@
-const require_components = require('./components-B_-p18Ak.cjs');
-let __kubb_plugin_oas = require("@kubb/plugin-oas");
-__kubb_plugin_oas = require_components.__toESM(__kubb_plugin_oas);
+const require_components = require('./components-DtLglQ1w.cjs');
+let node_path = require("node:path");
+node_path = require_components.__toESM(node_path);
+let __kubb_plugin_client = require("@kubb/plugin-client");
+__kubb_plugin_client = require_components.__toESM(__kubb_plugin_client);
 let __kubb_plugin_ts = require("@kubb/plugin-ts");
 __kubb_plugin_ts = require_components.__toESM(__kubb_plugin_ts);
 let __kubb_plugin_zod = require("@kubb/plugin-zod");
@@ -15,52 +17,60 @@ let __kubb_plugin_client_components = require("@kubb/plugin-client/components");
 __kubb_plugin_client_components = require_components.__toESM(__kubb_plugin_client_components);
 let __kubb_core_hooks = require("@kubb/core/hooks");
 __kubb_core_hooks = require_components.__toESM(__kubb_core_hooks);
-let __kubb_plugin_client = require("@kubb/plugin-client");
-__kubb_plugin_client = require_components.__toESM(__kubb_plugin_client);
+let __kubb_plugin_oas_generators = require("@kubb/plugin-oas/generators");
+__kubb_plugin_oas_generators = require_components.__toESM(__kubb_plugin_oas_generators);
 let __kubb_plugin_oas_hooks = require("@kubb/plugin-oas/hooks");
 __kubb_plugin_oas_hooks = require_components.__toESM(__kubb_plugin_oas_hooks);
 let remeda = require("remeda");
 remeda = require_components.__toESM(remeda);
 
-//#region src/generators/queryGenerator.tsx
-const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
-	name: "react-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = (0, __kubb_core_hooks.usePlugin)();
+//#region src/generators/infiniteQueryGenerator.tsx
+const infiniteQueryGenerator = (0, __kubb_plugin_oas_generators.createReactGenerator)({
+	name: "react-infinite-query",
+	Operation({ config, operation, generator, plugin }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
 		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
-		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)();
+		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)(generator);
 		const isQuery = typeof options.query === "boolean" ? true : options.query?.methods.some((method) => operation.method === method);
 		const isMutation = (0, remeda.difference)(options.mutation ? options.mutation.methods : [], options.query ? options.query.methods : []).some((method) => operation.method === method);
+		const infiniteOptions = options.infinite && typeof options.infinite === "object" ? options.infinite : void 0;
 		const importPath = options.query ? options.query.importPath : "@tanstack/react-query";
 		const query = {
 			name: getName(operation, {
 				type: "function",
-				prefix: "use"
+				prefix: "use",
+				suffix: "infinite"
 			}),
 			typeName: getName(operation, { type: "type" }),
-			file: getFile(operation, { prefix: "use" })
+			file: getFile(operation, {
+				prefix: "use",
+				suffix: "infinite"
+			})
 		};
 		const hasClientPlugin = !!pluginManager.getPluginByKey([__kubb_plugin_client.pluginClientName]);
 		const client = {
 			name: hasClientPlugin ? getName(operation, {
 				type: "function",
 				pluginKey: [__kubb_plugin_client.pluginClientName]
-			}) : getName(operation, { type: "function" }),
+			}) : getName(operation, {
+				type: "function",
+				suffix: "infinite"
+			}),
 			file: getFile(operation, { pluginKey: [__kubb_plugin_client.pluginClientName] })
 		};
 		const queryOptions = { name: getName(operation, {
 			type: "function",
-			suffix: "QueryOptions"
+			suffix: "InfiniteQueryOptions"
 		}) };
 		const queryKey = {
 			name: getName(operation, {
 				type: "const",
-				suffix: "QueryKey"
+				suffix: "InfiniteQueryKey"
 			}),
 			typeName: getName(operation, {
 				type: "type",
-				suffix: "QueryKey"
+				suffix: "InfiniteQueryKey"
 			})
 		};
 		const type = {
@@ -77,7 +87,15 @@ const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 				type: "function"
 			})
 		};
-		if (!isQuery || isMutation) return null;
+		if (!isQuery || isMutation || !infiniteOptions) return null;
+		const normalizeKey = (key) => (key ?? "").replace(/\?$/, "");
+		const queryParam = infiniteOptions.queryParam;
+		const cursorParam = infiniteOptions.cursorParam;
+		const queryParamKeys = type.schemas.queryParams?.keys ?? [];
+		const responseKeys = [...type.schemas.responses?.flatMap((item) => item.keys ?? []) ?? [], ...type.schemas.response?.keys ?? []];
+		const hasQueryParam = queryParam ? queryParamKeys.some((key) => normalizeKey(key) === queryParam) : false;
+		const hasCursorParam = cursorParam ? responseKeys.some((key) => normalizeKey(key) === cursorParam) : true;
+		if (!hasQueryParam || !hasCursorParam) return null;
 		return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric.File, {
 			baseName: query.file.baseName,
 			path: query.file.path,
@@ -97,25 +115,45 @@ const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					root: query.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				hasClientPlugin && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [client.name],
 					root: query.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["RequestConfig", "ResponseErrorConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
-				options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["ResponseConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -133,9 +171,9 @@ const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					name: queryKey.name,
 					typeName: queryKey.typeName,
 					operation,
+					paramsCasing: options.paramsCasing,
 					pathParamsType: options.pathParamsType,
 					typeSchemas: type.schemas,
-					paramsCasing: options.paramsCasing,
 					transformer: options.queryKey
 				}),
 				!hasClientPlugin && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_plugin_client_components.Client, {
@@ -144,43 +182,52 @@ const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					operation,
 					typeSchemas: type.schemas,
 					zodSchemas: zod.schemas,
-					dataReturnType: options.client.dataReturnType,
-					paramsType: options.paramsType,
-					paramsCasing: options.paramsCasing,
-					pathParamsType: options.pathParamsType,
-					parser: options.parser
-				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["queryOptions"],
-					path: importPath
-				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.QueryOptions, {
-					name: queryOptions.name,
-					clientName: client.name,
-					queryKeyName: queryKey.name,
-					typeSchemas: type.schemas,
+					dataReturnType: options.client.dataReturnType || "data",
 					paramsCasing: options.paramsCasing,
 					paramsType: options.paramsType,
 					pathParamsType: options.pathParamsType,
-					dataReturnType: options.client.dataReturnType
+					parser: options.parser
 				}),
-				options.query && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+				infiniteOptions && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						name: ["useQuery"],
+						name: ["InfiniteData"],
+						isTypeOnly: true,
+						path: importPath
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["infiniteQueryOptions"],
+						path: importPath
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.InfiniteQueryOptions, {
+						name: queryOptions.name,
+						clientName: client.name,
+						queryKeyName: queryKey.name,
+						typeSchemas: type.schemas,
+						paramsCasing: options.paramsCasing,
+						paramsType: options.paramsType,
+						pathParamsType: options.pathParamsType,
+						dataReturnType: options.client.dataReturnType || "data",
+						cursorParam: infiniteOptions.cursorParam,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam
+					})
+				] }),
+				infiniteOptions && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["useInfiniteQuery"],
 						path: importPath
 					}),
 					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 						name: [
 							"QueryKey",
 							"QueryClient",
-							"QueryObserverOptions",
-							"UseQueryResult",
-							"QueryClient"
+							"InfiniteQueryObserverOptions",
+							"UseInfiniteQueryResult"
 						],
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.Query, {
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.InfiniteQuery, {
 						name: query.name,
 						queryOptionsName: queryOptions.name,
 						typeSchemas: type.schemas,
@@ -188,9 +235,11 @@ const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 						paramsType: options.paramsType,
 						pathParamsType: options.pathParamsType,
 						operation,
-						dataReturnType: options.client.dataReturnType,
+						dataReturnType: options.client.dataReturnType || "data",
 						queryKeyName: queryKey.name,
-						queryKeyTypeName: queryKey.typeName
+						queryKeyTypeName: queryKey.typeName,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam
 					})
 				] })
 			]
@@ -200,13 +249,13 @@ const queryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 
 //#endregion
 //#region src/generators/mutationGenerator.tsx
-const mutationGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
+const mutationGenerator = (0, __kubb_plugin_oas_generators.createReactGenerator)({
 	name: "react-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = (0, __kubb_core_hooks.usePlugin)();
+	Operation({ config, plugin, operation, generator }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
 		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
-		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)();
+		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)(generator);
 		const isMutation = !(!!options.query && options.query?.methods.some((method) => operation.method === method)) && (0, remeda.difference)(options.mutation ? options.mutation.methods : [], options.query ? options.query.methods : []).some((method) => operation.method === method);
 		const importPath = options.mutation ? options.mutation.importPath : "@tanstack/react-query";
 		const mutation = {
@@ -273,24 +322,45 @@ const mutationGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					root: mutation.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						root: mutation.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: mutation.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						root: mutation.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				!!hasClientPlugin && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [client.name],
 					root: mutation.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: [
-						"RequestConfig",
-						"ResponseConfig",
-						"ResponseErrorConfig"
-					],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -319,7 +389,7 @@ const mutationGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					operation,
 					typeSchemas: type.schemas,
 					zodSchemas: zod.schemas,
-					dataReturnType: options.client.dataReturnType,
+					dataReturnType: options.client.dataReturnType || "data",
 					paramsCasing: options.paramsCasing,
 					paramsType: options.paramsType,
 					pathParamsType: options.pathParamsType,
@@ -337,7 +407,7 @@ const mutationGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					paramsCasing: options.paramsCasing,
 					paramsType: options.paramsType,
 					pathParamsType: options.pathParamsType,
-					dataReturnType: options.client.dataReturnType
+					dataReturnType: options.client.dataReturnType || "data"
 				}),
 				options.mutation && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
@@ -359,7 +429,7 @@ const mutationGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 						typeName: mutation.typeName,
 						typeSchemas: type.schemas,
 						operation,
-						dataReturnType: options.client.dataReturnType,
+						dataReturnType: options.client.dataReturnType || "data",
 						paramsCasing: options.paramsCasing,
 						pathParamsType: options.pathParamsType,
 						mutationKeyName: mutationKey.name
@@ -371,53 +441,45 @@ const mutationGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 });
 
 //#endregion
-//#region src/generators/infiniteQueryGenerator.tsx
-const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
-	name: "react-infinite-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = (0, __kubb_core_hooks.usePlugin)();
+//#region src/generators/queryGenerator.tsx
+const queryGenerator = (0, __kubb_plugin_oas_generators.createReactGenerator)({
+	name: "react-query",
+	Operation({ config, plugin, operation, generator }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
 		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
-		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)();
+		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)(generator);
 		const isQuery = typeof options.query === "boolean" ? true : options.query?.methods.some((method) => operation.method === method);
 		const isMutation = (0, remeda.difference)(options.mutation ? options.mutation.methods : [], options.query ? options.query.methods : []).some((method) => operation.method === method);
-		const infiniteOptions = options.infinite && typeof options.infinite === "object" ? options.infinite : void 0;
 		const importPath = options.query ? options.query.importPath : "@tanstack/react-query";
 		const query = {
 			name: getName(operation, {
 				type: "function",
-				prefix: "use",
-				suffix: "infinite"
+				prefix: "use"
 			}),
 			typeName: getName(operation, { type: "type" }),
-			file: getFile(operation, {
-				prefix: "use",
-				suffix: "infinite"
-			})
+			file: getFile(operation, { prefix: "use" })
 		};
 		const hasClientPlugin = !!pluginManager.getPluginByKey([__kubb_plugin_client.pluginClientName]);
 		const client = {
 			name: hasClientPlugin ? getName(operation, {
 				type: "function",
 				pluginKey: [__kubb_plugin_client.pluginClientName]
-			}) : getName(operation, {
-				type: "function",
-				suffix: "infinite"
-			}),
+			}) : getName(operation, { type: "function" }),
 			file: getFile(operation, { pluginKey: [__kubb_plugin_client.pluginClientName] })
 		};
 		const queryOptions = { name: getName(operation, {
 			type: "function",
-			suffix: "InfiniteQueryOptions"
+			suffix: "QueryOptions"
 		}) };
 		const queryKey = {
 			name: getName(operation, {
 				type: "const",
-				suffix: "InfiniteQueryKey"
+				suffix: "QueryKey"
 			}),
 			typeName: getName(operation, {
 				type: "type",
-				suffix: "InfiniteQueryKey"
+				suffix: "QueryKey"
 			})
 		};
 		const type = {
@@ -434,15 +496,7 @@ const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 				type: "function"
 			})
 		};
-		if (!isQuery || isMutation || !infiniteOptions) return null;
-		const normalizeKey = (key) => (key ?? "").replace(/\?$/, "");
-		const queryParam = infiniteOptions.queryParam;
-		const cursorParam = infiniteOptions.cursorParam;
-		const queryParamKeys = type.schemas.queryParams?.keys ?? [];
-		const responseKeys = [...type.schemas.responses?.flatMap((item) => item.keys ?? []) ?? [], ...type.schemas.response?.keys ?? []];
-		const hasQueryParam = queryParam ? queryParamKeys.some((key) => normalizeKey(key) === queryParam) : false;
-		const hasCursorParam = cursorParam ? responseKeys.some((key) => normalizeKey(key) === cursorParam) : true;
-		if (!hasQueryParam || !hasCursorParam) return null;
+		if (!isQuery || isMutation) return null;
 		return /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric.File, {
 			baseName: query.file.baseName,
 			path: query.file.path,
@@ -462,25 +516,45 @@ const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					root: query.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				hasClientPlugin && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [client.name],
 					root: query.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["RequestConfig", "ResponseErrorConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
-				options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["ResponseConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -498,9 +572,9 @@ const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					name: queryKey.name,
 					typeName: queryKey.typeName,
 					operation,
-					paramsCasing: options.paramsCasing,
 					pathParamsType: options.pathParamsType,
 					typeSchemas: type.schemas,
+					paramsCasing: options.paramsCasing,
 					transformer: options.queryKey
 				}),
 				!hasClientPlugin && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_plugin_client_components.Client, {
@@ -509,52 +583,43 @@ const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					operation,
 					typeSchemas: type.schemas,
 					zodSchemas: zod.schemas,
-					dataReturnType: options.client.dataReturnType,
-					paramsCasing: options.paramsCasing,
+					dataReturnType: options.client.dataReturnType || "data",
 					paramsType: options.paramsType,
+					paramsCasing: options.paramsCasing,
 					pathParamsType: options.pathParamsType,
 					parser: options.parser
 				}),
-				infiniteOptions && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
-					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						name: ["InfiniteData"],
-						isTypeOnly: true,
-						path: importPath
-					}),
-					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						name: ["infiniteQueryOptions"],
-						path: importPath
-					}),
-					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.InfiniteQueryOptions, {
-						name: queryOptions.name,
-						clientName: client.name,
-						queryKeyName: queryKey.name,
-						typeSchemas: type.schemas,
-						paramsCasing: options.paramsCasing,
-						paramsType: options.paramsType,
-						pathParamsType: options.pathParamsType,
-						dataReturnType: options.client.dataReturnType,
-						cursorParam: infiniteOptions.cursorParam,
-						initialPageParam: infiniteOptions.initialPageParam,
-						queryParam: infiniteOptions.queryParam
-					})
-				] }),
-				infiniteOptions && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+					name: ["queryOptions"],
+					path: importPath
+				}),
+				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.QueryOptions, {
+					name: queryOptions.name,
+					clientName: client.name,
+					queryKeyName: queryKey.name,
+					typeSchemas: type.schemas,
+					paramsCasing: options.paramsCasing,
+					paramsType: options.paramsType,
+					pathParamsType: options.pathParamsType,
+					dataReturnType: options.client.dataReturnType || "data"
+				}),
+				options.query && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
 					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						name: ["useInfiniteQuery"],
+						name: ["useQuery"],
 						path: importPath
 					}),
 					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 						name: [
 							"QueryKey",
 							"QueryClient",
-							"InfiniteQueryObserverOptions",
-							"UseInfiniteQueryResult"
+							"QueryObserverOptions",
+							"UseQueryResult",
+							"QueryClient"
 						],
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.InfiniteQuery, {
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.Query, {
 						name: query.name,
 						queryOptionsName: queryOptions.name,
 						typeSchemas: type.schemas,
@@ -562,11 +627,9 @@ const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 						paramsType: options.paramsType,
 						pathParamsType: options.pathParamsType,
 						operation,
-						dataReturnType: options.client.dataReturnType,
+						dataReturnType: options.client.dataReturnType || "data",
 						queryKeyName: queryKey.name,
-						queryKeyTypeName: queryKey.typeName,
-						initialPageParam: infiniteOptions.initialPageParam,
-						queryParam: infiniteOptions.queryParam
+						queryKeyTypeName: queryKey.typeName
 					})
 				] })
 			]
@@ -576,13 +639,13 @@ const infiniteQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 
 //#endregion
 //#region src/generators/suspenseQueryGenerator.tsx
-const suspenseQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
+const suspenseQueryGenerator = (0, __kubb_plugin_oas_generators.createReactGenerator)({
 	name: "react-suspense-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = (0, __kubb_core_hooks.usePlugin)();
+	Operation({ config, operation, generator, plugin }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = (0, __kubb_core_hooks.usePluginManager)();
 		const oas = (0, __kubb_plugin_oas_hooks.useOas)();
-		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)();
+		const { getSchemas, getName, getFile } = (0, __kubb_plugin_oas_hooks.useOperationManager)(generator);
 		const isQuery = typeof options.query === "boolean" ? true : options.query?.methods.some((method) => operation.method === method);
 		const isMutation = (0, remeda.difference)(options.mutation ? options.mutation.methods : [], options.query ? options.query.methods : []).some((method) => operation.method === method);
 		const isSuspense = !!options.suspense;
@@ -658,25 +721,45 @@ const suspenseQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					root: query.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsxs)(__kubb_react_fabric_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: "fetch",
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
+						name: ["ResponseConfig"],
+						root: query.file.path,
+						path: node_path.default.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				hasClientPlugin && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [client.name],
 					root: query.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["RequestConfig", "ResponseErrorConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
-				options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-					name: ["ResponseConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -705,7 +788,7 @@ const suspenseQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 					operation,
 					typeSchemas: type.schemas,
 					zodSchemas: zod.schemas,
-					dataReturnType: options.client.dataReturnType,
+					dataReturnType: options.client.dataReturnType || "data",
 					paramsCasing: options.paramsCasing,
 					paramsType: options.paramsType,
 					pathParamsType: options.pathParamsType,
@@ -740,11 +823,6 @@ const suspenseQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 						path: importPath,
 						isTypeOnly: true
 					}),
-					options.client.dataReturnType === "full" && /* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(__kubb_react_fabric.File.Import, {
-						name: ["ResponseConfig"],
-						path: options.client.importPath,
-						isTypeOnly: true
-					}),
 					/* @__PURE__ */ (0, __kubb_react_fabric_jsx_runtime.jsx)(require_components.SuspenseQuery, {
 						name: query.name,
 						queryOptionsName: queryOptions.name,
@@ -753,7 +831,7 @@ const suspenseQueryGenerator = (0, __kubb_plugin_oas.createReactGenerator)({
 						paramsCasing: options.paramsCasing,
 						pathParamsType: options.pathParamsType,
 						operation,
-						dataReturnType: options.client.dataReturnType,
+						dataReturnType: options.client.dataReturnType || "data",
 						queryKeyName: queryKey.name,
 						queryKeyTypeName: queryKey.typeName
 					})
@@ -788,4 +866,4 @@ Object.defineProperty(exports, 'suspenseQueryGenerator', {
     return suspenseQueryGenerator;
   }
 });
-//# sourceMappingURL=generators-hTZEzfNP.cjs.map
+//# sourceMappingURL=generators-BIuKpozF.cjs.map