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

package/dist/index.d.ts

@@ -1,161 +1,5 @@
 import { t as __name } from "./rolldown-runtime-C0LytTxp.js";
 import { Exclude, Group, Include, Output, OutputOptions, Override, PluginFactoryOptions, Resolver, ast } from "@kubb/core";
-//#region ../../internals/client/src/types.d.ts
-/**
- * Validator applied to request and response bodies using schemas from `@kubb/plugin-zod`.
- * - `false`: no validation.
- * - `'zod'`: validates the success (2xx) response body, and the error body when a non-2xx call does
- *   not throw (`throwOnError: false`).
- * - `{ request?: 'zod'; response?: 'zod' }`: opt in per direction. `request` validates the request
- *   body and query parameters before the call; `response` validates the success response body and,
- *   on the non-throw path, the error body.
- */
-type ValidatorOptions = false | 'zod' | {
-  request?: 'zod';
-  response?: 'zod';
-};
-/**
- * How the class-based SDK groups operations.
- * - `'tag'`: one class per tag, optionally composed into a root client.
- * - `'flat'`: one class with every operation as a direct method.
- */
-type Mode = 'tag' | 'flat';
-/**
- * The resolver shared by the client plugins. Functions and files use camelCase; URL helpers get
- * a `get<Operation>Url` name.
- */
-type ResolverClient = Resolver & {
-  /**
-   * Resolves the function name for a raw operation name.
-   *
-   * @example
-   * `resolver.resolveName('show pet by id') // -> 'showPetById'`
-   */
-  resolveName(this: ResolverClient, name: string): string;
-  /**
-   * Resolves the output file name for a generated client module.
-   */
-  resolvePathName(this: ResolverClient, name: string, type?: 'file' | 'function' | 'type' | 'const'): string;
-  /**
-   * Resolves the generated class name for class-based clients.
-   */
-  resolveClassName(this: ResolverClient, name: string): string;
-  /**
-   * Resolves the generated class name for a tag-based client group. The default appends a
-   * `Client` suffix (tag `pet` becomes `PetClient`) so the class never collides with the schema
-   * model of the same name in the barrel.
-   *
-   * @example
-   * `resolver.resolveGroupName('pet') // -> 'PetClient'`
-   */
-  resolveGroupName(this: ResolverClient, name: string): string;
-  /**
-   * Resolves the property name a tag client is exposed under on the composed root SDK
-   * (`new PetStore(config).pet`).
-   */
-  resolveClientPropertyName(this: ResolverClient, name: string): string;
-};
-/**
- * The shared options surface for the client plugins. Deliberately small: there is one
- * response contract and one grouped options object. Each plugin extends this with its own
- * `transport` field.
- */
-type Options$1 = OutputOptions & {
-  /**
-   * Skip operations matching at least one entry in the list.
-   */
-  exclude?: Array<Exclude>;
-  /**
-   * Restrict generation to operations matching at least one entry in the list.
-   */
-  include?: Array<Include>;
-  /**
-   * Apply a different options object to operations matching a pattern.
-   */
-  override?: Array<Override<ResolvedOptions$1>>;
-  /**
-   * Base URL prepended to every request. When omitted, falls back to the adapter's server URL.
-   */
-  baseURL?: string;
-  /**
-   * Validate request and response bodies with schemas from `@kubb/plugin-zod`.
-   *
-   * @default false
-   */
-  validator?: ValidatorOptions;
-  /**
-   * Generates a class-based SDK instead of the standalone functions. Each tag client is an instance
-   * class whose constructor takes a client config and builds its own client, so every environment is
-   * a separate instance. Leave `sdk` unset to keep the standalone per-operation functions (the
-   * default), which is also what query plugins consume.
-   *
-   * @example Instance class per tag
-   * ```ts
-   * pluginFetch({ sdk: {} })
-   * // const api = new PetClient({ baseURL: 'https://api.example.com' })
-   * // await api.getPetById({ path: { petId: 1 } })
-   * ```
-   * @example Composed root that instantiates every tag client from one config
-   * ```ts
-   * pluginFetch({ sdk: { name: 'petStore' } })
-   * // class PetStore {
-   * //   readonly pet: PetClient
-   * //   readonly store: StoreClient
-   * //   constructor(config = {}) { ... }
-   * // }
-   * // const api = new PetStore({ baseURL })
-   * // await api.pet.getPetById({ path: { petId: 1 } })
-   * ```
-   * @example Flat class with every operation as a direct method
-   * ```ts
-   * pluginFetch({ sdk: { name: 'petStore', mode: 'flat' } })
-   * // const api = new PetStore({ baseURL })
-   * // await api.getPetById({ path: { petId: 1 } })
-   * ```
-   */
-  sdk?: {
-    /**
-     * How the SDK groups operations.
-     * - `'tag'`: one class per tag. With `name`, a composed root instantiates every tag client.
-     * - `'flat'`: one class named by `name`, with every operation as a direct method.
-     *
-     * @default 'tag'
-     */
-    mode?: Mode;
-    /**
-     * Name of the generated entry point, also the file name. With `mode: 'tag'` it emits a
-     * composed root class that instantiates every tag client from one shared config. With
-     * `mode: 'flat'` it names the single class.
-     */
-    name?: string;
-  };
-  /**
-   * Override how names and file paths are built. Methods you omit fall back to the default resolver.
-   */
-  resolver?: Partial<ResolverClient> & ThisType<ResolverClient>;
-  /**
-   * Macros applied to each operation node before code is printed.
-   */
-  macros?: Array<ast.Macro>;
-};
-/**
- * The resolved options after defaults are applied.
- */
-type ResolvedOptions$1 = {
-  output: Output;
-  exclude: Array<Exclude>;
-  include: Array<Include> | undefined;
-  override: Array<Override<ResolvedOptions$1>>;
-  group: Group | null;
-  baseURL: Options$1['baseURL'];
-  validator: NonNullable<Options$1['validator']>;
-  sdk: {
-    mode: Mode;
-    name: string | undefined;
-  } | undefined;
-  resolver: ResolverClient;
-};
-//#endregion
 //#region ../../internals/client/src/resolveClient.d.ts
 /**
  * Resolves which client plugin a consumer (react-query, vue-query, swr, mcp) should call for an
@@ -179,6 +23,10 @@ type ResolvedOptions$1 = {
 type ClientSelector = 'fetch' | 'axios';
 //#endregion
 //#region src/types.d.ts
+/**
+ * Builds the parts of a query or mutation key for one operation. Receives the operation node and
+ * the resolved `paramsCasing` setting and returns the key elements in order.
+ */
 type Transformer = (props: {
   node: ast.OperationNode;
   casing: 'camelcase' | undefined;
@@ -281,7 +129,7 @@ type Mutation = {
   /**
    * HTTP methods treated as mutations.
    *
-   * @default ['post', 'put', 'delete']
+   * @default ['post', 'put', 'patch', 'delete']
    */
   methods?: Array<string>;
   /**
@@ -355,7 +203,7 @@ type Options = OutputOptions & {
   override?: Array<Override<ResolvedOptions>>;
   /**
    * Enables `useInfiniteQuery` composables for cursor- or page-based pagination.
-   * Pass an object to configure how the cursor is read; pass `false` to skip.
+   * Pass an object to configure how the cursor is read, or pass `false` to skip.
    *
    * @default false
    */
@@ -377,19 +225,13 @@ type Options = OutputOptions & {
    * Configures mutation composables. Set to `false` to skip mutation generation.
    */
   mutation?: Partial<Mutation> | false;
-  /**
-   * Validator applied to response bodies before they reach the caller.
-   * - `'client'` — no validation.
-   * - `'zod'` — pipes responses through schemas from `@kubb/plugin-zod`.
-   */
-  validator?: Options$1['validator'];
   /**
    * Override how composable names and file paths are built.
    */
   resolver?: Partial<ResolverVueQuery> & ThisType<ResolverVueQuery>;
   /**
    * Set to `false` to skip generating `use*` composable functions. `queryOptions`,
-   * `mutationOptions`, `queryKey`, and `mutationKey` helpers are still emitted.
+   * `queryKey`, and `mutationKey` helpers are still emitted.
    *
    * @default false
    */
@@ -417,9 +259,8 @@ type ResolvedOptions = {
    * The resolved contract client the generators import and call.
    */
   client: ResolvedClient;
-  validator: NonNullable<Options['validator']>;
   /**
-   * Only used for infinite
+   * Resolved infinite query configuration, or `false` when infinite queries are disabled.
    */
   infinite: NonNullable<Infinite> | false;
   queryKey: QueryKey | null;
@@ -447,7 +288,7 @@ declare 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

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 }) => {
@@ -746,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 [];
@@ -804,6 +655,99 @@ const queryKeyTransformer = ({ node }) => {
 	].filter(Boolean);
 };
 //#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 src/utils.ts
 const requestGroupOrder = [
 	"path",
@@ -1248,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, hooks } = 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);
@@ -1298,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,
@@ -1328,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,
@@ -1430,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, hooks } = 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);
@@ -1465,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;
@@ -1497,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,
@@ -1569,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, hooks } = 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);
@@ -1607,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,
@@ -1637,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,
@@ -1797,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
@@ -1822,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, hooks = false, 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,
@@ -1832,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,
@@ -1876,7 +1781,6 @@ const pluginVueQuery = definePlugin((options) => {
 					...infinite
 				} : false,
 				hooks,
-				validator,
 				group: groupConfig,
 				exclude,
 				include,