@kubb/plugin-react-query 4.4.0 → 4.5.0

package/dist/{generators-egdl4EOg.js → generators-BTb-fJYl.js}

@@ -1,55 +1,64 @@
-import { a as MutationKey, c as QueryOptions, i as MutationOptions, l as QueryKey, n as Query, o as InfiniteQueryOptions, r as Mutation, s as InfiniteQuery, t as SuspenseQuery } from "./components-CbVTS6aF.js";
-import { createReactGenerator } from "@kubb/plugin-oas";
+import { a as MutationKey, c as QueryOptions, i as MutationOptions, l as QueryKey, n as Query, o as InfiniteQueryOptions, r as Mutation, s as InfiniteQuery, t as SuspenseQuery } from "./components-By3fyxDp.js";
+import path from "node:path";
+import { pluginClientName } from "@kubb/plugin-client";
 import { pluginTsName } from "@kubb/plugin-ts";
 import { pluginZodName } from "@kubb/plugin-zod";
 import { getBanner, getFooter } from "@kubb/plugin-oas/utils";
 import { File } from "@kubb/react-fabric";
 import { Fragment, jsx, jsxs } from "@kubb/react-fabric/jsx-runtime";
 import { Client } from "@kubb/plugin-client/components";
-import { usePlugin, usePluginManager } from "@kubb/core/hooks";
-import { pluginClientName } from "@kubb/plugin-client";
+import { usePluginManager } from "@kubb/core/hooks";
+import { createReactGenerator } from "@kubb/plugin-oas/generators";
 import { useOas, useOperationManager } from "@kubb/plugin-oas/hooks";
 import { difference } from "remeda";
 
