@kubb/plugin-react-query 5.0.0-beta.4 → 5.0.0-beta.56

package/dist/{components-DTGLu4UV.js → components-DL0Cai7l.js}

@@ -1,8 +1,9 @@
-import { t as __name } from "./chunk--u3MIqq1.js";
+import "./chunk-C0LytTxp.js";
 import { ast } from "@kubb/core";
 import { functionPrinter } from "@kubb/plugin-ts";
 import { File, Function, Type } from "@kubb/renderer-jsx";
 import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
+import { getNestedAccessor } from "@kubb/ast/utils";
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -14,50 +15,20 @@ import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
 function toCamelOrPascal(text, pascal) {
 	return text.trim().replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").replace(/(\d)([a-z])/g, "$1 $2").split(/[\s\-_./\\:]+/).filter(Boolean).map((word, i) => {
 		if (word.length > 1 && word === word.toUpperCase()) return word;
-		if (i === 0 && !pascal) return word.charAt(0).toLowerCase() + word.slice(1);
-		return word.charAt(0).toUpperCase() + word.slice(1);
+		return (i === 0 && !pascal ? word.charAt(0).toLowerCase() : word.charAt(0).toUpperCase()) + word.slice(1);
 	}).join("").replace(/[^a-zA-Z0-9]/g, "");
 }
 /**
-* Splits `text` on `.` and applies `transformPart` to each segment.
-* The last segment receives `isLast = true`, all earlier segments receive `false`.
-* Segments are joined with `/` to form a file path.
-*
-* Only splits on dots followed by a letter so that version numbers
-* embedded in operationIds (e.g. `v2025.0`) are kept intact.
-*/
-function applyToFileParts(text, transformPart) {
-	const parts = text.split(/\.(?=[a-zA-Z])/);
-	return parts.map((part, i) => transformPart(part, i === parts.length - 1)).join("/");
-}
-/**
 * Converts `text` to camelCase.
-* When `isFile` is `true`, dot-separated segments are each cased independently and joined with `/`.
 *
-* @example
-* camelCase('hello-world')                   // 'helloWorld'
-* camelCase('pet.petId', { isFile: true })   // 'pet/petId'
-*/
-function camelCase(text, { isFile, prefix = "", suffix = "" } = {}) {
-	if (isFile) return applyToFileParts(text, (part, isLast) => camelCase(part, isLast ? {
-		prefix,
-		suffix
-	} : {}));
-	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
-}
-//#endregion
-//#region ../../internals/utils/src/object.ts
-/**
-* Converts a dot-notation path or string array into an optional-chaining accessor expression.
+* @example Word boundaries
+* `camelCase('hello-world') // 'helloWorld'`
 *
-* @example
-* getNestedAccessor('pagination.next.id', 'lastPage')
-* // → "lastPage?.['pagination']?.['next']?.['id']"
+* @example With a prefix
+* `camelCase('tag', { prefix: 'create' }) // 'createTag'`
 */
-function getNestedAccessor(param, accessor) {
-	const parts = Array.isArray(param) ? param : param.split(".");
-	if (parts.length === 0 || parts.length === 1 && parts[0] === "") return null;
-	return `${accessor}?.['${`${parts.join("']?.['")}']`}`;
+function camelCase(text, { prefix = "", suffix = "" } = {}) {
+	return toCamelOrPascal(`${prefix} ${text} ${suffix}`, false);
 }
 //#endregion
 //#region ../../internals/utils/src/reserved.ts
@@ -163,99 +134,80 @@ function isValidVarName(name) {
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
 //#endregion
-//#region ../../internals/utils/src/urlPath.ts
+//#region ../../internals/utils/src/url.ts
+function transformParam(raw, casing) {
+	const param = isValidVarName(raw) ? raw : camelCase(raw);
+	return casing === "camelcase" ? camelCase(param) : param;
+}
+function toParamsObject(path, { replacer, casing } = {}) {
+	const params = {};
+	for (const match of path.matchAll(/\{([^}]+)\}/g)) {
+		const param = transformParam(match[1], casing);
+		const key = replacer ? replacer(param) : param;
+		params[key] = key;
+	}
+	return Object.keys(params).length > 0 ? params : null;
+}
 /**
-* Parses and transforms an OpenAPI/Swagger path string into various URL formats.
-*
-* @example
-* const p = new URLPath('/pet/{petId}')
-* p.URL      // '/pet/:petId'
-* p.template // '`/pet/${petId}`'
+* Helpers for OpenAPI/Swagger paths, plus a thin wrapper over the native `URL`.
 */
-var URLPath = class {
+var Url = class Url {
 	/**
-	* The raw OpenAPI/Swagger path string, e.g. `/pet/{petId}`.
-	*/
-	path;
-	#options;
-	constructor(path, options = {}) {
-		this.path = path;
-		this.#options = options;
-	}
-	/** Converts the OpenAPI path to Express-style colon syntax, e.g. `/pet/{petId}` → `/pet/:petId`.
+	* Reports whether `url` is a parseable absolute URL. Delegates to the native `URL.canParse`.
 	*
 	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').URL // '/pet/:petId'
-	* ```
+	* Url.canParse('https://petstore.swagger.io/v2') // true
+	* Url.canParse('/pet/{petId}')                   // false
 	*/
-	get URL() {
-		return this.toURLPath();
+	static canParse(url, base) {
+		return URL.canParse(url, base);
 	}
-	/** Returns `true` when `path` is a fully-qualified URL (e.g. starts with `https://`).
+	/**
+	* Converts an OpenAPI/Swagger path to Express-style colon syntax.
 	*
 	* @example
-	* ```ts
-	* new URLPath('https://petstore.swagger.io/v2/pet').isURL // true
-	* new URLPath('/pet/{petId}').isURL                       // false
-	* ```
+	* Url.toPath('/pet/{petId}') // '/pet/:petId'
 	*/
-	get isURL() {
-		try {
-			return !!new URL(this.path).href;
-		} catch {
-			return false;
-		}
+	static toPath(path) {
+		return path.replace(/\{([^}]+)\}/g, ":$1");
 	}
 	/**
-	* Converts the OpenAPI path to a TypeScript template literal string.
+	* Converts an OpenAPI/Swagger path to a TypeScript template literal string.
+	* `prefix` is prepended inside the literal, `replacer` transforms each parameter name,
+	* and `casing` controls parameter identifier casing.
 	*
 	* @example
-	* new URLPath('/pet/{petId}').template              // '`/pet/${petId}`'
-	* new URLPath('/account/monetary-accountID').template // '`/account/${monetaryAccountId}`'
-	*/
-	get template() {
-		return this.toTemplateString();
-	}
-	/** Returns the path and its extracted params as a structured `URLObject`, or as a stringified expression when `stringify` is set.
+	* Url.toTemplateString('/pet/{petId}') // '`/pet/${petId}`'
 	*
 	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').object
-	* // { url: '/pet/:petId', params: { petId: 'petId' } }
-	* ```
+	* Url.toTemplateString('/pet/{petId}', { prefix: 'https://api' }) // '`https://api/pet/${petId}`'
 	*/
-	get object() {
-		return this.toObject();
+	static toTemplateString(path, { prefix, replacer, casing } = {}) {
+		const result = path.split(/\{([^}]+)\}/).map((part, i) => {
+			if (i % 2 === 0) return part;
+			const param = transformParam(part, casing);
+			return `\${${replacer ? replacer(param) : param}}`;
+		}).join("");
+		return `\`${prefix ?? ""}${result}\``;
 	}
-	/** Returns a map of path parameter names, or `undefined` when the path has no parameters.
+	/**
+	* Returns the path and its extracted params as a structured `URLObject`, or as a stringified
+	* expression when `stringify` is set.
 	*
 	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').params // { petId: 'petId' }
-	* new URLPath('/pet').params         // undefined
-	* ```
-	*/
-	get params() {
-		return this.getParams();
-	}
-	#transformParam(raw) {
-		const param = isValidVarName(raw) ? raw : camelCase(raw);
-		return this.#options.casing === "camelcase" ? camelCase(param) : param;
-	}
-	/**
-	* Iterates over every `{param}` token in `path`, calling `fn` with the raw token and transformed name.
+	* Url.toObject('/pet/{petId}')
+	* // { url: '/pet/:petId', params: { petId: 'petId' } }
 	*/
-	#eachParam(fn) {
-		for (const match of this.path.matchAll(/\{([^}]+)\}/g)) {
-			const raw = match[1];
-			fn(raw, this.#transformParam(raw));
-		}
-	}
-	toObject({ type = "path", replacer, stringify } = {}) {
+	static toObject(path, { type = "path", replacer, stringify, casing } = {}) {
 		const object = {
-			url: type === "path" ? this.toURLPath() : this.toTemplateString({ replacer }),
-			params: this.getParams()
+			url: type === "path" ? Url.toPath(path) : Url.toTemplateString(path, {
+				replacer,
+				casing
+			}),
+			params: toParamsObject(path, {
+				replacer,
+				casing
+			})
 		};
 		if (stringify) {
 			if (type === "template") return JSON.stringify(object).replaceAll("'", "").replaceAll(`"`, "");
@@ -264,64 +216,153 @@ var URLPath = class {
 		}
 		return object;
 	}
-	/**
-	* Converts the OpenAPI path to a TypeScript template literal string.
-	* An optional `replacer` can transform each extracted parameter name before interpolation.
-	*
-	* @example
-	* new URLPath('/pet/{petId}').toTemplateString() // '`/pet/${petId}`'
-	*/
-	toTemplateString({ prefix = "", replacer } = {}) {
-		return `\`${prefix}${this.path.split(/\{([^}]+)\}/).map((part, i) => {
-			if (i % 2 === 0) return part;
-			const param = this.#transformParam(part);
-			return `\${${replacer ? replacer(param) : param}}`;
-		}).join("")}\``;
-	}
-	/**
-	* Extracts all `{param}` segments from the path and returns them as a key-value map.
-	* An optional `replacer` transforms each parameter name in both key and value positions.
-	* Returns `undefined` when no path parameters are found.
-	*
-	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}/tag/{tagId}').getParams()
-	* // { petId: 'petId', tagId: 'tagId' }
-	* ```
-	*/
-	getParams(replacer) {
-		const params = {};
-		this.#eachParam((_raw, param) => {
-			const key = replacer ? replacer(param) : param;
-			params[key] = key;
-		});
-		return Object.keys(params).length > 0 ? params : void 0;
-	}
-	/** Converts the OpenAPI path to Express-style colon syntax.
-	*
-	* @example
-	* ```ts
-	* new URLPath('/pet/{petId}').toURLPath() // '/pet/:petId'
-	* ```
-	*/
-	toURLPath() {
-		return this.path.replace(/\{([^}]+)\}/g, ":$1");
-	}
 };
 //#endregion
