@kubb/plugin-react-query 5.0.0-beta.80 → 5.0.0-beta.84

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
+import { Exclude, Group, Include, Output, OutputOptions, Override, PluginFactoryOptions, Resolver, ast } from "kubb/kit";
 //#region ../../internals/client/src/resolveClient.d.ts
 /**
  * Resolves which client plugin a consumer (react-query, vue-query, swr, mcp) should call for an
@@ -326,7 +170,7 @@ type Query = {
    * HTTP methods treated as queries. Operations using these methods produce
    * `useQuery`-style hooks.
    *
-   * @default ['get']
+   * @default ['GET']
    */
   methods?: Array<string>;
   /**
@@ -343,7 +187,7 @@ type Mutation = {
    * HTTP methods treated as mutations. Operations using these methods produce
    * `useMutation`-style hooks.
    *
-   * @default ['post', 'put', 'delete']
+   * @default ['POST', 'PUT', 'PATCH', 'DELETE']
    */
   methods?: Array<string>;
   /**
@@ -387,8 +231,8 @@ type Infinite = {
 };
 type CustomOptions = {
   /**
-   * Module specifier of your custom-options hook. Imported as
-   * `import ${name} from '${importPath}'`.
+   * Module specifier of your custom-options hook. Imported as a named import,
+   * `import { ${name} } from '${importPath}'`.
    */
   importPath: string;
   /**
@@ -430,7 +274,7 @@ type Options = OutputOptions & {
   override?: Array<Override<ResolvedOptions>>;
   /**
    * Enables `useInfiniteQuery` hooks 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
    */