-//#region src/generators/queryGenerator.tsx
-const queryGenerator = createReactGenerator({
-	name: "react-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = usePlugin();
+//#region src/generators/infiniteQueryGenerator.tsx
+const infiniteQueryGenerator = createReactGenerator({
+	name: "react-infinite-query",
+	Operation({ config, operation, generator, plugin }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = usePluginManager();
 		const oas = useOas();
-		const { getSchemas, getName, getFile } = useOperationManager();
+		const { getSchemas, getName, getFile } = useOperationManager(generator);
 		const isQuery = typeof options.query === "boolean" ? true : options.query?.methods.some((method) => operation.method === method);
 		const isMutation = 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([pluginClientName]);
 		const client = {
 			name: hasClientPlugin ? getName(operation, {
 				type: "function",
 				pluginKey: [pluginClientName]
-			}) : getName(operation, { type: "function" }),
+			}) : getName(operation, {
+				type: "function",
+				suffix: "infinite"
+			}),
 			file: getFile(operation, { pluginKey: [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 = {
@@ -66,7 +75,15 @@ const queryGenerator = 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__ */ jsxs(File, {
 			baseName: query.file.baseName,
 			path: query.file.path,
@@ -86,25 +103,45 @@ const queryGenerator = createReactGenerator({
 					root: query.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				hasClientPlugin && /* @__PURE__ */ jsx(File.Import, {
 					name: [client.name],
 					root: query.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: ["RequestConfig", "ResponseErrorConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
-				options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
-					name: ["ResponseConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -122,9 +159,9 @@ const queryGenerator = 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__ */ jsx(Client, {
@@ -133,43 +170,52 @@ const queryGenerator = 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__ */ jsx(File.Import, {
-					name: ["queryOptions"],
-					path: importPath
-				}),
-				/* @__PURE__ */ jsx(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__ */ jsxs(Fragment, { children: [
+				infiniteOptions && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
-						name: ["useQuery"],
+						name: ["InfiniteData"],
+						isTypeOnly: true,
+						path: importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["infiniteQueryOptions"],
+						path: importPath
+					}),
+					/* @__PURE__ */ jsx(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__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["useInfiniteQuery"],
 						path: importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
 							"QueryKey",
 							"QueryClient",
-							"QueryObserverOptions",
-							"UseQueryResult",
-							"QueryClient"
+							"InfiniteQueryObserverOptions",
+							"UseInfiniteQueryResult"
 						],
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ jsx(Query, {
+					/* @__PURE__ */ jsx(InfiniteQuery, {
 						name: query.name,
 						queryOptionsName: queryOptions.name,
 						typeSchemas: type.schemas,
@@ -177,9 +223,11 @@ const queryGenerator = 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
 					})
 				] })
 			]
@@ -191,11 +239,11 @@ const queryGenerator = createReactGenerator({
 //#region src/generators/mutationGenerator.tsx
 const mutationGenerator = createReactGenerator({
 	name: "react-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = usePlugin();
+	Operation({ config, plugin, operation, generator }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = usePluginManager();
 		const oas = useOas();
-		const { getSchemas, getName, getFile } = useOperationManager();
+		const { getSchemas, getName, getFile } = useOperationManager(generator);
 		const isMutation = !(!!options.query && options.query?.methods.some((method) => operation.method === method)) && 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 = {
@@ -262,24 +310,45 @@ const mutationGenerator = createReactGenerator({
 					root: mutation.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						root: mutation.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: mutation.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						root: mutation.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				!!hasClientPlugin && /* @__PURE__ */ jsx(File.Import, {
 					name: [client.name],
 					root: mutation.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: [
-						"RequestConfig",
-						"ResponseConfig",
-						"ResponseErrorConfig"
-					],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -308,7 +377,7 @@ const mutationGenerator = 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,
@@ -326,7 +395,7 @@ const mutationGenerator = createReactGenerator({
 					paramsCasing: options.paramsCasing,
 					paramsType: options.paramsType,
 					pathParamsType: options.pathParamsType,
-					dataReturnType: options.client.dataReturnType
+					dataReturnType: options.client.dataReturnType || "data"
 				}),
 				options.mutation && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
@@ -348,7 +417,7 @@ const mutationGenerator = 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
@@ -360,53 +429,45 @@ const mutationGenerator = createReactGenerator({
 });
 
 //#endregion
-//#region src/generators/infiniteQueryGenerator.tsx
-const infiniteQueryGenerator = createReactGenerator({
-	name: "react-infinite-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = usePlugin();
+//#region src/generators/queryGenerator.tsx
+const queryGenerator = createReactGenerator({
+	name: "react-query",
+	Operation({ config, plugin, operation, generator }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = usePluginManager();
 		const oas = useOas();
-		const { getSchemas, getName, getFile } = useOperationManager();
+		const { getSchemas, getName, getFile } = useOperationManager(generator);
 		const isQuery = typeof options.query === "boolean" ? true : options.query?.methods.some((method) => operation.method === method);
 		const isMutation = 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([pluginClientName]);
 		const client = {
 			name: hasClientPlugin ? getName(operation, {
 				type: "function",
 				pluginKey: [pluginClientName]
-			}) : getName(operation, {
-				type: "function",
-				suffix: "infinite"
-			}),
+			}) : getName(operation, { type: "function" }),
 			file: getFile(operation, { pluginKey: [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 = {
@@ -423,15 +484,7 @@ const infiniteQueryGenerator = 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__ */ jsxs(File, {
 			baseName: query.file.baseName,
 			path: query.file.path,
@@ -451,25 +504,45 @@ const infiniteQueryGenerator = createReactGenerator({
 					root: query.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				hasClientPlugin && /* @__PURE__ */ jsx(File.Import, {
 					name: [client.name],
 					root: query.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: ["RequestConfig", "ResponseErrorConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
-				options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
-					name: ["ResponseConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -487,9 +560,9 @@ const infiniteQueryGenerator = 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__ */ jsx(Client, {
@@ -498,52 +571,43 @@ const infiniteQueryGenerator = 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__ */ jsxs(Fragment, { children: [
-					/* @__PURE__ */ jsx(File.Import, {
-						name: ["InfiniteData"],
-						isTypeOnly: true,
-						path: importPath
-					}),
-					/* @__PURE__ */ jsx(File.Import, {
-						name: ["infiniteQueryOptions"],
-						path: importPath
-					}),
-					/* @__PURE__ */ jsx(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__ */ jsxs(Fragment, { children: [
+				/* @__PURE__ */ jsx(File.Import, {
+					name: ["queryOptions"],
+					path: importPath
+				}),
+				/* @__PURE__ */ jsx(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__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
-						name: ["useInfiniteQuery"],
+						name: ["useQuery"],
 						path: importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
 							"QueryKey",
 							"QueryClient",
-							"InfiniteQueryObserverOptions",
-							"UseInfiniteQueryResult"
+							"QueryObserverOptions",
+							"UseQueryResult",
+							"QueryClient"
 						],
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ jsx(InfiniteQuery, {
+					/* @__PURE__ */ jsx(Query, {
 						name: query.name,
 						queryOptionsName: queryOptions.name,
 						typeSchemas: type.schemas,
@@ -551,11 +615,9 @@ const infiniteQueryGenerator = 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
 					})
 				] })
 			]
@@ -567,11 +629,11 @@ const infiniteQueryGenerator = createReactGenerator({
 //#region src/generators/suspenseQueryGenerator.tsx
 const suspenseQueryGenerator = createReactGenerator({
 	name: "react-suspense-query",
-	Operation({ options, operation }) {
-		const { options: { output } } = usePlugin();
+	Operation({ config, operation, generator, plugin }) {
+		const { options, options: { output } } = plugin;
 		const pluginManager = usePluginManager();
 		const oas = useOas();
-		const { getSchemas, getName, getFile } = useOperationManager();
+		const { getSchemas, getName, getFile } = useOperationManager(generator);
 		const isQuery = typeof options.query === "boolean" ? true : options.query?.methods.some((method) => operation.method === method);
 		const isMutation = difference(options.mutation ? options.mutation.methods : [], options.query ? options.query.methods : []).some((method) => operation.method === method);
 		const isSuspense = !!options.suspense;
@@ -647,25 +709,45 @@ const suspenseQueryGenerator = createReactGenerator({
 					root: query.file.path,
 					path: zod.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: "fetch",
-					path: options.client.importPath
-				}),
+				options.client.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						path: options.client.importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						path: options.client.importPath,
+						isTypeOnly: true
+					})
+				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: "fetch",
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts")
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["RequestConfig", "ResponseErrorConfig"],
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					}),
+					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
+						name: ["ResponseConfig"],
+						root: query.file.path,
+						path: path.resolve(config.root, config.output.path, ".kubb/fetcher.ts"),
+						isTypeOnly: true
+					})
+				] }),
 				hasClientPlugin && /* @__PURE__ */ jsx(File.Import, {
 					name: [client.name],
 					root: query.file.path,
 					path: client.file.path
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: ["RequestConfig", "ResponseErrorConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
-				options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
-					name: ["ResponseConfig"],
-					path: options.client.importPath,
-					isTypeOnly: true
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [
 						type.schemas.request?.name,
@@ -694,7 +776,7 @@ const suspenseQueryGenerator = 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,
@@ -729,11 +811,6 @@ const suspenseQueryGenerator = createReactGenerator({
 						path: importPath,
 						isTypeOnly: true
 					}),
-					options.client.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
-						name: ["ResponseConfig"],
-						path: options.client.importPath,
-						isTypeOnly: true
-					}),
 					/* @__PURE__ */ jsx(SuspenseQuery, {
 						name: query.name,
 						queryOptionsName: queryOptions.name,
@@ -742,7 +819,7 @@ const suspenseQueryGenerator = createReactGenerator({
 						paramsCasing: options.paramsCasing,
 						pathParamsType: options.pathParamsType,
 						operation,
-						dataReturnType: options.client.dataReturnType,
+						dataReturnType: options.client.dataReturnType || "data",
 						queryKeyName: queryKey.name,
 						queryKeyTypeName: queryKey.typeName
 					})
@@ -753,5 +830,5 @@ const suspenseQueryGenerator = createReactGenerator({
 });
 
 //#endregion
-export { queryGenerator as i, infiniteQueryGenerator as n, mutationGenerator as r, suspenseQueryGenerator as t };
-//# sourceMappingURL=generators-egdl4EOg.js.map
+export { infiniteQueryGenerator as i, queryGenerator as n, mutationGenerator as r, suspenseQueryGenerator as t };
+//# sourceMappingURL=generators-BTb-fJYl.js.map