+//#region ../../internals/shared/src/operation.ts
+/**
+* Builds the `ResolverFileParams` every operation generator passes to
+* `resolver.resolveFile`: a file named `name`, tagged by the operation's first
+* tag (or `'default'`), at the operation's path. Centralizes the entry object
+* that was repeated at dozens of call sites across the client and query plugins.
+*
+* @example
+* ```ts
+* resolver.resolveFile(operationFileEntry(node, node.operationId), { root, output, group })
+* ```
+*/
+function operationFileEntry(node, name, extname = ".ts") {
+	return {
+		name,
+		extname,
+		tag: node.tags[0] ?? "default",
+		path: node.path
+	};
+}
+function getOperationLink(node, link) {
+	if (!link) return null;
+	if (typeof link === "function") return link(node) ?? null;
+	if (link === "urlPath") return node.path ? `{@link ${Url.toPath(node.path)}}` : null;
+	return node.path ? `{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}` : null;
+}
+function getContentTypeInfo(node) {
+	const contentTypes = node.requestBody?.content?.map((e) => e.contentType) ?? [];
+	const isMultipleContentTypes = contentTypes.length > 1;
+	return {
+		contentTypes,
+		isMultipleContentTypes,
+		contentTypeUnion: isMultipleContentTypes ? contentTypes.map((ct) => JSON.stringify(ct)).join(" | ") : "",
+		defaultContentType: contentTypes[0] ?? "application/json",
+		hasFormData: contentTypes.some((ct) => ct === "multipart/form-data")
+	};
+}
+function buildRequestConfigType(node, resolver) {
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null;
+	const { isMultipleContentTypes, contentTypeUnion } = getContentTypeInfo(node);
+	return `${requestName ? `Partial<RequestConfig<${requestName}>>` : "Partial<RequestConfig>"} & { ${["client?: Client", isMultipleContentTypes ? `contentType?: ${contentTypeUnion}` : null].filter(Boolean).join("; ")} }`;
+}
+function buildOperationComments(node, options = {}) {
+	const { link = "pathTemplate", linkPosition = "afterDeprecated", splitLines = false } = options;
+	const linkComment = getOperationLink(node, link);
+	const filteredComments = (linkPosition === "beforeDeprecated" ? [
+		node.description && `@description ${node.description}`,
+		node.summary && `@summary ${node.summary}`,
+		linkComment,
+		node.deprecated && "@deprecated"
+	] : [
+		node.description && `@description ${node.description}`,
+		node.summary && `@summary ${node.summary}`,
+		node.deprecated && "@deprecated",
+		linkComment
+	]).filter((comment) => Boolean(comment));
+	if (!splitLines) return filteredComments;
+	return filteredComments.flatMap((text) => text.split(/\r?\n/).map((line) => line.trim())).filter((comment) => Boolean(comment));
+}
+function getOperationParameters(node, options = {}) {
+	const params = ast.caseParams(node.parameters, options.paramsCasing);
+	return {
+		path: params.filter((param) => param.in === "path"),
+		query: params.filter((param) => param.in === "query"),
+		header: params.filter((param) => param.in === "header"),
+		cookie: params.filter((param) => param.in === "cookie")
+	};
+}
+function getStatusCodeNumber(statusCode) {
+	const code = Number(statusCode);
+	return Number.isNaN(code) ? null : code;
+}
+function isSuccessStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 200 && code < 300;
+}
+function isErrorStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 400;
+}
+function resolveErrorNames(node, resolver) {
+	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+}
+function resolveSuccessNames(node, resolver) {
+	return node.responses.filter((response) => isSuccessStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+}
+function resolveStatusCodeNames(node, resolver) {
+	return node.responses.map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+}
+/**
+* Builds the discriminated union type string for `dataReturnType: 'full'` return shapes.
+* Each member is `{ status: N; data: StatusNType; statusText: string }`.
+*/
+function buildStatusUnionType(node, resolver) {
+	const members = node.responses.map((r) => {
+		const typeName = resolver.resolveResponseStatusName(node, r.statusCode);
+		const statusCode = Number.parseInt(r.statusCode, 10);
+		return `{ status: ${Number.isNaN(statusCode) ? "number" : String(statusCode)}; data: ${typeName}; statusText: string }`;
+	});
+	if (members.length === 1) return members[0];
+	return `(${members.join(" | ")})`;
+}
+const typeNamesByResolver = /* @__PURE__ */ new WeakMap();
+function resolveOperationTypeNames(node, resolver, options = {}) {
+	const cacheKey = `${node.operationId}\0${options.paramsCasing ?? ""}\0${options.order ?? ""}\0${options.responseStatusNames ?? ""}\0${(options.exclude ?? []).join(",")}`;
+	let byResolver = typeNamesByResolver.get(resolver);
+	if (byResolver) {
+		const cached = byResolver.get(cacheKey);
+		if (cached) return cached;
+	} else {
+		byResolver = /* @__PURE__ */ new Map();
+		typeNamesByResolver.set(resolver, byResolver);
+	}
+	const { path, query, header } = getOperationParameters(node, { paramsCasing: options.paramsCasing });
+	const responseStatusNames = options.responseStatusNames === "error" ? resolveErrorNames(node, resolver) : options.responseStatusNames === false ? [] : resolveStatusCodeNames(node, resolver);
+	const exclude = new Set(options.exclude ?? []);
+	const paramNames = [
+		...path.map((param) => resolver.resolvePathParamsName(node, param)),
+		...query.map((param) => resolver.resolveQueryParamsName(node, param)),
+		...header.map((param) => resolver.resolveHeaderParamsName(node, param))
+	];
+	const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null, resolver.resolveResponseName(node)];
+	const result = (options.order === "body-response-first" ? [
+		...bodyAndResponseNames,
+		...paramNames,
+		...responseStatusNames
+	] : [
+		...paramNames,
+		...bodyAndResponseNames,
+		...responseStatusNames
+	]).filter((name) => Boolean(name) && !exclude.has(name));
+	byResolver.set(cacheKey, result);
+	return result;
+}
+//#endregion
 //#region ../../internals/tanstack-query/src/components/MutationKey.tsx
 const declarationPrinter$10 = functionPrinter({ mode: "declaration" });