@@ -465,12 +309,6 @@ type Options = OutputOptions & {
    * `HookOptions` type so the wrapper stays in sync with generated hooks.
    */
   customOptions?: CustomOptions;
-  /**
-   * Validator applied to response bodies before they reach the caller.
-   * - `'client'` — no validation. Trusts the API.
-   * - `'zod'` — pipes responses through schemas from `@kubb/plugin-zod`.
-   */
-  validator?: Options$1['validator'];
   /**
    * Override how hook names and file paths are built. Methods you omit fall
    * back to the default `resolverReactQuery`.
@@ -509,9 +347,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;
   suspense: Suspense | false;
@@ -540,13 +377,13 @@ declare global {
 declare const pluginReactQueryName = "plugin-react-query";
 /**
  * Generates one TanStack Query hook per OpenAPI operation for React. Queries
- * become `useFooQuery`/`useFooSuspenseQuery`/`useFooInfiniteQuery`; mutations
- * become `useFooMutation`. Each hook is fully typed: query keys, input
+ * become `useFoo`, with `useFooSuspense` and `useFooInfinite` variants.
+ * Mutations become `useFoo`. Each hook is fully typed: query keys, input
  * variables, response data, and error shape all come from the spec.
  *
  * @example
  * ```ts
- * import { defineConfig } from 'kubb'
+ * import { defineConfig } from 'kubb/config'
  * import { pluginTs } from '@kubb/plugin-ts'
  * import { pluginReactQuery } from '@kubb/plugin-react-query'
  *
@@ -563,7 +400,7 @@ declare const pluginReactQueryName = "plugin-react-query";
  * })
  * ```
  */
-declare const pluginReactQuery: (options?: Options | undefined) => import("@kubb/core").Plugin<PluginReactQuery>;
+declare const pluginReactQuery: (options?: Options | undefined) => import("kubb/kit").Plugin<PluginReactQuery>;
 //#endregion
 export { type PluginReactQuery, pluginReactQuery as default, pluginReactQuery, pluginReactQueryName };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -1,12 +1,10 @@
 import "./rolldown-runtime-C0LytTxp.js";
 import path from "node:path";
-import { ast, defineGenerator, definePlugin, defineResolver } from "@kubb/core";
+import { ast, defineGenerator, definePlugin, defineResolver } from "kubb/kit";
 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 { File, Function, Type, jsxRenderer } from "kubb/jsx";
+import { Fragment, jsx, jsxs } from "kubb/jsx/jsx-runtime";
 import fs from "node:fs";
-import { getNestedAccessor } from "@kubb/ast/utils";
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -530,16 +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
@@ -782,51 +770,6 @@ function resolveOperationOverrides(node, override) {
 	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;
-}
-/**
-* 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));
-}
-/**
 * Build QueryKey params as the grouped `{ path, query, body }` object (NO headers, NO config),
 * typed from the operation's `RequestConfig` minus `url`. The query key transformer reads the
 * grouped `path`/`query`/`body` bindings.
@@ -1317,8 +1260,8 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	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;
+			const nextAccessor = nextParam ? ast.getNestedAccessor(nextParam, "lastPage") : null;
+			const prevAccessor = previousParam ? ast.getNestedAccessor(previousParam, "firstPage") : null;
 			return [nextAccessor ? `getNextPageParam: (lastPage) => ${nextAccessor}` : null, prevAccessor ? `getPreviousPageParam: (firstPage) => ${prevAccessor}` : null];
 		}
 		if (cursorParam) return [`getNextPageParam: (lastPage) => lastPage['${cursorParam}']`, `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`];
@@ -1677,8 +1620,8 @@ function SuspenseInfiniteQueryOptions({ name, clientName, initialPageParam, curs
 	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;
+			const nextAccessor = nextParam ? ast.getNestedAccessor(nextParam, "lastPage") : null;
+			const prevAccessor = previousParam ? ast.getNestedAccessor(previousParam, "firstPage") : null;
 			return [nextAccessor ? `getNextPageParam: (lastPage) => ${nextAccessor}` : null, prevAccessor ? `getPreviousPageParam: (firstPage) => ${prevAccessor}` : null];
 		}
 		if (cursorParam) return [`getNextPageParam: (lastPage) => lastPage['${cursorParam}']`, `getPreviousPageParam: (firstPage) => firstPage['${cursorParam}']`];
@@ -1816,7 +1759,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, customOptions, hooks } = ctx.options;
+		const { output, query, mutation, infinite, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1866,14 +1809,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,
@@ -1896,11 +1831,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,
@@ -1994,7 +1924,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, customOptions, hooks } = ctx.options;
+		const { output, query, mutation, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2030,14 +1960,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;
 		return /* @__PURE__ */ jsxs(File, {
 			baseName: meta.file.baseName,
@@ -2060,11 +1982,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,
@@ -2143,7 +2060,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, customOptions, hooks } = ctx.options;
+		const { output, query, mutation, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2181,14 +2098,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,
@@ -2211,11 +2120,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,
@@ -2289,7 +2193,7 @@ const queryGenerator = defineGenerator({
 /**
 * Built-in generator for `useSuspenseInfiniteQuery` hooks. Enabled when both
 * `suspense` and `infinite` are configured. Combines suspense semantics with
-* cursor-based pagination — handlers throw promises while loading and pull
+* cursor-based pagination. Handlers throw promises while loading and pull
 * additional pages on demand.
 */
 const suspenseInfiniteQueryGenerator = defineGenerator({
@@ -2298,7 +2202,7 @@ const suspenseInfiniteQueryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, infinite, suspense, validator, client, group, customOptions, hooks } = ctx.options;
+		const { output, query, mutation, infinite, suspense, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2348,14 +2252,6 @@ const suspenseInfiniteQueryGenerator = 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,
@@ -2378,11 +2274,6 @@ const suspenseInfiniteQueryGenerator = 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,
@@ -2477,7 +2368,7 @@ const suspenseQueryGenerator = defineGenerator({
 	operation(node, ctx) {
 		if (!ast.isHttpOperationNode(node)) return null;
 		const { config, driver, resolver, root } = ctx;
-		const { output, query, mutation, suspense, validator, client, group, customOptions, hooks } = ctx.options;
+		const { output, query, mutation, suspense, client, group, customOptions, hooks } = ctx.options;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -2515,14 +2406,6 @@ const suspenseQueryGenerator = 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,
@@ -2545,11 +2428,6 @@ const suspenseQueryGenerator = 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,
@@ -2625,8 +2503,8 @@ function capitalize(name) {
 }
 /**
 * Default resolver used by `@kubb/plugin-react-query`. Decides the names and
-* file paths for every generated TanStack Query hook (`useFooQuery`,
-* `useFooMutation`, `useFooInfiniteQuery`, ...) and its companion helpers
+* file paths for every generated TanStack Query hook (`useFoo`,
+* `useFooSuspense`, `useFooInfinite`, ...) and its companion helpers
 * (`fooQueryKey`, `fooQueryOptions`).
 *
 * Functions and files use camelCase; hooks get the `use` prefix; suspense and
@@ -2742,13 +2620,13 @@ const resolverReactQuery = defineResolver(() => ({
 const pluginReactQueryName = "plugin-react-query";
 /**
 * Generates one TanStack Query hook per OpenAPI operation for React. Queries
-* become `useFooQuery`/`useFooSuspenseQuery`/`useFooInfiniteQuery`; mutations
-* become `useFooMutation`. Each hook is fully typed: query keys, input
+* become `useFoo`, with `useFooSuspense` and `useFooInfinite` variants.
+* Mutations become `useFoo`. Each hook is fully typed: query keys, input
 * variables, response data, and error shape all come from the spec.
 *
 * @example
 * ```ts
-* import { defineConfig } from 'kubb'
+* import { defineConfig } from 'kubb/config'
 * import { pluginTs } from '@kubb/plugin-ts'
 * import { pluginReactQuery } from '@kubb/plugin-react-query'
 *
@@ -2769,7 +2647,7 @@ const pluginReactQuery = definePlugin((options) => {
 	const { output = {
 		path: "hooks",
 		barrel: { type: "named" }
-	}, group, exclude = [], include, override = [], validator = false, suspense = {}, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, customOptions, hooks = false, client, resolver: userResolver, macros: userMacros } = options;
+	}, group, exclude = [], include, override = [], suspense = {}, infinite = false, mutation = {}, query = {}, mutationKey = mutationKeyTransformer, queryKey = queryKeyTransformer, customOptions, hooks = false, client, resolver: userResolver, macros: userMacros } = options;
 	const selectedGenerators = [
 		queryGenerator,
 		suspenseQueryGenerator,
@@ -2783,7 +2661,7 @@ const pluginReactQuery = definePlugin((options) => {
 	return {
 		name: pluginReactQueryName,
 		options,
-		dependencies: [pluginTsName, isValidatorEnabled(validator) ? pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverReactQuery,
@@ -2804,17 +2682,17 @@ const pluginReactQuery = definePlugin((options) => {
 				queryKey,
 				query: query === false ? false : {
 					importPath: "@tanstack/react-query",
-					methods: ["get"],
+					methods: ["GET"],
 					...query
 				},
 				mutationKey,
 				mutation: mutation === false ? false : {
 					importPath: "@tanstack/react-query",
 					methods: [
-						"post",
-						"put",
-						"patch",
-						"delete"
+						"POST",
+						"PUT",
+						"PATCH",
+						"DELETE"
 					],
 					...mutation
 				},
@@ -2832,7 +2710,6 @@ const pluginReactQuery = definePlugin((options) => {
 					...customOptions
 				} : null,
 				hooks,
-				validator,
 				group: groupConfig,
 				exclude,
 				include,