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

package/dist/index.js

@@ -2,7 +2,6 @@ import "./rolldown-runtime-C0LytTxp.js";
 import path from "node:path";
 import { ast, defineGenerator, definePlugin, defineResolver } from "@kubb/core";
 import { createFunctionParameter, createFunctionParameters, createObjectBindingPattern, createTypeLiteral, functionPrinter, pluginTsName } from "@kubb/plugin-ts";
-import { pluginZodName } from "@kubb/plugin-zod";
 import { File, Function, Type, jsxRenderer } from "@kubb/renderer-jsx";
 import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
 import { getNestedAccessor } from "@kubb/ast/utils";
@@ -529,109 +528,6 @@ function createGroupConfig(group) {
 	};
 }
 //#endregion
-//#region ../../internals/client/src/builders/validatorOptions.ts
-/**
-* Returns `true` when any direction of the validator uses zod (used for dependency checks).
-*/
-function isValidatorEnabled(validator) {
-	if (!validator) return false;
-	if (validator === "zod") return true;
-	return Boolean(validator.request || validator.response);
-}
-//#endregion
-//#region ../../internals/client/src/resolveClient.ts
-/**
-* Resolves which client plugin a consumer (react-query, vue-query, swr, mcp) should call for an
-* operation, shared so the selection rules and diagnostics stay in one place.
-*
-* Every client runtime lives in a dedicated client plugin, so a consumer always calls a registered
-* contract client plugin (plugin-fetch or plugin-axios) and never emits its own inline client:
-*
-* - `contract` — a registered contract client plugin owns the `<op>` functions and the consumer
-*   imports and calls them.
-* - `error` — no client plugin is registered, several are registered without a selector, or the
-*   requested one is missing.
-*
-* The `client` string selects explicitly (`'fetch'` / `'axios'`); when it is unset a lone registered
-* contract client plugin is picked up automatically.
-*/
-const pluginFetchName = "plugin-fetch";
-const pluginAxiosName = "plugin-axios";
-const selectorToPlugin = {
-	fetch: pluginFetchName,
-	axios: pluginAxiosName
-};
-const contractPlugins = [pluginFetchName, pluginAxiosName];
-/**
-* Applies the `client` resolution rules. See the module comment for the strategy shape.
-*
-* @example
-* ```ts
-* resolveClient({ client: 'fetch', pluginNames: ['plugin-ts', 'plugin-fetch'] })
-* // { kind: 'contract', pluginName: 'plugin-fetch' }
-* ```
-*
-* @example
-* ```ts
-* resolveClient({ client: undefined, pluginNames: ['plugin-ts'] })
-* // { kind: 'error', message: 'No client plugin is registered…' }
-* ```
-*/
-function resolveClient(options) {
-	const { client, pluginNames } = options;
-	const has = (name) => pluginNames.includes(name);
-	if (client === "fetch" || client === "axios") {
-		const pluginName = selectorToPlugin[client];
-		if (!has(pluginName)) return {
-			kind: "error",
-			message: `\`client: '${client}'\` is set but \`@kubb/plugin-${client}\` is not registered in \`plugins\`. Add it, or drop \`client\` to use a different client plugin.`
-		};
-		return {
-			kind: "contract",
-			pluginName
-		};
-	}
-	const registered = contractPlugins.filter(has);
-	if (registered.length === 1) return {
-		kind: "contract",
-		pluginName: registered[0]
-	};
-	if (registered.length > 1) return {
-		kind: "error",
-		message: `Multiple client plugins are registered (${registered.map((name) => `\`@kubb/${name}\``).join(", ")}). Set \`client: 'fetch' | 'axios'\` to choose which client the hooks call, or register a single client plugin.`
-	};
-	return {
-		kind: "error",
-		message: "No client plugin is registered. Add `@kubb/plugin-axios` or `@kubb/plugin-fetch` to `plugins` so the generated code has an HTTP client to call."
-	};
-}
-//#endregion
-//#region ../../internals/client/src/resolveClientOperation.ts
-/**
-* Resolves the contract client `<op>` a consumer (query hook, MCP handler) imports, by looking up
-* the registered contract client plugin's resolver and output. Works for any contract client plugin
-* (plugin-fetch or plugin-axios). Returns `null` when no contract plugin is in play (the inline
-* path). The plugin injects `.kubb/client.ts` at the global output root, the same path consumers
-* read `RequestConfig` / `ResponseErrorConfig` from.
-*/
-function resolveClientOperation(options) {
-	const { clientPlugin, driver, node, root, output } = options;
-	if (!clientPlugin) return null;
-	const resolver = driver.getResolver(clientPlugin.pluginName);
-	if (!resolver) return null;
-	const plugin = driver.getPlugin(clientPlugin.pluginName);
-	const file = resolver.resolveFile(operationFileEntry(node, node.operationId), {
-		root,
-		output: plugin?.options?.output ?? output,
-		group: plugin?.options?.group ?? void 0
-	});
-	return {
-		name: resolver.resolveName(node.operationId),
-		path: file.path,
-		clientPath: path.resolve(root, ".kubb/client.ts")
-	};
-}
-//#endregion
 //#region ../../internals/tanstack-query/src/components/MutationKey.tsx
 const declarationPrinter$7 = functionPrinter({ mode: "declaration" });
 const mutationKeyTransformer = ({ node }) => {
@@ -671,6 +567,19 @@ const requestGroupOrder$1 = [
 	"headers"
 ];
 /**
+* Widens a request-group member type so a generated TanStack hook accepts either the value or a
+* deferred value. Both plugins apply this through the `memberTypeWrapper` of `buildGroupedRequestParam`;
+* they only differ in how the deferred form is later resolved.
+*
+* `maybeRefOrGetter` is used by vue-query, which keeps the ref/getter live and unwraps it lazily with
+* `toValue` because vue-query keys are reactive. `maybeValueOrGetter` is used by react-query, which
+* resolves the getter once at the hook boundary and forwards a plain value because React Query hashes
+* keys structurally and cannot hold a function.
+*/
+function maybeRefOrGetter(type) {
+	return `MaybeRefOrGetter<${type}>`;
+}
+/**
 * Builds the grouped `{ path, query, body, headers }` parameter that mirrors the client
 * function signature. Only the groups the operation carries are emitted, typed from the
 * operation's `RequestConfig`. `keys` narrows the emitted groups, used by the query key which
@@ -733,51 +642,6 @@ function buildQueryOptionsParams(node, options) {
 		default: "{}"
 	})].filter((param) => param !== null) });
 }
-/**
-* Returns `'zod'` when response-direction parsing is enabled.
-* The string shorthand `'zod'` also enables response parsing.
-*/
-function resolveResponseParser(parser) {
-	if (!parser) return null;
-	if (parser === "zod") return "zod";
-	return parser.response ?? null;
-}
-/**
-* Returns `'zod'` when request body parsing is enabled.
-* The string shorthand `'zod'` also enables request body parsing (existing behavior).
-*/
-function resolveRequestParser(parser) {
-	if (!parser) return null;
-	if (parser === "zod") return "zod";
-	return parser.request ?? null;
-}
-/**
-* Returns `'zod'` when query-params parsing is enabled.
-* Only the object form `{ request: 'zod' }` enables this. `parser: 'zod'` does not.
-*/
-function resolveQueryParamsParser(parser) {
-	if (!parser || parser === "zod") return null;
-	return parser.request ?? null;
-}
-/**
-* Collects the Zod schema import names for an operation based on the active parser directions.
-*
-* - `parser: 'zod'`: response and request body names (backward-compatible behavior).
-* - `parser: { request: 'zod' }`: request body and query params names.
-* - `parser: { response: 'zod' }`: response name only.
-* - `parser: { request: 'zod', response: 'zod' }`: all three.
-*
-* Returns an empty array when no resolver is provided or `parser` is falsy.
-*/
-function resolveZodSchemaNames(node, zodResolver, parser) {
-	if (!zodResolver || !parser) return [];
-	const { query: queryParams } = getOperationParameters(node, { paramsCasing: "original" });
-	return [
-		resolveResponseParser(parser) === "zod" ? zodResolver.resolveResponseName?.(node) : null,
-		resolveRequestParser(parser) === "zod" && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null,
-		resolveQueryParamsParser(parser) === "zod" && queryParams.length > 0 ? zodResolver.resolveQueryParamsName?.(node, queryParams[0]) : null
-	].filter((n) => Boolean(n));
-}
 functionPrinter({ mode: "declaration" });
 const queryKeyTransformer = ({ node }) => {
 	if (!node.path) return [];
@@ -791,13 +655,100 @@ const queryKeyTransformer = ({ node }) => {
 	].filter(Boolean);
 };
 //#endregion
-//#region src/utils.ts
+//#region ../../internals/client/src/resolveClient.ts
+/**
+* Resolves which client plugin a consumer (react-query, vue-query, swr, mcp) should call for an
+* operation, shared so the selection rules and diagnostics stay in one place.
+*
+* Every client runtime lives in a dedicated client plugin, so a consumer always calls a registered
+* contract client plugin (plugin-fetch or plugin-axios) and never emits its own inline client:
+*
+* - `contract` — a registered contract client plugin owns the `<op>` functions and the consumer
+*   imports and calls them.
+* - `error` — no client plugin is registered, several are registered without a selector, or the
+*   requested one is missing.
+*
+* The `client` string selects explicitly (`'fetch'` / `'axios'`); when it is unset a lone registered
+* contract client plugin is picked up automatically.
+*/
+const pluginFetchName = "plugin-fetch";
+const pluginAxiosName = "plugin-axios";
+const selectorToPlugin = {
+	fetch: pluginFetchName,
+	axios: pluginAxiosName
+};
+const contractPlugins = [pluginFetchName, pluginAxiosName];
 /**
-* Wraps a type string in `MaybeRefOrGetter<…>` so a vue-query signature accepts refs or getters.
+* Applies the `client` resolution rules. See the module comment for the strategy shape.
+*
+* @example
+* ```ts
+* resolveClient({ client: 'fetch', pluginNames: ['plugin-ts', 'plugin-fetch'] })
+* // { kind: 'contract', pluginName: 'plugin-fetch' }
+* ```
+*
+* @example
+* ```ts
+* resolveClient({ client: undefined, pluginNames: ['plugin-ts'] })
+* // { kind: 'error', message: 'No client plugin is registered…' }
+* ```
 */
-function maybeRefOrGetter(type) {
-	return `MaybeRefOrGetter<${type}>`;
+function resolveClient(options) {
+	const { client, pluginNames } = options;
+	const has = (name) => pluginNames.includes(name);
+	if (client === "fetch" || client === "axios") {
+		const pluginName = selectorToPlugin[client];
+		if (!has(pluginName)) return {
+			kind: "error",
+			message: `\`client: '${client}'\` is set but \`@kubb/plugin-${client}\` is not registered in \`plugins\`. Add it, or drop \`client\` to use a different client plugin.`
+		};
+		return {
+			kind: "contract",
+			pluginName
+		};
+	}
+	const registered = contractPlugins.filter(has);
+	if (registered.length === 1) return {
+		kind: "contract",
+		pluginName: registered[0]
+	};
+	if (registered.length > 1) return {
+		kind: "error",
+		message: `Multiple client plugins are registered (${registered.map((name) => `\`@kubb/${name}\``).join(", ")}). Set \`client: 'fetch' | 'axios'\` to choose which client the hooks call, or register a single client plugin.`
+	};
+	return {
+		kind: "error",
+		message: "No client plugin is registered. Add `@kubb/plugin-axios` or `@kubb/plugin-fetch` to `plugins` so the generated code has an HTTP client to call."
+	};
+}
+//#endregion
+//#region ../../internals/client/src/resolveClientOperation.ts
+/**
+* Resolves the contract client `<op>` a consumer (query hook, MCP handler) imports, by looking up
+* the registered contract client plugin's resolver and output. Works for any contract client plugin
+* (plugin-fetch or plugin-axios). Returns `null` when no contract plugin is in play (the inline
+* path). The plugin injects `.kubb/client.ts` at the global output root, the same path consumers
+* read `RequestConfig` / `ResponseErrorConfig` from.
+*/
+function resolveClientOperation(options) {
+	const { clientPlugin, driver, node, root, output } = options;
+	if (!clientPlugin) return null;
+	const resolver = driver.getResolver(clientPlugin.pluginName);
+	if (!resolver) return null;
+	const plugin = driver.getPlugin(clientPlugin.pluginName);
+	const file = resolver.resolveFile(operationFileEntry(node, node.operationId), {
+		root,
+		output: plugin?.options?.output ?? output,
+		group: plugin?.options?.group ?? void 0
+	});
+	return {
+		name: resolver.resolveName(node.operationId),
+		path: file.path,
+		clientPath: path.resolve(root, ".kubb/client.ts")
+	};
 }