-function getParams$6() {
-	return ast.createFunctionParameters({ params: [] });
-}
-__name(getParams$6, "getParams");
-const getTransformer$1 = /* @__PURE__ */ __name(({ node, casing }) => {
-	return [`{ url: '${new URLPath(node.path, { casing }).toURLPath()}' }`];
-}, "getTransformer");
-function MutationKey({ name, paramsCasing, node, transformer = getTransformer$1 }) {
-	const paramsNode = getParams$6();
+const mutationKeyTransformer = ({ node }) => {
+	if (!node.path) return [];
+	return [`{ url: '${Url.toPath(node.path)}' }`];
+};
+function MutationKey({ name, paramsCasing, node, transformer }) {
+	const paramsNode = ast.createFunctionParameters({ params: [] });
 	const paramsSignature = declarationPrinter$10.print(paramsNode) ?? "";
-	const keys = transformer({
+	const keys = (transformer ?? mutationKeyTransformer)({
 		node,
 		casing: paramsCasing
 	});
@@ -338,28 +379,98 @@ function MutationKey({ name, paramsCasing, node, transformer = getTransformer$1
 		})
 	});
 }
-MutationKey.getParams = getParams$6;
-MutationKey.getTransformer = getTransformer$1;
 //#endregion
 //#region ../../internals/tanstack-query/src/utils.ts
 /**
-* Build JSDoc comment lines from an OperationNode.
+* Builds the shared `(…params, config = {})` parameter list for a TanStack
+* query-options function. The trailing `config` parameter is typed as a partial
+* `RequestConfig` with an optional `client`. Framework plugins wrap the result
+* when needed, for example vue-query applies `MaybeRefOrGetter`.
 */
-function getComments(node) {
-	return [
-		node.description && `@description ${node.description}`,
-		node.summary && `@summary ${node.summary}`,
-		node.deprecated && "@deprecated",
-		`{@link ${node.path.replaceAll("{", ":").replaceAll("}", "")}}`
-	].filter((x) => Boolean(x));
+function buildQueryOptionsParams(node, options) {
+	const { paramsType, paramsCasing, pathParamsType, resolver } = options;
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	return ast.createOperationParams(node, {
+		paramsType,
+		pathParamsType: paramsType === "object" ? "object" : pathParamsType === "object" ? "object" : "inline",
+		paramsCasing,
+		resolver,
+		extraParams: [ast.createFunctionParameter({
+			name: "config",
+			type: ast.createParamsType({
+				variant: "reference",
+				name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"
+			}),
+			default: "{}"
+		})]
+	});
+}
+function matchesPattern(node, ov) {
+	const { type, pattern } = ov;
+	const matches = (value) => typeof pattern === "string" ? value === pattern : pattern.test(value);
+	if (type === "operationId") return matches(node.operationId);
+	if (type === "tag") return node.tags.some((t) => matches(t));
+	if (type === "path") return node.path !== void 0 && matches(node.path);
+	if (type === "method") return node.method !== void 0 && matches(node.method);
+	return false;
+}
+/**
+* Resolves per-operation overrides (first matching override wins).
+*
+* @example
+* ```ts
+* const opts = resolveOperationOverrides(node, override)
+* const queryOpts = 'query' in opts ? opts.query : defaultQuery
+* ```
+*/
+function resolveOperationOverrides(node, override) {
+	if (!override) return {};
+	return override.find((ov) => matchesPattern(node, ov))?.options ?? {};
+}
+/**
+* Returns `'zod'` when response-direction parsing is enabled.
+* The string shorthand `'zod'` also enables response parsing.
+*/
+function resolveResponseParser(parser) {
+	if (!parser) return null;
+	if (parser === "zod") return "zod";
+	return parser.response ?? null;
+}
+/**
+* Returns `'zod'` when request body parsing is enabled.
+* The string shorthand `'zod'` also enables request body parsing (existing behavior).
+*/
+function resolveRequestParser(parser) {
+	if (!parser) return null;
+	if (parser === "zod") return "zod";
+	return parser.request ?? null;
+}
+/**
+* Returns `'zod'` when query-params parsing is enabled.
+* Only the object form `{ request: 'zod' }` enables this. `parser: 'zod'` does not.
+*/
+function resolveQueryParamsParser(parser) {
+	if (!parser || parser === "zod") return null;
+	return parser.request ?? null;
 }
 /**
-* Resolve error type names from operation responses.
+* Collects the Zod schema import names for an operation based on the active parser directions.
+*
+* - `parser: 'zod'`: response and request body names (backward-compatible behavior).
+* - `parser: { request: 'zod' }`: request body and query params names.
+* - `parser: { response: 'zod' }`: response name only.
+* - `parser: { request: 'zod', response: 'zod' }`: all three.
+*
+* Returns an empty array when no resolver is provided or `parser` is falsy.
 */
-function resolveErrorNames(node, tsResolver) {
-	return node.responses.filter((r) => {
-		return Number.parseInt(r.statusCode, 10) >= 400;
-	}).map((r) => tsResolver.resolveResponseStatusName(node, r.statusCode));
+function resolveZodSchemaNames(node, zodResolver, parser) {
+	if (!zodResolver || !parser) return [];
+	const { query: queryParams } = getOperationParameters(node);
+	return [
+		resolveResponseParser(parser) === "zod" ? zodResolver.resolveResponseName?.(node) : null,
+		resolveRequestParser(parser) === "zod" && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
+		resolveQueryParamsParser(parser) === "zod" && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]) : null
+	].filter((n) => Boolean(n));
 }
 /**
 * Resolve the type for a single path parameter.
@@ -383,30 +494,14 @@ function resolvePathParamType(node, param, resolver) {
 }
 /**
 * Derive a query-params group type from the resolver.
-* Returns `undefined` when no query params exist or when the group name
+* Returns `null` when no query params exist or when the group name
 * equals the individual param name (no real group).
 */
 function resolveQueryGroupType(node, params, resolver) {
-	if (!params.length) return void 0;
+	if (!params.length) return null;
 	const firstParam = params[0];
 	const groupName = resolver.resolveQueryParamsName(node, firstParam);
-	if (groupName === resolver.resolveParamName(node, firstParam)) return void 0;
-	return {
-		type: ast.createParamsType({
-			variant: "reference",
-			name: groupName
-		}),
-		optional: params.every((p) => !p.required)
-	};
-}
-/**
-* Derive a header-params group type from the resolver.
-*/
-function resolveHeaderGroupType(node, params, resolver) {
-	if (!params.length) return void 0;
-	const firstParam = params[0];
-	const groupName = resolver.resolveHeaderParamsName(node, firstParam);
-	if (groupName === resolver.resolveParamName(node, firstParam)) return void 0;
+	if (groupName === resolver.resolveParamName(node, firstParam)) return null;
 	return {
 		type: ast.createParamsType({
 			variant: "reference",
@@ -456,7 +551,7 @@ function buildQueryKeyParams(node, options) {
 	const bodyType = node.requestBody?.content?.[0]?.schema ? ast.createParamsType({
 		variant: "reference",
 		name: resolver.resolveDataName(node)
-	}) : void 0;
+	}) : null;
 	const bodyRequired = node.requestBody?.required ?? false;
 	const params = [];
 	if (pathParams.length) {
@@ -481,66 +576,101 @@ function buildQueryKeyParams(node, options) {
 	return ast.createFunctionParameters({ params });
 }
 /**
-* Build mutation arg params for paramsToTrigger mode.
-* Contains pathParams + data + queryParams + headers (all flattened, for type alias).
+* Collect the names of the required params (no default) that drive the `enabled`
+* guard. These are exactly the params that should be made optional in the
+* generated signatures so callers can pass `undefined` to reach the disabled state.
 */
-function buildMutationArgParams(node, options) {
-	const { paramsCasing, resolver } = options;
-	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 queryGroupType = resolveQueryGroupType(node, queryParams, resolver);
-	const headerGroupType = resolveHeaderGroupType(node, headerParams, resolver);
-	const bodyType = node.requestBody?.content?.[0]?.schema ? ast.createParamsType({
-		variant: "reference",
-		name: resolver.resolveDataName(node)
-	}) : void 0;
-	const bodyRequired = node.requestBody?.required ?? false;
-	const params = [];
-	for (const p of pathParams) params.push(ast.createFunctionParameter({
-		name: p.name,
-		type: resolvePathParamType(node, p, resolver),
-		optional: !p.required
-	}));
-	if (bodyType) params.push(ast.createFunctionParameter({
-		name: "data",
-		type: bodyType,
-		optional: !bodyRequired
-	}));
-	params.push(...buildGroupParam("params", node, queryParams, queryGroupType, resolver));
-	params.push(...buildGroupParam("headers", node, headerParams, headerGroupType, resolver));
+function getEnabledParamNames(paramsNode) {
+	const required = [];
+	for (const param of paramsNode.params) if ("kind" in param && param.kind === "ParameterGroup") {
+		const group = param;
+		for (const child of group.properties) if (!child.optional && child.default === void 0) required.push(child.name);
+	} else {
+		const fp = param;
+		if (!fp.optional && fp.default === void 0) required.push(fp.name);
+	}
+	return required;
+}
+/**
+* Return a copy of `paramsNode` with the named params marked optional.
+*
+* Used to align signatures with the `enabled` guard: the guard already disables
+* the query while a param is falsy, so the param should accept `undefined`. The
+* change is type-only — the `queryFn` keeps calling the client with a non-null
+* assertion (see `injectNonNullAssertions`), so the emitted runtime is unchanged.
+*/
+function markParamsOptional(paramsNode, names) {
+	if (names.length === 0) return paramsNode;
+	const nameSet = new Set(names);
+	const params = paramsNode.params.map((param) => {
+		if ("kind" in param && param.kind === "ParameterGroup") {
+			const group = param;
+			return {
+				...group,
+				properties: group.properties.map((child) => nameSet.has(child.name) ? ast.createFunctionParameter({
+					name: child.name,
+					type: child.type,
+					rest: child.rest,
+					optional: true
+				}) : child)
+			};
+		}
+		const fp = param;
+		return nameSet.has(fp.name) ? ast.createFunctionParameter({
+			name: fp.name,
+			type: fp.type,
+			rest: fp.rest,
+			optional: true
+		}) : fp;
+	});
 	return ast.createFunctionParameters({ params });
 }
+/**
+* Add a non-null assertion (`!`) to the named params inside a printed client-call
+* string. Bridges the type gap created by `markParamsOptional` while keeping the
+* runtime identical (the `!` is erased at compile time).
+*
+* Handles destructured shorthand groups (`{ petId }` → `{ petId: petId! }`) and
+* standalone identifiers (`params` → `params!`).
+*/
+function injectNonNullAssertions(callStr, names) {
+	if (names.length === 0) return callStr;
+	const nameSet = new Set(names);
+	let result = callStr.replace(/\{\s*([\w,\s]+)\s*\}(?=\s*,)/g, (match, inner) => {
+		if (inner.includes(":") || inner.includes("...")) return match;
+		const keys = inner.split(",").map((k) => k.trim()).filter(Boolean);
+		if (!keys.some((k) => nameSet.has(k))) return match;
+		return `{ ${keys.map((k) => nameSet.has(k) ? `${k}: ${k}!` : k).join(", ")} }`;
+	});
+	result = result.replace(/(?<![{.:?])\b(\w+)\b(?=\s*,)/g, (match, name) => nameSet.has(name) ? `${name}!` : match);
+	return result;
+}
 //#endregion
 //#region ../../internals/tanstack-query/src/components/QueryKey.tsx
 const declarationPrinter$9 = functionPrinter({ mode: "declaration" });
-const callPrinter$9 = functionPrinter({ mode: "call" });
-function getParams$5(node, options) {
-	return buildQueryKeyParams(node, options);
-}
-__name(getParams$5, "getParams");
-const getTransformer = ({ node, casing }) => {
-	const path = new URLPath(node.path, { casing });
-	const hasQueryParams = node.parameters.some((p) => p.in === "query");
+const queryKeyTransformer = ({ node, casing }) => {
+	if (!node.path) return [];
+	const hasQueryParams = getOperationParameters(node).query.length > 0;
 	const hasRequestBody = !!node.requestBody?.content?.[0]?.schema;
 	return [
-		path.toObject({
+		Url.toObject(node.path, {
 			type: "path",
-			stringify: true
+			stringify: true,
+			casing
 		}),
-		hasQueryParams ? "...(params ? [params] : [])" : void 0,
-		hasRequestBody ? "...(data ? [data] : [])" : void 0
+		hasQueryParams ? "...(params ? [params] : [])" : null,
+		hasRequestBody ? "...(data ? [data] : [])" : null
 	].filter(Boolean);
 };
-function QueryKey({ name, node, tsResolver, paramsCasing, pathParamsType, typeName, transformer = getTransformer }) {
-	const paramsNode = getParams$5(node, {
+function QueryKey({ name, node, tsResolver, paramsCasing, pathParamsType, typeName, transformer }) {
+	const baseParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
+	const paramsNode = markParamsOptional(baseParamsNode, getEnabledParamNames(baseParamsNode));
 	const paramsSignature = declarationPrinter$9.print(paramsNode) ?? "";
-	const keys = transformer({
+	const keys = (transformer ?? queryKeyTransformer)({
 		node,
 		casing: paramsCasing
 	});
@@ -564,84 +694,36 @@ function QueryKey({ name, node, tsResolver, paramsCasing, pathParamsType, typeNa
 		})
 	})] });
 }
-QueryKey.getParams = getParams$5;
-QueryKey.getTransformer = getTransformer;
-QueryKey.callPrinter = callPrinter$9;
-//#endregion
-//#region src/utils.ts
-function transformName(name, type, transformers) {
-	return transformers?.name?.(name, type) || name;
-}
-function matchesPattern(node, ov) {
-	const { type, pattern } = ov;
-	const matches = (value) => typeof pattern === "string" ? value === pattern : pattern.test(value);
-	if (type === "operationId") return matches(node.operationId);
-	if (type === "tag") return node.tags.some((t) => matches(t));
-	if (type === "path") return matches(node.path);
-	if (type === "method") return matches(node.method);
-	return false;
-}
-/**
-* Resolves per-operation overrides (first matching override wins), mirroring v4 OperationGenerator.getOptions().
-*/
-function resolveOperationOverrides(node, override) {
-	if (!override) return {};
-	return override.find((ov) => matchesPattern(node, ov))?.options ?? {};
-}
 //#endregion
 //#region src/components/QueryOptions.tsx
 const declarationPrinter$8 = functionPrinter({ mode: "declaration" });
 const callPrinter$8 = functionPrinter({ mode: "call" });
 function getQueryOptionsParams(node, options) {
-	const { paramsType, paramsCasing, pathParamsType, resolver } = options;
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
-	return ast.createOperationParams(node, {
-		paramsType,
-		pathParamsType: paramsType === "object" ? "object" : pathParamsType === "object" ? "object" : "inline",
-		paramsCasing,
-		resolver,
-		extraParams: [ast.createFunctionParameter({
-			name: "config",
-			type: ast.createParamsType({
-				variant: "reference",
-				name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"
-			}),
-			default: "{}"
-		})]
-	});
+	return buildQueryOptionsParams(node, options);
 }
-function buildEnabledCheck(paramsNode) {
-	const required = [];
-	for (const param of paramsNode.params) if ("kind" in param && param.kind === "ParameterGroup") {
-		const group = param;
-		for (const child of group.properties) if (!child.optional && child.default === void 0) required.push(child.name);
-	} else {
-		const fp = param;
-		if (!fp.optional && fp.default === void 0) required.push(fp.name);
-	}
-	return required.join(" && ");
-}
-function QueryOptions({ name, clientName, dataReturnType, node, tsResolver, paramsCasing, paramsType, pathParamsType, queryKeyName }) {
-	const responseName = tsResolver.resolveResponseName(node);
+function QueryOptions({ name, clientName, dataReturnType, node, tsResolver, paramsCasing, paramsType, pathParamsType, queryKeyName, suspense }) {
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const paramsNode = getQueryOptionsParams(node, {
-		paramsType,
-		paramsCasing,
-		pathParamsType,
-		resolver: tsResolver
-	});
-	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
-	const clientCallStr = (callPrinter$8.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }");
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$8.print(queryKeyParamsNode) ?? "";
-	const enabledSource = buildEnabledCheck(queryKeyParamsNode);
-	const enabledText = enabledSource ? `enabled: !!(${enabledSource}),` : "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
+	const optionalNames = suspense ? [] : enabledNames;
+	const enabledText = suspense ? "" : enabledNames.length ? `enabled: !!(${enabledNames.join(" && ")}),` : "";
+	const paramsNode = markParamsOptional(getQueryOptionsParams(node, {
+		paramsType,
+		paramsCasing,
+		pathParamsType,
+		resolver: tsResolver
+	}), optionalNames);
+	const paramsSignature = declarationPrinter$8.print(paramsNode) ?? "";
+	const clientCallStr = injectNonNullAssertions((callPrinter$8.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }"), optionalNames);
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -652,8 +734,7 @@ function QueryOptions({ name, clientName, dataReturnType, node, tsResolver, para
 			params: paramsSignature,
 			children: `
       const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-      return queryOptions<${TData}, ${TError}, ${TData}, typeof queryKey>({
-       ${enabledText}
+      return queryOptions<${TData}, ${TError}, ${TData}, typeof queryKey>({${enabledText ? `\n       ${enabledText}` : ""}
        queryKey,
        queryFn: async ({ signal }) => {
           return ${clientName}(${clientCallStr})
@@ -663,14 +744,13 @@ function QueryOptions({ name, clientName, dataReturnType, node, tsResolver, para
 		})
 	});
 }
-QueryOptions.getParams = getQueryOptionsParams;
 //#endregion
 //#region src/components/InfiniteQuery.tsx
 const declarationPrinter$7 = functionPrinter({ mode: "declaration" });
 const callPrinter$7 = functionPrinter({ mode: "call" });
-function getParams$4(node, options) {
+function buildInfiniteQueryParamsNode(node, options) {
 	const { paramsType, paramsCasing, pathParamsType, resolver, pageParamGeneric } = options;
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null;
 	const optionsParam = ast.createFunctionParameter({
 		name: "options",
 		type: ast.createParamsType({
@@ -690,23 +770,23 @@ function getParams$4(node, options) {
 		extraParams: [optionsParam]
 	});
 }
-__name(getParams$4, "getParams");
 function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsType, paramsCasing, pathParamsType, dataReturnType, node, tsResolver, initialPageParam, queryParam, customOptions }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
-	const responseType = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const responseType = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
 	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
 		const parts = initialPageParam.split(" as ");
 		return parts[parts.length - 1] ?? "unknown";
 	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = node.parameters.filter((p) => p.in === "query");
+	const rawQueryParams = getOperationParameters(node).query;
 	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
 		const groupName = tsResolver.resolveQueryParamsName(node, rawQueryParams[0]);
-		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : void 0;
-	})() : void 0;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : void 0;
+		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : null;
+	})() : null;
+	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
 	const returnType = "UseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
 	const generics = [
@@ -716,12 +796,13 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
 		`TPageParam = ${pageParamType}`
 	];
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$7.print(queryKeyParamsNode) ?? "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
 	const queryOptionsParamsNode = getQueryOptionsParams(node, {
 		paramsType,
 		paramsCasing,
@@ -729,14 +810,14 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		resolver: tsResolver
 	});
 	const queryOptionsParamsCall = callPrinter$7.print(queryOptionsParamsNode) ?? "";
-	const paramsNode = getParams$4(node, {
+	const paramsNode = markParamsOptional(buildInfiniteQueryParamsNode(node, {
 		paramsType,
 		paramsCasing,
 		pathParamsType,
 		dataReturnType,
 		resolver: tsResolver,
 		pageParamGeneric: "TPageParam"
-	});
+	}), enabledNames);
 	const paramsSignature = declarationPrinter$7.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
@@ -748,15 +829,14 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 			generics: generics.join(", "),
 			params: paramsSignature,
 			returnType: void 0,
-			JSDoc: { comments: getComments(node) },
+			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
        const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})
-       ${customOptions ? `const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const query = useInfiniteQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as InfiniteQueryObserverOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
@@ -768,14 +848,14 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		})
 	});
 }
-InfiniteQuery.getParams = getParams$4;
 //#endregion
 //#region src/components/InfiniteQueryOptions.tsx
 const declarationPrinter$6 = functionPrinter({ mode: "declaration" });
 const callPrinter$6 = functionPrinter({ mode: "call" });
 function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, paramsCasing, paramsType, dataReturnType, pathParamsType, queryParam, queryKeyName }) {
-	const responseName = tsResolver.resolveResponseName(node);
-	const queryFnDataType = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const queryFnDataType = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
@@ -783,59 +863,48 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 		const parts = initialPageParam.split(" as ");
 		return parts[parts.length - 1] ?? "unknown";
 	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = node.parameters.filter((p) => p.in === "query");
+	const rawQueryParams = getOperationParameters(node).query;
 	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
 		const groupName = tsResolver.resolveQueryParamsName(node, rawQueryParams[0]);
-		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : void 0;
-	})() : void 0;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : void 0;
+		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : null;
+	})() : null;
+	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
-	const paramsNode = getQueryOptionsParams(node, {
-		paramsType,
-		paramsCasing,
-		pathParamsType,
-		resolver: tsResolver
-	});
-	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
-	const clientCallStr = (callPrinter$6.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }");
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$6.print(queryKeyParamsNode) ?? "";
-	const enabledSource = buildEnabledCheck(queryKeyParamsNode);
-	const enabledText = enabledSource ? `enabled: !!(${enabledSource}),` : "";
-	const hasNewParams = nextParam !== void 0 || previousParam !== void 0;
-	let getNextPageParamExpr;
-	let getPreviousPageParamExpr;
-	if (hasNewParams) {
-		if (nextParam) {
-			const accessor = getNestedAccessor(nextParam, "lastPage");
-			if (accessor) getNextPageParamExpr = `getNextPageParam: (lastPage) => ${accessor}`;
-		}
-		if (previousParam) {
-			const accessor = getNestedAccessor(previousParam, "firstPage");
-			if (accessor) getPreviousPageParamExpr = `getPreviousPageParam: (firstPage) => ${accessor}`;
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
+	const enabledText = enabledNames.length ? `enabled: !!(${enabledNames.join(" && ")}),` : "";
+	const paramsNode = markParamsOptional(getQueryOptionsParams(node, {
+		paramsType,
+		paramsCasing,
+		pathParamsType,
+		resolver: tsResolver
+	}), enabledNames);
+	const paramsSignature = declarationPrinter$6.print(paramsNode) ?? "";
+	const clientCallStr = injectNonNullAssertions((callPrinter$6.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }"), enabledNames);
+	const hasNewParams = nextParam != null || previousParam != null;
+	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
+		if (hasNewParams) {
+			const nextAccessor = nextParam ? getNestedAccessor(nextParam, "lastPage") : null;
+			const prevAccessor = previousParam ? getNestedAccessor(previousParam, "firstPage") : null;
+			return [nextAccessor ? `getNextPageParam: (lastPage) => ${nextAccessor}` : null, prevAccessor ? `getPreviousPageParam: (firstPage) => ${prevAccessor}` : null];
 		}
-	} else if (cursorParam) {
-		getNextPageParamExpr = `getNextPageParam: (lastPage) => lastPage['${cursorParam}']`;
-		getPreviousPageParamExpr = `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`;
-	} else {
-		if (dataReturnType === "full") getNextPageParamExpr = "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage.data) && lastPage.data.length === 0 ? undefined : lastPageParam + 1";
-		else getNextPageParamExpr = "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage) && lastPage.length === 0 ? undefined : lastPageParam + 1";
-		getPreviousPageParamExpr = "getPreviousPageParam: (_firstPage, _allPages, firstPageParam) => firstPageParam <= 1 ? undefined : firstPageParam - 1";
-	}
+		if (cursorParam) return [`getNextPageParam: (lastPage) => lastPage['${cursorParam}']`, `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`];
+		return [dataReturnType === "full" ? "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage.data) && lastPage.data.length === 0 ? undefined : lastPageParam + 1" : "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage) && lastPage.length === 0 ? undefined : lastPageParam + 1", "getPreviousPageParam: (_firstPage, _allPages, firstPageParam) => firstPageParam <= 1 ? undefined : firstPageParam - 1"];
+	})();
 	const queryOptionsArr = [
 		`initialPageParam: ${typeof initialPageParam === "string" ? JSON.stringify(initialPageParam) : initialPageParam}`,
 		getNextPageParamExpr,
 		getPreviousPageParamExpr
 	].filter(Boolean);
-	const infiniteOverrideParams = queryParam && queryParamsTypeName ? `
-          params = {
-            ...(params ?? {}),
-            ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
-          } as ${queryParamsTypeName}` : "";
+	const infiniteOverrideParams = queryParam && queryParamsTypeName ? `params = {
+      ...(params ?? {}),
+      ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
+    } as ${queryParamsTypeName}` : "";
 	if (infiniteOverrideParams) return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -845,16 +914,15 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 			export: true,
 			params: paramsSignature,
 			children: `
-      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-      return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-       ${enabledText}
-       queryKey,
-       queryFn: async ({ signal, pageParam }) => {
-          ${infiniteOverrideParams}
-          return ${clientName}(${clientCallStr})
-        },
-       ${queryOptionsArr.join(",\n")}
-      })
+const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({${enabledText ? `\n  ${enabledText}` : ""}
+  queryKey,
+  queryFn: async ({ signal, pageParam }) => {
+    ${infiniteOverrideParams}
+    return ${clientName}(${clientCallStr})
+  },
+  ${queryOptionsArr.join(",\n  ")}
+})
 `
 		})
 	});
@@ -867,44 +935,44 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 			export: true,
 			params: paramsSignature,
 			children: `
-      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-      return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-       ${enabledText}
-       queryKey,
-       queryFn: async ({ signal }) => {
-          return ${clientName}(${clientCallStr})
-        },
-       ${queryOptionsArr.join(",\n")}
-      })
+const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({${enabledText ? `\n  ${enabledText}` : ""}
+  queryKey,
+  queryFn: async ({ signal }) => {
+    return ${clientName}(${clientCallStr})
+  },
+  ${queryOptionsArr.join(",\n  ")}
+})
 `
 		})
 	});
 }
