@kubb/plugin-react-query 5.0.0-beta.3 → 5.0.0-beta.31

package/dist/{generators-C_fbcjpG.js → generators-BFn9CLBS.js}

@@ -1,30 +1,37 @@
 import "./chunk--u3MIqq1.js";
-import { a as Mutation, c as InfiniteQuery, d as transformName, f as QueryKey, i as Query, l as QueryOptions, n as SuspenseInfiniteQueryOptions, o as MutationOptions, p as MutationKey, r as SuspenseInfiniteQuery, s as InfiniteQueryOptions, t as SuspenseQuery, u as resolveOperationOverrides } from "./components-DTGLu4UV.js";
+import { _ as operationFileEntry, a as Mutation, c as InfiniteQuery, f as resolveOperationOverrides, g as getOperationParameters, i as Query, l as QueryOptions, m as MutationKey, n as SuspenseInfiniteQueryOptions, o as MutationOptions, p as resolveZodSchemaNames, r as SuspenseInfiniteQuery, s as InfiniteQueryOptions, t as SuspenseQuery, u as QueryKey, v as resolveOperationTypeNames } from "./components-BVmVgpLX.js";
 import path from "node:path";
 import { ast, defineGenerator } from "@kubb/core";
 import { Client, pluginClientName } from "@kubb/plugin-client";
 import { pluginTsName } from "@kubb/plugin-ts";
 import { pluginZodName } from "@kubb/plugin-zod";
-import { File, Function, Type, jsxRenderer } from "@kubb/renderer-jsx";
+import { File, Function, Type, jsxRendererSync } from "@kubb/renderer-jsx";
 import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
 import fs from "node:fs";
 import { difference } from "remeda";
 //#region src/generators/customHookOptionsFileGenerator.tsx