+//#endregion
+//#region src/utils.ts
 const requestGroupOrder = [
 	"path",
 	"query",
@@ -1241,7 +1192,7 @@ const infiniteQueryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, validator, client, group } = ctx.options;
+		const { output, query, mutation, infinite, client, group, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1291,14 +1242,6 @@ const infiniteQueryGenerator = defineGenerator({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? 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
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -1321,11 +1264,6 @@ const infiniteQueryGenerator = defineGenerator({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -1380,30 +1318,32 @@ const infiniteQueryGenerator = defineGenerator({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: ["useInfiniteQuery"],
-					path: importPath
-				}),
-				/* @__PURE__ */ jsx(File.Import, {
-					name: [
-						"QueryKey",
-						"QueryClient",
-						"UseInfiniteQueryOptions",
-						"UseInfiniteQueryReturnType"
-					],
-					path: importPath,
-					isTypeOnly: true
-				}),
-				/* @__PURE__ */ jsx(InfiniteQuery, {
-					name: queryName,
-					queryOptionsName,
-					queryKeyName,
-					queryKeyTypeName,
-					node,
-					tsResolver,
-					initialPageParam: infiniteOptions.initialPageParam,
-					queryParam: infiniteOptions.queryParam
-				})
+				hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
+					/* @__PURE__ */ jsx(File.Import, {
+						name: ["useInfiniteQuery"],
+						path: importPath
+					}),
+					/* @__PURE__ */ jsx(File.Import, {
+						name: [
+							"QueryKey",
+							"QueryClient",
+							"UseInfiniteQueryOptions",
+							"UseInfiniteQueryReturnType"
+						],
+						path: importPath,
+						isTypeOnly: true
+					}),
+					/* @__PURE__ */ jsx(InfiniteQuery, {
+						name: queryName,
+						queryOptionsName,
+						queryKeyName,
+						queryKeyTypeName,
+						node,
+						tsResolver,
+						initialPageParam: infiniteOptions.initialPageParam,
+						queryParam: infiniteOptions.queryParam
+					})
+				] })
 			]
 		});
 	}