-InfiniteQueryOptions.getParams = (node, options) => getQueryOptionsParams(node, options);
 //#endregion
 //#region src/components/MutationOptions.tsx
 const declarationPrinter$5 = functionPrinter({ mode: "declaration" });
 const callPrinter$5 = functionPrinter({ mode: "call" });
 const keysPrinter = functionPrinter({ mode: "keys" });
-function getConfigParam(node, resolver) {
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+function buildMutationConfigParamsNode(node, resolver) {
 	return ast.createFunctionParameters({ params: [ast.createFunctionParameter({
 		name: "config",
 		type: ast.createParamsType({
 			variant: "reference",
-			name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"
+			name: buildRequestConfigType(node, resolver)
 		}),
 		default: "{}"
 	})] });
 }
 function MutationOptions({ name, clientName, dataReturnType, node, tsResolver, paramsCasing, paramsType, pathParamsType, mutationKeyName }) {
-	const responseName = tsResolver.resolveResponseName(node);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const configParamsNode = getConfigParam(node, tsResolver);
+	const configParamsNode = buildMutationConfigParamsNode(node, tsResolver);
 	const paramsSignature = declarationPrinter$5.print(configParamsNode) ?? "";
-	const mutationArgParamsNode = buildMutationArgParams(node, {
+	const mutationArgParamsNode = ast.createOperationParams(node, {
+		paramsType: "inline",
+		pathParamsType: "inline",
 		paramsCasing,
 		resolver: tsResolver
 	});
@@ -920,7 +988,7 @@ function MutationOptions({ name, clientName, dataReturnType, node, tsResolver, p
 			name: "config",
 			type: ast.createParamsType({
 				variant: "reference",
-				name: node.requestBody?.content?.[0]?.schema ? `Partial<RequestConfig<${tsResolver.resolveDataName(node)}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"
+				name: buildRequestConfigType(node, tsResolver)
 			}),
 			default: "{}"
 		})]
@@ -937,7 +1005,7 @@ function MutationOptions({ name, clientName, dataReturnType, node, tsResolver, p
 			generics: ["TContext = unknown"],
 			children: `
       const mutationKey = ${mutationKeyName}()
-      return mutationOptions<${TData}, ${TError}, ${TRequest ? `{${TRequest}}` : "void"}, TContext>({
+      return mutationOptions<${TData}, ${TError}, ${TRequest ? `{${TRequest}}` : "undefined"}, TContext>({
         mutationKey,
         mutationFn: async(${hasMutationParams ? `{ ${argKeysStr} }` : "_"}) => {
           return ${clientName}(${clientCallStr})
@@ -947,19 +1015,26 @@ function MutationOptions({ name, clientName, dataReturnType, node, tsResolver, p
 		})
 	});
 }
-MutationOptions.getParams = getConfigParam;
 //#endregion
 //#region src/components/Mutation.tsx
 const declarationPrinter$4 = functionPrinter({ mode: "declaration" });
 const callPrinter$4 = functionPrinter({ mode: "call" });
-function getParams$3(node, options) {
+function createMutationArgParams(node, options) {
+	return ast.createOperationParams(node, {
+		paramsType: "inline",
+		pathParamsType: "inline",
+		paramsCasing: options.paramsCasing,
+		resolver: options.resolver
+	});
+}
+function buildMutationParamsNode(node, options) {
 	const { paramsCasing, dataReturnType, resolver } = options;
-	const responseName = resolver.resolveResponseName(node);
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	const successNames = resolveSuccessNames(node, resolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, resolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, resolver);
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const mutationArgParamsNode = buildMutationArgParams(node, {
+	const mutationArgParamsNode = createMutationArgParams(node, {
 		paramsCasing,
 		resolver
 	});
@@ -967,7 +1042,7 @@ function getParams$3(node, options) {
 	const generics = [
 		TData,
 		TError,
-		TRequest ? `{${TRequest}}` : "void",
+		TRequest ? `{${TRequest}}` : "undefined",
 		"TContext"
 	].join(", ");
 	return ast.createFunctionParameters({ params: [ast.createFunctionParameter({
@@ -976,19 +1051,19 @@ function getParams$3(node, options) {
 			variant: "reference",
 			name: `{
   mutation?: UseMutationOptions<${generics}> & { client?: QueryClient },
-  client?: ${requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"},
+  client?: ${buildRequestConfigType(node, resolver)},
 }`
 		}),
 		default: "{}"
 	})] });
 }
-__name(getParams$3, "getParams");
 function Mutation({ name, mutationOptionsName, paramsCasing, dataReturnType, node, tsResolver, mutationKeyName, customOptions }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
-	const mutationArgParamsNode = buildMutationArgParams(node, {
+	const mutationArgParamsNode = createMutationArgParams(node, {
 		paramsCasing,
 		resolver: tsResolver
 	});
@@ -996,13 +1071,13 @@ function Mutation({ name, mutationOptionsName, paramsCasing, dataReturnType, nod
 	const generics = [
 		TData,
 		TError,
-		TRequest ? `{${TRequest}}` : "void",
+		TRequest ? `{${TRequest}}` : "undefined",
 		"TContext"
 	].join(", ");
 	const returnType = `UseMutationResult<${generics}>`;
-	const mutationOptionsConfigNode = MutationOptions.getParams(node, tsResolver);
+	const mutationOptionsConfigNode = buildMutationConfigParamsNode(node, tsResolver);
 	const mutationOptionsParamsCall = callPrinter$4.print(mutationOptionsConfigNode) ?? "";
-	const paramsNode = getParams$3(node, {
+	const paramsNode = buildMutationParamsNode(node, {
 		paramsCasing,
 		dataReturnType,
 		resolver: tsResolver
@@ -1016,18 +1091,17 @@ function Mutation({ name, mutationOptionsName, paramsCasing, dataReturnType, nod
 			name,
 			export: true,
 			params: paramsSignature,
-			JSDoc: { comments: getComments(node) },
+			JSDoc: { comments: buildOperationComments(node) },
 			generics: ["TContext"],
 			children: `
         const { mutation = {}, client: config = {} } = options ?? {}
         const { client: queryClient, ...mutationOptions } = mutation;
         const mutationKey = mutationOptions.mutationKey ?? ${mutationKeyName}()
 
-        const baseOptions = ${mutationOptionsName}(${mutationOptionsParamsCall}) as UseMutationOptions<${generics}>
-        ${customOptions ? `const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' }) as UseMutationOptions<${generics}>` : ""}
+        const baseOptions = ${mutationOptionsName}(${mutationOptionsParamsCall}) as UseMutationOptions<${generics}>${customOptions ? `\n        const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' }) as UseMutationOptions<${generics}>` : ""}
 
         return useMutation<${generics}>({
-          ...baseOptions,${customOptions ? "\n...customOptions," : ""}
+          ...baseOptions,${customOptions ? "\n          ...customOptions," : ""}
           mutationKey,
           ...mutationOptions,
         }, queryClient) as ${returnType}
@@ -1035,17 +1109,17 @@ function Mutation({ name, mutationOptionsName, paramsCasing, dataReturnType, nod
 		})
 	});
 }
-Mutation.getParams = getParams$3;
 //#endregion
 //#region src/components/Query.tsx
 const declarationPrinter$3 = functionPrinter({ mode: "declaration" });
 const callPrinter$3 = functionPrinter({ mode: "call" });
-function getParams$2(node, options) {
+function buildQueryParamsNode(node, options) {
 	const { paramsType, paramsCasing, pathParamsType, dataReturnType, resolver } = options;
-	const responseName = resolver.resolveResponseName(node);
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	const successNames = resolveSuccessNames(node, resolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null;
 	const errorNames = resolveErrorNames(node, resolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, resolver);
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const optionsParam = ast.createFunctionParameter({
 		name: "options",
@@ -1072,23 +1146,24 @@ function getParams$2(node, options) {
 		extraParams: [optionsParam]
 	});
 }
-__name(getParams$2, "getParams");
 function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsType, paramsCasing, pathParamsType, dataReturnType, node, tsResolver, customOptions }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const returnType = `UseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
 	const generics = [
 		`TData = ${TData}`,
 		`TQueryData = ${TData}`,
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`
 	];
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$3.print(queryKeyParamsNode) ?? "";
+	const enabledNames = getEnabledParamNames(queryKeyParamsNode);
 	const queryOptionsParamsNode = getQueryOptionsParams(node, {
 		paramsType,
 		paramsCasing,
@@ -1096,13 +1171,13 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsT
 		resolver: tsResolver
 	});
 	const queryOptionsParamsCall = callPrinter$3.print(queryOptionsParamsNode) ?? "";
-	const paramsNode = getParams$2(node, {
+	const paramsNode = markParamsOptional(buildQueryParamsNode(node, {
 		paramsType,
 		paramsCasing,
 		pathParamsType,
 		dataReturnType,
 		resolver: tsResolver
-	});
+	}), enabledNames);
 	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
@@ -1114,15 +1189,14 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsT
 			generics: generics.join(", "),
 			params: paramsSignature,
 			returnType: void 0,
-			JSDoc: { comments: getComments(node) },
+			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
        const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})
-       ${customOptions ? `const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const query = useQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as QueryObserverOptions, queryClient) as ${returnType}
@@ -1134,14 +1208,13 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsT
 		})
 	});
 }
-Query.getParams = getParams$2;
 //#endregion
 //#region src/components/SuspenseInfiniteQuery.tsx
 const declarationPrinter$2 = functionPrinter({ mode: "declaration" });
 const callPrinter$2 = functionPrinter({ mode: "call" });
-function getParams$1(node, options) {
+function buildSuspenseInfiniteQueryParamsNode(node, options) {
 	const { paramsType, paramsCasing, pathParamsType, resolver, pageParamGeneric } = options;
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null;
 	const optionsParam = ast.createFunctionParameter({
 		name: "options",
 		type: ast.createParamsType({
@@ -1161,23 +1234,23 @@ function getParams$1(node, options) {
 		extraParams: [optionsParam]
 	});
 }
-__name(getParams$1, "getParams");
 function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsType, paramsCasing, pathParamsType, dataReturnType, node, tsResolver, customOptions, initialPageParam, queryParam }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
-	const responseType = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const responseType = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
 	const fallbackPageParamType = typeof initialPageParam === "number" ? "number" : typeof initialPageParam === "string" ? initialPageParam.includes(" as ") ? (() => {
 		const parts = initialPageParam.split(" as ");
 		return parts[parts.length - 1] ?? "unknown";
 	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = node.parameters.filter((p) => p.in === "query");
+	const rawQueryParams = getOperationParameters(node).query;
 	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
 		const groupName = tsResolver.resolveQueryParamsName(node, rawQueryParams[0]);
-		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : void 0;
-	})() : void 0;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : void 0;
+		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : null;
+	})() : null;
+	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
 	const returnType = "UseSuspenseInfiniteQueryResult<TData, TError> & { queryKey: TQueryKey }";
 	const generics = [
@@ -1187,7 +1260,7 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 		`TQueryKey extends QueryKey = ${queryKeyTypeName}`,
 		`TPageParam = ${pageParamType}`
 	];
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
@@ -1200,7 +1273,7 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 		resolver: tsResolver
 	});
 	const queryOptionsParamsCall = callPrinter$2.print(queryOptionsParamsNode) ?? "";
-	const paramsNode = getParams$1(node, {
+	const paramsNode = buildSuspenseInfiniteQueryParamsNode(node, {
 		paramsType,
 		paramsCasing,
 		pathParamsType,
@@ -1219,15 +1292,14 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 			generics: generics.join(", "),
 			params: paramsSignature,
 			returnType: void 0,
-			JSDoc: { comments: getComments(node) },
+			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
        const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})
-       ${customOptions ? `const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const query = useSuspenseInfiniteQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as UseSuspenseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>, queryClient) as ${returnType}
@@ -1239,14 +1311,14 @@ function SuspenseInfiniteQuery({ name, queryKeyTypeName, queryOptionsName, query
 		})
 	});
 }
-SuspenseInfiniteQuery.getParams = getParams$1;
 //#endregion
 //#region src/components/SuspenseInfiniteQueryOptions.tsx
 const declarationPrinter$1 = functionPrinter({ mode: "declaration" });
 const callPrinter$1 = functionPrinter({ mode: "call" });
 function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam, nextParam, previousParam, node, tsResolver, paramsCasing, paramsType, dataReturnType, pathParamsType, queryParam, queryKeyName }) {
-	const responseName = tsResolver.resolveResponseName(node);
-	const queryFnDataType = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
+	const queryFnDataType = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const errorNames = resolveErrorNames(node, tsResolver);
 	const errorType = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const isInitialPageParamDefined = initialPageParam !== void 0 && initialPageParam !== null;
@@ -1254,12 +1326,12 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 		const parts = initialPageParam.split(" as ");
 		return parts[parts.length - 1] ?? "unknown";
 	})() : "string" : typeof initialPageParam === "boolean" ? "boolean" : "unknown";
-	const rawQueryParams = node.parameters.filter((p) => p.in === "query");
+	const rawQueryParams = getOperationParameters(node).query;
 	const queryParamsTypeName = rawQueryParams.length > 0 ? (() => {
 		const groupName = tsResolver.resolveQueryParamsName(node, rawQueryParams[0]);
-		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : void 0;
-	})() : void 0;
-	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : void 0;
+		return groupName !== tsResolver.resolveParamName(node, rawQueryParams[0]) ? groupName : null;
+	})() : null;
+	const queryParamType = queryParam && queryParamsTypeName ? `${queryParamsTypeName}['${queryParam}']` : null;
 	const pageParamType = queryParamType ? isInitialPageParamDefined ? `NonNullable<${queryParamType}>` : queryParamType : fallbackPageParamType;
 	const paramsNode = getQueryOptionsParams(node, {
 		paramsType,
@@ -1269,44 +1341,31 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 	});
 	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
 	const clientCallStr = (callPrinter$1.print(paramsNode) ?? "").replace(/\bconfig\b(?=[^,]*$)/, "{ ...config, signal: config.signal ?? signal }");
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
 	});
 	const queryKeyParamsCall = callPrinter$1.print(queryKeyParamsNode) ?? "";
-	const enabledSource = buildEnabledCheck(queryKeyParamsNode);
-	const enabledText = enabledSource ? `enabled: !!(${enabledSource}),` : "";
-	const hasNewParams = nextParam !== void 0 || previousParam !== void 0;
-	let getNextPageParamExpr;
-	let getPreviousPageParamExpr;
-	if (hasNewParams) {
-		if (nextParam) {
-			const accessor = getNestedAccessor(nextParam, "lastPage");
-			if (accessor) getNextPageParamExpr = `getNextPageParam: (lastPage) => ${accessor}`;
-		}
-		if (previousParam) {
-			const accessor = getNestedAccessor(previousParam, "firstPage");
-			if (accessor) getPreviousPageParamExpr = `getPreviousPageParam: (firstPage) => ${accessor}`;
+	const hasNewParams = nextParam != null || previousParam != null;
+	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
+		if (hasNewParams) {
+			const nextAccessor = nextParam ? getNestedAccessor(nextParam, "lastPage") : null;
+			const prevAccessor = previousParam ? getNestedAccessor(previousParam, "firstPage") : null;
+			return [nextAccessor ? `getNextPageParam: (lastPage) => ${nextAccessor}` : null, prevAccessor ? `getPreviousPageParam: (firstPage) => ${prevAccessor}` : null];
 		}
-	} else if (cursorParam) {
-		getNextPageParamExpr = `getNextPageParam: (lastPage) => lastPage['${cursorParam}']`;
-		getPreviousPageParamExpr = `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`;
-	} else {
-		if (dataReturnType === "full") getNextPageParamExpr = "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage.data) && lastPage.data.length === 0 ? undefined : lastPageParam + 1";
-		else getNextPageParamExpr = "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage) && lastPage.length === 0 ? undefined : lastPageParam + 1";
-		getPreviousPageParamExpr = "getPreviousPageParam: (_firstPage, _allPages, firstPageParam) => firstPageParam <= 1 ? undefined : firstPageParam - 1";
-	}
+		if (cursorParam) return [`getNextPageParam: (lastPage) => lastPage['${cursorParam}']`, `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`];
+		return [dataReturnType === "full" ? "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage.data) && lastPage.data.length === 0 ? undefined : lastPageParam + 1" : "getNextPageParam: (lastPage, _allPages, lastPageParam) => Array.isArray(lastPage) && lastPage.length === 0 ? undefined : lastPageParam + 1", "getPreviousPageParam: (_firstPage, _allPages, firstPageParam) => firstPageParam <= 1 ? undefined : firstPageParam - 1"];
+	})();
 	const queryOptionsArr = [
 		`initialPageParam: ${typeof initialPageParam === "string" ? JSON.stringify(initialPageParam) : initialPageParam}`,
 		getNextPageParamExpr,
 		getPreviousPageParamExpr
 	].filter(Boolean);
-	const infiniteOverrideParams = queryParam && queryParamsTypeName ? `
-          params = {
-            ...(params ?? {}),
-            ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
-          } as ${queryParamsTypeName}` : "";
+	const infiniteOverrideParams = queryParam && queryParamsTypeName ? `params = {
+      ...(params ?? {}),
+      ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
+    } as ${queryParamsTypeName}` : "";
 	if (infiniteOverrideParams) return /* @__PURE__ */ jsx(File.Source, {
 		name,
 		isExportable: true,
@@ -1316,16 +1375,15 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 			export: true,
 			params: paramsSignature,
 			children: `
-      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-      return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-       ${enabledText}
-       queryKey,
-       queryFn: async ({ signal, pageParam }) => {
-          ${infiniteOverrideParams}
-          return ${clientName}(${clientCallStr})
-        },
-       ${queryOptionsArr.join(",\n")}
-      })
+const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
+  queryKey,
+  queryFn: async ({ signal, pageParam }) => {
+    ${infiniteOverrideParams}
+    return ${clientName}(${clientCallStr})
+  },
+  ${queryOptionsArr.join(",\n  ")}
+})
 `
 		})
 	});
@@ -1338,30 +1396,29 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 			export: true,
 			params: paramsSignature,
 			children: `
-      const queryKey = ${queryKeyName}(${queryKeyParamsCall})
-      return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
-       ${enabledText}
-       queryKey,
-       queryFn: async ({ signal }) => {
-          return ${clientName}(${clientCallStr})
-        },
-       ${queryOptionsArr.join(",\n")}
-     })
+const queryKey = ${queryKeyName}(${queryKeyParamsCall})
+return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${queryFnDataType}>, typeof queryKey, ${pageParamType}>({
+  queryKey,
+  queryFn: async ({ signal }) => {
+    return ${clientName}(${clientCallStr})
+  },
+  ${queryOptionsArr.join(",\n  ")}
+})
 `
 		})
 	});
 }
-SuspenseInfiniteQueryOptions.getParams = (node, options) => getQueryOptionsParams(node, options);
 //#endregion
 //#region src/components/SuspenseQuery.tsx
 const declarationPrinter = functionPrinter({ mode: "declaration" });
 const callPrinter = functionPrinter({ mode: "call" });
-function getParams(node, options) {
+function buildSuspenseQueryParamsNode(node, options) {
 	const { paramsType, paramsCasing, pathParamsType, dataReturnType, resolver } = options;
-	const responseName = resolver.resolveResponseName(node);
-	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0;
+	const successNames = resolveSuccessNames(node, resolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : resolver.resolveResponseName(node);
+	const requestName = node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : null;
 	const errorNames = resolveErrorNames(node, resolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, resolver);
 	const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`;
 	const optionsParam = ast.createFunctionParameter({
 		name: "options",
@@ -1388,12 +1445,13 @@ function getParams(node, options) {
 	});
 }
 function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName, paramsType, paramsCasing, pathParamsType, dataReturnType, node, tsResolver, customOptions }) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const errorNames = resolveErrorNames(node, tsResolver);
-	const TData = dataReturnType === "data" ? responseName : `ResponseConfig<${responseName}>`;
+	const TData = dataReturnType === "data" ? responseName : buildStatusUnionType(node, tsResolver);
 	const returnType = `UseSuspenseQueryResult<TData, ${`ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(" | ") : "Error"}>`}> & { queryKey: TQueryKey }`;
 	const generics = [`TData = ${TData}`, `TQueryKey extends QueryKey = ${queryKeyTypeName}`];
-	const queryKeyParamsNode = QueryKey.getParams(node, {
+	const queryKeyParamsNode = buildQueryKeyParams(node, {
 		pathParamsType,
 		paramsCasing,
 		resolver: tsResolver
@@ -1406,7 +1464,7 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		resolver: tsResolver
 	});
 	const queryOptionsParamsCall = callPrinter.print(queryOptionsParamsNode) ?? "";
-	const paramsNode = getParams(node, {
+	const paramsNode = buildSuspenseQueryParamsNode(node, {
 		paramsType,
 		paramsCasing,
 		pathParamsType,
@@ -1424,15 +1482,14 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 			generics: generics.join(", "),
 			params: paramsSignature,
 			returnType: void 0,
-			JSDoc: { comments: getComments(node) },
+			JSDoc: { comments: buildOperationComments(node) },
 			children: `
        const { query: queryConfig = {}, client: config = {} } = options ?? {}
        const { client: queryClient, ...resolvedOptions } = queryConfig
-       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})
-       ${customOptions ? `const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
+       const queryKey = resolvedOptions?.queryKey ?? ${queryKeyName}(${queryKeyParamsCall})${customOptions ? `\n       const customOptions = ${customOptions.name}({ hookName: '${name}', operationId: '${node.operationId}' })` : ""}
 
        const query = useSuspenseQuery({
-        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n...customOptions," : ""}
+        ...${queryOptionsName}(${queryOptionsParamsCall}),${customOptions ? "\n        ...customOptions," : ""}
         ...resolvedOptions,
         queryKey,
        } as unknown as UseSuspenseQueryOptions, queryClient) as ${returnType}
@@ -1444,8 +1501,7 @@ function SuspenseQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 		})
 	});
 }
-SuspenseQuery.getParams = getParams;
 //#endregion
-export { Mutation as a, InfiniteQuery as c, transformName as d, QueryKey as f, Query as i, QueryOptions as l, camelCase as m, SuspenseInfiniteQueryOptions as n, MutationOptions as o, MutationKey as p, SuspenseInfiniteQuery as r, InfiniteQueryOptions as s, SuspenseQuery as t, resolveOperationOverrides as u };
+export { operationFileEntry as _, Mutation as a, InfiniteQuery as c, queryKeyTransformer as d, resolveOperationOverrides as f, getOperationParameters as g, mutationKeyTransformer as h, Query as i, QueryOptions as l, MutationKey as m, SuspenseInfiniteQueryOptions as n, MutationOptions as o, resolveZodSchemaNames as p, SuspenseInfiniteQuery as r, InfiniteQueryOptions as s, SuspenseQuery as t, QueryKey as u, resolveOperationTypeNames as v, camelCase as y };
 
-//# sourceMappingURL=components-DTGLu4UV.js.map
+//# sourceMappingURL=components-DL0Cai7l.js.map