+/**
+* Scaffolds the user-editable `useCustomHookOptions` file when
+* `pluginReactQuery({ customOptions: { ... } })` is configured. The file is
+* only created when it does not already exist, so user edits persist across
+* regeneration.
+*/
 const customHookOptionsFileGenerator = defineGenerator({
 	name: "react-query-custom-hook-options-file",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
 		const { resolver, config, root } = ctx;
-		const { output, customOptions, query, group, transformers } = ctx.options;
+		const { output, customOptions, query, group } = ctx.options;
 		if (!customOptions) return null;
 		const override = output.override ?? config.output.override ?? false;
 		const { importPath, name } = customOptions;
+		const hookOptionsName = resolver.resolveHookOptionsName();
+		const customHookOptionsName = resolver.resolveCustomHookOptionsName();
 		const reactQueryImportPath = query ? query.importPath : "@tanstack/react-query";
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
 		let hookFilePath;
 		const firstNode = nodes[0];
 		if (firstNode) {
-			const hookName = transformName(`use${capitalize(resolver.resolveName(firstNode.operationId))}`, "function", transformers);
+			const hookName = resolver.resolveQueryName(firstNode);
 			hookFilePath = resolver.resolveFile({
 				name: hookName,
 				extname: ".ts",
@@ -33,7 +40,7 @@ const customHookOptionsFileGenerator = defineGenerator({
 			}, {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}).path;
 		} else hookFilePath = path.resolve(root, "index.ts");
 		const ensureExtension = (filePath, extname) => {
@@ -62,7 +69,7 @@ const customHookOptionsFileGenerator = defineGenerator({
 					path: reactQueryImportPath
 				}),
 				/* @__PURE__ */ jsx(File.Import, {
-					name: ["HookOptions"],
+					name: [hookOptionsName],
 					root: file.path,
 					path: path.resolve(root, "./index.ts")
 				}),
@@ -71,9 +78,9 @@ const customHookOptionsFileGenerator = defineGenerator({
 					isExportable: true,
 					isIndexable: true,
 					children: [/* @__PURE__ */ jsx(Function, {
-						name: "getCustomHookOptions",
+						name: customHookOptionsName,
 						params: "{ queryClient }: { queryClient: QueryClient }",
-						returnType: "Partial<HookOptions>",
+						returnType: `Partial<${hookOptionsName}>`,
 						children: `return {
               // TODO: Define custom hook options here
               // Example:
@@ -85,12 +92,12 @@ const customHookOptionsFileGenerator = defineGenerator({
             }`
 					}), /* @__PURE__ */ jsx(Function, {
 						name,
-						generics: "T extends keyof HookOptions",
+						generics: `T extends keyof ${hookOptionsName}`,
 						params: "{ hookName, operationId }: { hookName: T, operationId: string }",
-						returnType: "HookOptions[T]",
+						returnType: `${hookOptionsName}[T]`,
 						export: true,
 						children: `const queryClient = useQueryClient()
-            const customOptions = getCustomHookOptions({ queryClient })
+            const customOptions = ${customHookOptionsName}({ queryClient })
             return customOptions[hookName] ?? {}`
 					})]
 				})
@@ -100,52 +107,53 @@ const customHookOptionsFileGenerator = defineGenerator({
 });
 //#endregion
 //#region src/generators/hookOptionsGenerator.tsx
+/**
+* Emits the `HookOptions` type used by `customOptions`. Enabled when
+* `pluginReactQuery({ customOptions: { ... } })`. The generated type lists
+* every hook keyed by name so user-supplied options stay in sync with the
+* generated hooks at compile time.
+*/
 const hookOptionsGenerator = defineGenerator({
 	name: "react-query-hook-options",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { resolver, config, root, adapter } = ctx;
-		const { output, customOptions, query, mutation, suspense, infinite, group, transformers, override } = ctx.options;
+		const { resolver, config, root } = ctx;
+		const { output, customOptions, query, mutation, suspense, infinite, group, override } = ctx.options;
 		if (!customOptions) return null;
+		const name = resolver.resolveHookOptionsName();
 		const resolvedFile = resolver.resolveFile({
-			name: "HookOptions",
+			name,
 			extname: ".ts"
 		}, {
 			root,
 			output,
-			group
+			group: group ?? void 0
 		});
 		const hookOptionsFile = {
 			...resolvedFile,
-			baseName: "HookOptions.ts",
-			path: resolvedFile.path.replace(/hookOptions\.ts$/, "HookOptions.ts")
+			baseName: `${name}.ts`,
+			path: resolvedFile.path.replace(/[^/\\]+\.ts$/, `${name}.ts`)
 		};
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
 		const imports = [];
 		const hookOptions = {};
 		for (const node of nodes) {
-			const baseName = resolver.resolveName(node.operationId);
+			if (!ast.isHttpOperationNode(node)) continue;
 			const opOverrides = resolveOperationOverrides(node, override);
 			const nodeQuery = "query" in opOverrides ? opOverrides.query : query;
 			const nodeMutation = "mutation" in opOverrides ? opOverrides.mutation : mutation;
 			const nodeInfinite = "infinite" in opOverrides ? opOverrides.infinite : infinite;
-			const nodeInfiniteOptions = nodeInfinite && typeof nodeInfinite === "object" ? nodeInfinite : void 0;
+			const nodeInfiniteOptions = nodeInfinite && typeof nodeInfinite === "object" ? nodeInfinite : null;
 			const isQueryOp = nodeQuery === false ? !!query && query.methods.some((m) => node.method.toLowerCase() === m.toLowerCase()) : !!nodeQuery && nodeQuery.methods.some((m) => node.method.toLowerCase() === m.toLowerCase());
 			const isMutationOp = nodeMutation !== false && !isQueryOp && difference(nodeMutation ? nodeMutation.methods : [], nodeQuery ? nodeQuery.methods : []).some((m) => node.method.toLowerCase() === m.toLowerCase());
 			const isSuspenseOp = !!suspense;
 			const isInfiniteOp = !!nodeInfiniteOptions;
 			if (isQueryOp) {
-				const queryOptionsName = transformName(`${baseName}QueryOptions`, "function", transformers);
-				const queryHookName = transformName(`use${capitalize(baseName)}`, "function", transformers);
-				const queryHookFile = resolver.resolveFile({
-					name: queryHookName,
-					extname: ".ts",
-					tag: node.tags[0] ?? "default",
-					path: node.path
-				}, {
+				const queryOptionsName = resolver.resolveQueryOptionsName(node);
+				const queryHookName = resolver.resolveQueryName(node);
+				const queryHookFile = resolver.resolveFile(operationFileEntry(node, queryHookName), {
 					root,
 					output,
-					group
+					group: group ?? void 0
 				});
 				imports.push(/* @__PURE__ */ jsx(File.Import, {
 					name: [queryOptionsName],
@@ -154,17 +162,12 @@ const hookOptionsGenerator = defineGenerator({
 				}));
 				hookOptions[queryHookName] = `Partial<ReturnType<typeof ${queryOptionsName}>>`;
 				if (isSuspenseOp) {
-					const suspenseOptionsName = transformName(`${baseName}SuspenseQueryOptions`, "function", transformers);
-					const suspenseHookName = transformName(`use${capitalize(baseName)}Suspense`, "function", transformers);
-					const suspenseHookFile = resolver.resolveFile({
-						name: suspenseHookName,
-						extname: ".ts",
-						tag: node.tags[0] ?? "default",
-						path: node.path
-					}, {
+					const suspenseOptionsName = resolver.resolveSuspenseQueryOptionsName(node);
+					const suspenseHookName = resolver.resolveSuspenseQueryName(node);
+					const suspenseHookFile = resolver.resolveFile(operationFileEntry(node, suspenseHookName), {
 						root,
 						output,
-						group
+						group: group ?? void 0
 					});
 					imports.push(/* @__PURE__ */ jsx(File.Import, {
 						name: [suspenseOptionsName],
@@ -175,19 +178,14 @@ const hookOptionsGenerator = defineGenerator({
 				}
 				if (isInfiniteOp) {
 					const normalizeKey = (key) => key.replace(/\?$/, "");
-					const queryParamKeys = node.parameters.filter((p) => p.in === "query").map((p) => p.name);
+					const queryParamKeys = getOperationParameters(node).query.map((p) => p.name);
 					if (nodeInfiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === nodeInfiniteOptions.queryParam) : false) {
-						const infiniteOptionsName = transformName(`${baseName}InfiniteQueryOptions`, "function", transformers);
-						const infiniteHookName = transformName(`use${capitalize(baseName)}Infinite`, "function", transformers);
-						const infiniteHookFile = resolver.resolveFile({
-							name: infiniteHookName,
-							extname: ".ts",
-							tag: node.tags[0] ?? "default",
-							path: node.path
-						}, {
+						const infiniteOptionsName = resolver.resolveInfiniteQueryOptionsName(node);
+						const infiniteHookName = resolver.resolveInfiniteQueryName(node);
+						const infiniteHookFile = resolver.resolveFile(operationFileEntry(node, infiniteHookName), {
 							root,
 							output,
-							group
+							group: group ?? void 0
 						});
 						imports.push(/* @__PURE__ */ jsx(File.Import, {
 							name: [infiniteOptionsName],
@@ -196,17 +194,12 @@ const hookOptionsGenerator = defineGenerator({
 						}));
 						hookOptions[infiniteHookName] = `Partial<ReturnType<typeof ${infiniteOptionsName}>>`;
 						if (isSuspenseOp) {
-							const suspenseInfiniteOptionsName = transformName(`${baseName}SuspenseInfiniteQueryOptions`, "function", transformers);
-							const suspenseInfiniteHookName = transformName(`use${capitalize(baseName)}SuspenseInfinite`, "function", transformers);
-							const suspenseInfiniteHookFile = resolver.resolveFile({
-								name: suspenseInfiniteHookName,
-								extname: ".ts",
-								tag: node.tags[0] ?? "default",
-								path: node.path
-							}, {
+							const suspenseInfiniteOptionsName = resolver.resolveSuspenseInfiniteQueryOptionsName(node);
+							const suspenseInfiniteHookName = resolver.resolveSuspenseInfiniteQueryName(node);
+							const suspenseInfiniteHookFile = resolver.resolveFile(operationFileEntry(node, suspenseInfiniteHookName), {
 								root,
 								output,
-								group
+								group: group ?? void 0
 							});
 							imports.push(/* @__PURE__ */ jsx(File.Import, {
 								name: [suspenseInfiniteOptionsName],
@@ -219,17 +212,12 @@ const hookOptionsGenerator = defineGenerator({
 				}
 			}
 			if (isMutationOp) {
-				const mutationOptionsName = transformName(`${baseName}MutationOptions`, "function", transformers);
-				const mutationHookName = transformName(`use${capitalize(baseName)}`, "function", transformers);
-				const mutationHookFile = resolver.resolveFile({
-					name: mutationHookName,
-					extname: ".ts",
-					tag: node.tags[0] ?? "default",
-					path: node.path
-				}, {
+				const mutationOptionsName = resolver.resolveMutationOptionsName(node);
+				const mutationHookName = resolver.resolveMutationName(node);
+				const mutationHookFile = resolver.resolveFile(operationFileEntry(node, mutationHookName), {
 					root,
 					output,
-					group
+					group: group ?? void 0
 				});
 				imports.push(/* @__PURE__ */ jsx(File.Import, {
 					name: [mutationOptionsName],
@@ -239,18 +227,25 @@ const hookOptionsGenerator = defineGenerator({
 				hookOptions[mutationHookName] = `Partial<ReturnType<typeof ${mutationOptionsName}>>`;
 			}
 		}
-		const name = "HookOptions";
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: hookOptionsFile.baseName,
 			path: hookOptionsFile.path,
 			meta: hookOptionsFile.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: hookOptionsFile.path,
+					baseName: hookOptionsFile.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: hookOptionsFile.path,
+					baseName: hookOptionsFile.baseName
+				}
 			}),
 			children: [imports, /* @__PURE__ */ jsx(File.Source, {
 				name,
@@ -268,114 +263,100 @@ const hookOptionsGenerator = defineGenerator({
 });
 //#endregion
 //#region src/generators/infiniteQueryGenerator.tsx
+/**
+* Built-in generator for `useInfiniteQuery` hooks. Enabled when
+* `pluginReactQuery({ infinite: { ... } })`. Emits one `useFooInfiniteQuery`
+* hook per query operation, wiring the configured `nextParam` /
+* `previousParam` paths into TanStack Query's cursor-based pagination.
+*/
 const infiniteQueryGenerator = defineGenerator({
 	name: "react-infinite-query",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, transformers, customOptions } = ctx.options;
+		if (!ast.isHttpOperationNode(node)) return null;
+		const { config, driver, resolver, root } = ctx;
+		const { output, query, mutation, infinite, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
 		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
 		const isMutation = mutation !== false && !isQuery && difference(mutation ? mutation.methods : [], query ? query.methods : []).some((method) => node.method.toLowerCase() === method.toLowerCase());
-		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : void 0;
+		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
 		if (!isQuery || isMutation || !infiniteOptions) return null;
 		const normalizeKey = (key) => key.replace(/\?$/, "");
-		const queryParamKeys = node.parameters.filter((p) => p.in === "query").map((p) => p.name);
+		const queryParamKeys = getOperationParameters(node).query.map((p) => p.name);
 		const hasQueryParam = infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false;
 		const hasCursorParam = !infiniteOptions.cursorParam || true;
 		if (!hasQueryParam || !hasCursorParam) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
-		const baseName = resolver.resolveName(node.operationId);
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-		const queryName = transformName(`use${capitalize(baseName)}Infinite`, "function", transformers);
-		const queryOptionsName = transformName(`${baseName}InfiniteQueryOptions`, "function", transformers);
-		const queryKeyName = transformName(`${baseName}InfiniteQueryKey`, "const", transformers);
-		const queryKeyTypeName = transformName(`${capitalize(baseName)}InfiniteQueryKey`, "type", transformers);
-		const clientBaseName = transformName(`${baseName}Infinite`, "function", transformers);
+		const queryName = resolver.resolveInfiniteQueryName(node);
+		const queryOptionsName = resolver.resolveInfiniteQueryOptionsName(node);
+		const queryKeyName = resolver.resolveInfiniteQueryKeyName(node);
+		const queryKeyTypeName = resolver.resolveInfiniteQueryKeyTypeName(node);
+		const clientBaseName = resolver.resolveInfiniteClientName(node);
 		const meta = {
-			file: resolver.resolveFile({
-				name: queryName,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			file: resolver.resolveFile(operationFileEntry(node, queryName), {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile({
-				name: node.operationId,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
 				root,
 				output: pluginTs.options?.output ?? output,
-				group: pluginTs.options?.group
+				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		const casedParams = ast.caseParams(node.parameters, paramsCasing);
-		const pathParams = casedParams.filter((p) => p.in === "path");
-		const queryParams = casedParams.filter((p) => p.in === "query");
-		const headerParams = casedParams.filter((p) => p.in === "header");
-		const importedTypeNames = [
-			node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : void 0,
-			tsResolver.resolveResponseName(node),
-			...pathParams.map((p) => tsResolver.resolvePathParamsName(node, p)),
-			...queryParams.map((p) => tsResolver.resolveQueryParamsName(node, p)),
-			...headerParams.map((p) => tsResolver.resolveHeaderParamsName(node, p)),
-			...node.responses.map((res) => tsResolver.resolveResponseStatusName(node, res.statusCode))
-		].filter((name) => !!name && name !== queryKeyTypeName);
-		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : void 0;
-		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
-		const fileZod = zodResolver ? zodResolver.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const importedTypeNames = resolveOperationTypeNames(node, tsResolver, {
+			paramsCasing,
+			exclude: [queryKeyTypeName],
+			order: "body-response-first"
+		});
+		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : null;
+		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
+		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group
-		}) : void 0;
-		const zodSchemaNames = zodResolver && parser === "zod" ? [zodResolver.resolveResponseName?.(node), node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : void 0].filter(Boolean) : [];
+			group: pluginZod?.options?.group ?? void 0
+		}) : null;
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver);
 		const clientPlugin = driver.getPlugin(pluginClientName);
 		const shouldUseClientPlugin = clientPlugin?.name === pluginClientName && clientOptions.clientType !== "class";
-		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : void 0;
-		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : null;
+		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: clientPlugin?.options?.output ?? output,
-			group: clientPlugin?.options?.group
-		}) : void 0;
+			group: clientPlugin?.options?.group ?? void 0
+		}) : null;
 		const resolvedClientName = shouldUseClientPlugin ? clientResolver?.resolveName(node.operationId) ?? clientBaseName : clientBaseName;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			children: [
-				parser === "zod" && fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
+				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
 					name: zodSchemaNames,
 					root: meta.file.path,
 					path: fileZod.path
 				}),
 				clientOptions.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: "fetch",
+						name: "client",
 						path: clientOptions.importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
@@ -394,9 +375,9 @@ const infiniteQueryGenerator = defineGenerator({
 					})
 				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: ["fetch"],
+						name: ["client"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts")
+						path: path.resolve(root, ".kubb/client.ts")
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
@@ -405,13 +386,13 @@ const infiniteQueryGenerator = defineGenerator({
 							"ResponseErrorConfig"
 						],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					}),
 					clientOptions.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
 						name: ["ResponseConfig"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					})
 				] }),
@@ -516,107 +497,91 @@ const infiniteQueryGenerator = defineGenerator({
 });
 //#endregion
 //#region src/generators/mutationGenerator.tsx
+/**
+* Built-in generator for `useMutation` hooks. Emits one `useFooMutation` hook
+* per POST/PUT/DELETE operation (configurable via `mutation.methods`) plus
+* the matching `fooMutationKey` / `fooMutationOptions` helpers.
+*/
 const mutationGenerator = defineGenerator({
 	name: "react-query-mutation",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
-		const { output, query, mutation, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, transformers, customOptions } = ctx.options;
+		if (!ast.isHttpOperationNode(node)) return null;
+		const { config, driver, resolver, root } = ctx;
+		const { output, query, mutation, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
 		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
 		if (!(mutation !== false && !isQuery && difference(mutation ? mutation.methods : [], query ? query.methods : []).some((method) => node.method.toLowerCase() === method.toLowerCase()))) return null;
 		const importPath = mutation ? mutation.importPath : "@tanstack/react-query";
-		const baseName = resolver.resolveName(node.operationId);
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-		const mutationHookName = transformName(`use${capitalize(baseName)}`, "function", transformers);
-		const mutationTypeName = transformName(`${capitalize(baseName)}`, "type", transformers);
-		const mutationOptionsName = transformName(`${baseName}MutationOptions`, "function", transformers);
-		const mutationKeyName = transformName(`${baseName}MutationKey`, "const", transformers);
-		const clientName = transformName(baseName, "function", transformers);
+		const mutationHookName = resolver.resolveMutationName(node);
+		const mutationTypeName = resolver.resolveMutationTypeName(node);
+		const mutationOptionsName = resolver.resolveMutationOptionsName(node);
+		const mutationKeyName = resolver.resolveMutationKeyName(node);
+		const clientName = resolver.resolveClientName(node);
 		const meta = {
-			file: resolver.resolveFile({
-				name: mutationHookName,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			file: resolver.resolveFile(operationFileEntry(node, mutationHookName), {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile({
-				name: node.operationId,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
 				root,
 				output: pluginTs.options?.output ?? output,
-				group: pluginTs.options?.group
+				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		const casedParams = ast.caseParams(node.parameters, paramsCasing);
-		const pathParams = casedParams.filter((p) => p.in === "path");
-		const queryParams = casedParams.filter((p) => p.in === "query");
-		const headerParams = casedParams.filter((p) => p.in === "header");
-		const importedTypeNames = [
-			node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : void 0,
-			tsResolver.resolveResponseName(node),
-			...pathParams.map((p) => tsResolver.resolvePathParamsName(node, p)),
-			...queryParams.map((p) => tsResolver.resolveQueryParamsName(node, p)),
-			...headerParams.map((p) => tsResolver.resolveHeaderParamsName(node, p)),
-			...node.responses.map((res) => tsResolver.resolveResponseStatusName(node, res.statusCode))
-		].filter((name) => !!name);
-		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : void 0;
-		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
-		const fileZod = zodResolver ? zodResolver.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const importedTypeNames = resolveOperationTypeNames(node, tsResolver, {
+			paramsCasing,
+			order: "body-response-first"
+		});
+		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : null;
+		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
+		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group
-		}) : void 0;
-		const zodSchemaNames = zodResolver && parser === "zod" ? [zodResolver.resolveResponseName?.(node), node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : void 0].filter(Boolean) : [];
+			group: pluginZod?.options?.group ?? void 0
+		}) : null;
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver);
 		const clientPlugin = driver.getPlugin(pluginClientName);
 		const shouldUseClientPlugin = clientPlugin?.name === pluginClientName && clientOptions.clientType !== "class";
-		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : void 0;
-		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : null;
+		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: clientPlugin?.options?.output ?? output,
-			group: clientPlugin?.options?.group
-		}) : void 0;
+			group: clientPlugin?.options?.group ?? void 0
+		}) : null;
 		const resolvedClientName = shouldUseClientPlugin ? clientResolver?.resolveName(node.operationId) ?? clientName : clientName;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			children: [
-				parser === "zod" && fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
+				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
 					name: zodSchemaNames,
 					root: meta.file.path,
 					path: fileZod.path
 				}),
 				clientOptions.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: "fetch",
+						name: "client",
 						path: clientOptions.importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
@@ -635,9 +600,9 @@ const mutationGenerator = defineGenerator({
 					})
 				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: ["fetch"],
+						name: ["client"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts")
+						path: path.resolve(root, ".kubb/client.ts")
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
@@ -646,13 +611,13 @@ const mutationGenerator = defineGenerator({
 							"ResponseErrorConfig"
 						],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					}),
 					clientOptions.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
 						name: ["ResponseConfig"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					})
 				] }),
@@ -661,7 +626,7 @@ const mutationGenerator = defineGenerator({
 					root: meta.file.path,
 					path: clientFile.path
 				}),
-				!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
+				!shouldUseClientPlugin && node.requestBody?.content?.some((e) => e.contentType === "multipart/form-data") && /* @__PURE__ */ jsx(File.Import, {
 					name: ["buildFormData"],
 					root: meta.file.path,
 					path: path.resolve(root, ".kubb/config.ts")
@@ -743,12 +708,18 @@ const mutationGenerator = defineGenerator({
 });
 //#endregion
 //#region src/generators/queryGenerator.tsx
+/**
+* Built-in generator for `useQuery` hooks. Emits one `useFooQuery` hook per
+* GET operation (configurable via `query.methods`) plus the matching
+* `fooQueryKey` / `fooQueryOptions` helpers.
+*/
 const queryGenerator = defineGenerator({
 	name: "react-query",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
-		const { output, query, mutation, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, transformers, customOptions } = ctx.options;
+		if (!ast.isHttpOperationNode(node)) return null;
+		const { config, driver, resolver, root } = ctx;
+		const { output, query, mutation, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -756,95 +727,74 @@ const queryGenerator = defineGenerator({
 		const isMutation = mutation !== false && !isQuery && difference(mutation ? mutation.methods : [], query ? query.methods : []).some((method) => node.method.toLowerCase() === method.toLowerCase());
 		if (!isQuery || isMutation) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
-		const baseName = resolver.resolveName(node.operationId);
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-		const queryName = transformName(`use${capitalize(baseName)}`, "function", transformers);
-		const queryOptionsName = transformName(`${baseName}QueryOptions`, "function", transformers);
-		const queryKeyName = transformName(`${baseName}QueryKey`, "const", transformers);
-		const queryKeyTypeName = transformName(`${capitalize(baseName)}QueryKey`, "type", transformers);
-		const clientName = transformName(baseName, "function", transformers);
+		const queryName = resolver.resolveQueryName(node);
+		const queryOptionsName = resolver.resolveQueryOptionsName(node);
+		const queryKeyName = resolver.resolveQueryKeyName(node);
+		const queryKeyTypeName = resolver.resolveQueryKeyTypeName(node);
+		const clientName = resolver.resolveClientName(node);
 		const meta = {
-			file: resolver.resolveFile({
-				name: queryName,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			file: resolver.resolveFile(operationFileEntry(node, queryName), {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile({
-				name: node.operationId,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
 				root,
 				output: pluginTs.options?.output ?? output,
-				group: pluginTs.options?.group
+				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		const casedParams = ast.caseParams(node.parameters, paramsCasing);
-		const pathParams = casedParams.filter((p) => p.in === "path");
-		const queryParams = casedParams.filter((p) => p.in === "query");
-		const headerParams = casedParams.filter((p) => p.in === "header");
-		const importedTypeNames = [
-			node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : void 0,
-			tsResolver.resolveResponseName(node),
-			...pathParams.map((p) => tsResolver.resolvePathParamsName(node, p)),
-			...queryParams.map((p) => tsResolver.resolveQueryParamsName(node, p)),
-			...headerParams.map((p) => tsResolver.resolveHeaderParamsName(node, p)),
-			...node.responses.map((res) => tsResolver.resolveResponseStatusName(node, res.statusCode))
-		].filter((name) => !!name && name !== queryKeyTypeName);
-		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : void 0;
-		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
-		const fileZod = zodResolver ? zodResolver.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const importedTypeNames = resolveOperationTypeNames(node, tsResolver, {
+			paramsCasing,
+			exclude: [queryKeyTypeName],
+			order: "body-response-first"
+		});
+		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : null;
+		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
+		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group
-		}) : void 0;
-		const zodSchemaNames = zodResolver && parser === "zod" ? [zodResolver.resolveResponseName?.(node), node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : void 0].filter(Boolean) : [];
+			group: pluginZod?.options?.group ?? void 0
+		}) : null;
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver);
 		const clientPlugin = driver.getPlugin(pluginClientName);
 		const shouldUseClientPlugin = clientPlugin?.name === pluginClientName && clientOptions.clientType !== "class";
-		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : void 0;
-		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : null;
+		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: clientPlugin?.options?.output ?? output,
-			group: clientPlugin?.options?.group
-		}) : void 0;
+			group: clientPlugin?.options?.group ?? void 0
+		}) : null;
 		const resolvedClientName = shouldUseClientPlugin ? clientResolver?.resolveName(node.operationId) ?? clientName : clientName;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			children: [
-				parser === "zod" && fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
+				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
 					name: zodSchemaNames,
 					root: meta.file.path,
 					path: fileZod.path
 				}),
 				clientOptions.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: "fetch",
+						name: "client",
 						path: clientOptions.importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
@@ -863,9 +813,9 @@ const queryGenerator = defineGenerator({
 					})
 				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: ["fetch"],
+						name: ["client"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts")
+						path: path.resolve(root, ".kubb/client.ts")
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
@@ -874,13 +824,13 @@ const queryGenerator = defineGenerator({
 							"ResponseErrorConfig"
 						],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					}),
 					clientOptions.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
 						name: ["ResponseConfig"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					})
 				] }),
@@ -975,115 +925,100 @@ const queryGenerator = defineGenerator({
 });
 //#endregion
 //#region src/generators/suspenseInfiniteQueryGenerator.tsx
+/**
+* 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
+* additional pages on demand.
+*/
 const suspenseInfiniteQueryGenerator = defineGenerator({
 	name: "react-suspense-infinite-query",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, suspense, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, transformers, customOptions } = ctx.options;
+		if (!ast.isHttpOperationNode(node)) return null;
+		const { config, driver, resolver, root } = ctx;
+		const { output, query, mutation, infinite, suspense, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
 		const isQuery = query === false || !!query && query.methods.some((method) => node.method.toLowerCase() === method.toLowerCase());
 		const isMutation = mutation !== false && !isQuery && difference(mutation ? mutation.methods : [], query ? query.methods : []).some((method) => node.method.toLowerCase() === method.toLowerCase());
 		const isSuspense = !!suspense;
-		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : void 0;
+		const infiniteOptions = infinite && typeof infinite === "object" ? infinite : null;
 		if (!isQuery || isMutation || !isSuspense || !infiniteOptions) return null;
 		const normalizeKey = (key) => key.replace(/\?$/, "");
-		const queryParamKeys = node.parameters.filter((p) => p.in === "query").map((p) => p.name);
+		const queryParamKeys = getOperationParameters(node).query.map((p) => p.name);
 		const hasQueryParam = infiniteOptions.queryParam ? queryParamKeys.some((k) => normalizeKey(k) === infiniteOptions.queryParam) : false;
 		const hasCursorParam = !infiniteOptions.cursorParam || true;
 		if (!hasQueryParam || !hasCursorParam) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
-		const baseName = resolver.resolveName(node.operationId);
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-		const queryName = transformName(`use${capitalize(baseName)}SuspenseInfinite`, "function", transformers);
-		const queryOptionsName = transformName(`${baseName}SuspenseInfiniteQueryOptions`, "function", transformers);
-		const queryKeyName = transformName(`${baseName}SuspenseInfiniteQueryKey`, "const", transformers);
-		const queryKeyTypeName = transformName(`${capitalize(baseName)}SuspenseInfiniteQueryKey`, "type", transformers);
-		const clientBaseName = transformName(`${baseName}SuspenseInfinite`, "function", transformers);
+		const queryName = resolver.resolveSuspenseInfiniteQueryName(node);
+		const queryOptionsName = resolver.resolveSuspenseInfiniteQueryOptionsName(node);
+		const queryKeyName = resolver.resolveSuspenseInfiniteQueryKeyName(node);
+		const queryKeyTypeName = resolver.resolveSuspenseInfiniteQueryKeyTypeName(node);
+		const clientBaseName = resolver.resolveSuspenseInfiniteClientName(node);
 		const meta = {
-			file: resolver.resolveFile({
-				name: queryName,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			file: resolver.resolveFile(operationFileEntry(node, queryName), {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile({
-				name: node.operationId,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
 				root,
 				output: pluginTs.options?.output ?? output,
-				group: pluginTs.options?.group
+				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		const casedParams = ast.caseParams(node.parameters, paramsCasing);
-		const pathParams = casedParams.filter((p) => p.in === "path");
-		const queryParams = casedParams.filter((p) => p.in === "query");
-		const headerParams = casedParams.filter((p) => p.in === "header");
-		const importedTypeNames = [
-			node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : void 0,
-			tsResolver.resolveResponseName(node),
-			...pathParams.map((p) => tsResolver.resolvePathParamsName(node, p)),
-			...queryParams.map((p) => tsResolver.resolveQueryParamsName(node, p)),
-			...headerParams.map((p) => tsResolver.resolveHeaderParamsName(node, p)),
-			...node.responses.map((res) => tsResolver.resolveResponseStatusName(node, res.statusCode))
-		].filter(Boolean);
-		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : void 0;
-		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
-		const fileZod = zodResolver ? zodResolver.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const importedTypeNames = resolveOperationTypeNames(node, tsResolver, {
+			paramsCasing,
+			order: "body-response-first"
+		});
+		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : null;
+		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
+		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group
-		}) : void 0;
-		const zodSchemaNames = zodResolver && parser === "zod" ? [zodResolver.resolveResponseName?.(node), node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : void 0].filter(Boolean) : [];
+			group: pluginZod?.options?.group ?? void 0
+		}) : null;
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver);
 		const clientPlugin = driver.getPlugin(pluginClientName);
 		const shouldUseClientPlugin = clientPlugin?.name === pluginClientName && clientOptions.clientType !== "class";
-		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : void 0;
-		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : null;
+		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: clientPlugin?.options?.output ?? output,
-			group: clientPlugin?.options?.group
-		}) : void 0;
+			group: clientPlugin?.options?.group ?? void 0
+		}) : null;
 		const resolvedClientName = shouldUseClientPlugin ? clientResolver?.resolveName(node.operationId) ?? clientBaseName : clientBaseName;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			children: [
-				parser === "zod" && fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
+				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
 					name: zodSchemaNames,
 					root: meta.file.path,
 					path: fileZod.path
 				}),
 				clientOptions.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: "fetch",
+						name: "client",
 						path: clientOptions.importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
@@ -1102,9 +1037,9 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 					})
 				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: ["fetch"],
+						name: ["client"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts")
+						path: path.resolve(root, ".kubb/client.ts")
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
@@ -1113,13 +1048,13 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 							"ResponseErrorConfig"
 						],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					}),
 					clientOptions.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
 						name: ["ResponseConfig"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					})
 				] }),
@@ -1224,12 +1159,19 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 });
 //#endregion
 //#region src/generators/suspenseQueryGenerator.tsx
+/**
+* Built-in generator for `useSuspenseQuery` hooks. Enabled when
+* `pluginReactQuery({ suspense: {} })`. Emits one `useFooSuspenseQuery` hook
+* per query operation. Suspense queries throw promises while loading and
+* require a `<Suspense>` boundary in the React tree. TanStack Query v5+ only.
+*/
 const suspenseQueryGenerator = defineGenerator({
 	name: "react-suspense-query",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
-		const { output, query, mutation, suspense, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, transformers, customOptions } = ctx.options;
+		if (!ast.isHttpOperationNode(node)) return null;
+		const { config, driver, resolver, root } = ctx;
+		const { output, query, mutation, suspense, paramsCasing, paramsType, pathParamsType, parser, client: clientOptions, group, customOptions } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1237,95 +1179,74 @@ const suspenseQueryGenerator = defineGenerator({
 		const isMutation = mutation !== false && !isQuery && difference(mutation ? mutation.methods : [], query ? query.methods : []).some((method) => node.method.toLowerCase() === method.toLowerCase());
 		if (!isQuery || isMutation || !!!suspense) return null;
 		const importPath = query ? query.importPath : "@tanstack/react-query";
-		const baseName = resolver.resolveName(node.operationId);
-		const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-		const queryName = transformName(`use${capitalize(baseName)}Suspense`, "function", transformers);
-		const queryOptionsName = transformName(`${baseName}SuspenseQueryOptions`, "function", transformers);
-		const queryKeyName = transformName(`${baseName}SuspenseQueryKey`, "const", transformers);
-		const queryKeyTypeName = transformName(`${capitalize(baseName)}SuspenseQueryKey`, "type", transformers);
-		const clientName = transformName(`${baseName}Suspense`, "function", transformers);
+		const queryName = resolver.resolveSuspenseQueryName(node);
+		const queryOptionsName = resolver.resolveSuspenseQueryOptionsName(node);
+		const queryKeyName = resolver.resolveSuspenseQueryKeyName(node);
+		const queryKeyTypeName = resolver.resolveSuspenseQueryKeyTypeName(node);
+		const clientName = resolver.resolveSuspenseClientName(node);
 		const meta = {
-			file: resolver.resolveFile({
-				name: queryName,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			file: resolver.resolveFile(operationFileEntry(node, queryName), {
 				root,
 				output,
-				group
+				group: group ?? void 0
 			}),
-			fileTs: tsResolver.resolveFile({
-				name: node.operationId,
-				extname: ".ts",
-				tag: node.tags[0] ?? "default",
-				path: node.path
-			}, {
+			fileTs: tsResolver.resolveFile(operationFileEntry(node, node.operationId), {
 				root,
 				output: pluginTs.options?.output ?? output,
-				group: pluginTs.options?.group
+				group: pluginTs.options?.group ?? void 0
 			})
 		};
-		const casedParams = ast.caseParams(node.parameters, paramsCasing);
-		const pathParams = casedParams.filter((p) => p.in === "path");
-		const queryParams = casedParams.filter((p) => p.in === "query");
-		const headerParams = casedParams.filter((p) => p.in === "header");
-		const importedTypeNames = [
-			node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : void 0,
-			tsResolver.resolveResponseName(node),
-			...pathParams.map((p) => tsResolver.resolvePathParamsName(node, p)),
-			...queryParams.map((p) => tsResolver.resolveQueryParamsName(node, p)),
-			...headerParams.map((p) => tsResolver.resolveHeaderParamsName(node, p)),
-			...node.responses.map((res) => tsResolver.resolveResponseStatusName(node, res.statusCode))
-		].filter((name) => !!name && name !== queryKeyTypeName);
-		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : void 0;
-		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : void 0;
-		const fileZod = zodResolver ? zodResolver.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const importedTypeNames = resolveOperationTypeNames(node, tsResolver, {
+			paramsCasing,
+			exclude: [queryKeyTypeName],
+			order: "body-response-first"
+		});
+		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : null;
+		const zodResolver = pluginZod ? driver.getResolver(pluginZodName) : null;
+		const fileZod = zodResolver ? zodResolver.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: pluginZod?.options?.output ?? output,
-			group: pluginZod?.options?.group
-		}) : void 0;
-		const zodSchemaNames = zodResolver && parser === "zod" ? [zodResolver.resolveResponseName?.(node), node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : void 0].filter(Boolean) : [];
+			group: pluginZod?.options?.group ?? void 0
+		}) : null;
+		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver);
 		const clientPlugin = driver.getPlugin(pluginClientName);
 		const shouldUseClientPlugin = clientPlugin?.name === pluginClientName && clientOptions.clientType !== "class";
-		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : void 0;
-		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile({
-			name: node.operationId,
-			extname: ".ts",
-			tag: node.tags[0] ?? "default",
-			path: node.path
-		}, {
+		const clientResolver = shouldUseClientPlugin ? driver.getResolver(pluginClientName) : null;
+		const clientFile = shouldUseClientPlugin ? clientResolver?.resolveFile(operationFileEntry(node, node.operationId), {
 			root,
 			output: clientPlugin?.options?.output ?? output,
-			group: clientPlugin?.options?.group
-		}) : void 0;
+			group: clientPlugin?.options?.group ?? void 0
+		}) : null;
 		const resolvedClientName = shouldUseClientPlugin ? clientResolver?.resolveName(node.operationId) ?? clientName : clientName;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			children: [
-				parser === "zod" && fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
+				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
 					name: zodSchemaNames,
 					root: meta.file.path,
 					path: fileZod.path
 				}),
 				clientOptions.importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: "fetch",
+						name: "client",
 						path: clientOptions.importPath
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
@@ -1344,9 +1265,9 @@ const suspenseQueryGenerator = defineGenerator({
 					})
 				] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 					!shouldUseClientPlugin && /* @__PURE__ */ jsx(File.Import, {
-						name: ["fetch"],
+						name: ["client"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts")
+						path: path.resolve(root, ".kubb/client.ts")
 					}),
 					/* @__PURE__ */ jsx(File.Import, {
 						name: [
@@ -1355,13 +1276,13 @@ const suspenseQueryGenerator = defineGenerator({
 							"ResponseErrorConfig"
 						],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					}),
 					clientOptions.dataReturnType === "full" && /* @__PURE__ */ jsx(File.Import, {
 						name: ["ResponseConfig"],
 						root: meta.file.path,
-						path: path.resolve(root, ".kubb/fetch.ts"),
+						path: path.resolve(root, ".kubb/client.ts"),
 						isTypeOnly: true
 					})
 				] }),
@@ -1419,7 +1340,8 @@ const suspenseQueryGenerator = defineGenerator({
 					paramsCasing,
 					paramsType,
 					pathParamsType,
-					dataReturnType: clientOptions.dataReturnType || "data"
+					dataReturnType: clientOptions.dataReturnType || "data",
+					suspense: true
 				}),
 				suspense && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
@@ -1457,4 +1379,4 @@ const suspenseQueryGenerator = defineGenerator({
 //#endregion
 export { infiniteQueryGenerator as a, mutationGenerator as i, suspenseInfiniteQueryGenerator as n, hookOptionsGenerator as o, queryGenerator as r, customHookOptionsFileGenerator as s, suspenseQueryGenerator as t };
 
-//# sourceMappingURL=generators-C_fbcjpG.js.map
+//# sourceMappingURL=generators-BFn9CLBS.js.map