@@ -1421,7 +1361,7 @@ const mutationGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, validator, client, group } = ctx.options;
+		const { output, query, mutation, client, group, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1456,14 +1396,6 @@ const mutationGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? 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
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		const groups = getRequestGroups(node);
 		const hasRequestGroups = groups.path || groups.query || groups.body || groups.headers;
@@ -1488,11 +1420,6 @@ const mutationGenerator = defineGenerator({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -1524,7 +1451,7 @@ const mutationGenerator = defineGenerator({
 					node,
 					transformer: ctx.options.mutationKey
 				}),
-				mutation && /* @__PURE__ */ jsxs(Fragment, { children: [
+				mutation && hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
 						name: ["useMutation"],
 						path: importPath
@@ -1560,7 +1487,7 @@ const queryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, validator, client, group } = ctx.options;
+		const { output, query, mutation, client, group, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1598,14 +1525,6 @@ const queryGenerator = defineGenerator({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? 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
-		}) : null;
-		const zodSchemaNames = resolveZodSchemaNames(node, zodResolver, validator);
 		const calledClientName = contractOp.name;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -1628,11 +1547,6 @@ const queryGenerator = defineGenerator({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ jsx(File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
 				/* @__PURE__ */ jsx(File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
@@ -1677,7 +1591,7 @@ const queryGenerator = defineGenerator({
 					node,
 					tsResolver
 				}),
-				query && /* @__PURE__ */ jsxs(Fragment, { children: [
+				query && hooks && /* @__PURE__ */ jsxs(Fragment, { children: [
 					/* @__PURE__ */ jsx(File.Import, {
 						name: ["useQuery"],
 						path: importPath
@@ -1788,7 +1702,7 @@ const pluginVueQueryName = "plugin-vue-query";
 /**
 * Generates one TanStack Query composable per OpenAPI operation for Vue's
 * Composition API. Queries become `useFooQuery` (and optionally
-* `useFooInfiniteQuery`); mutations become `useFooMutation`. Each composable
+* `useFooInfiniteQuery`). Mutations become `useFooMutation`. Each composable
 * is fully typed end to end.
 *
 * @example
@@ -1813,7 +1727,7 @@ const pluginVueQuery = definePlugin((options) => {
 	const { output = {
 		path: "hooks",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], validator = false, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, client, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, hooks = false, client, resolver: userResolver, macros: userMacros } = options;
 	const selectedGenerators = [
 		queryGenerator,
 		infiniteQueryGenerator,
@@ -1823,7 +1737,7 @@ const pluginVueQuery = definePlugin((options) => {
 	return {
 		name: pluginVueQueryName,
 		options,
-		dependencies: [pluginTsName, isValidatorEnabled(validator) ? pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverVueQuery,
@@ -1866,7 +1780,7 @@ const pluginVueQuery = definePlugin((options) => {
 					previousParam: null,
 					...infinite
 				} : false,
-				validator,
+				hooks,
 				group: groupConfig,
 				exclude,
 				include,