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

package/dist/index.cjs

@@ -26,12 +26,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let node_path = require("node:path");
 node_path = __toESM(node_path, 1);
-let _kubb_core = require("@kubb/core");
+let kubb_kit = require("kubb/kit");
 let _kubb_plugin_ts = require("@kubb/plugin-ts");
-let _kubb_plugin_zod = require("@kubb/plugin-zod");
-let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
-let _kubb_renderer_jsx_jsx_runtime = require("@kubb/renderer-jsx/jsx-runtime");
-let _kubb_ast_utils = require("@kubb/ast/utils");
+let kubb_jsx = require("kubb/jsx");
+let kubb_jsx_jsx_runtime = require("kubb/jsx/jsx-runtime");
 //#region ../../internals/utils/src/casing.ts
 /**
 * Shared implementation for camelCase and PascalCase conversion.
@@ -555,109 +553,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: node_path.default.resolve(root, ".kubb/client.ts")
-	};
-}
-//#endregion
 //#region ../../internals/tanstack-query/src/components/MutationKey.tsx
 const declarationPrinter$7 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const mutationKeyTransformer = ({ node }) => {
@@ -671,11 +566,11 @@ function MutationKey({ name, node, transformer }) {
 		node,
 		casing: "camelcase"
 	});
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function.Arrow, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function.Arrow, {
 			name,
 			export: true,
 			params: paramsSignature,
@@ -772,51 +667,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));
-}
 (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 const queryKeyTransformer = ({ node }) => {
 	if (!node.path) return [];
@@ -830,6 +680,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: node_path.default.resolve(root, ".kubb/client.ts")
+	};
+}
+//#endregion
 //#region src/utils.ts
 const requestGroupOrder = [
 	"path",
@@ -876,23 +819,23 @@ function QueryKey({ name, node, tsResolver, typeName, transformer }) {
 		node,
 		casing: "camelcase"
 	});
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function.Arrow, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function.Arrow, {
 			name,
 			export: true,
 			params: paramsSignature,
 			singleLine: true,
 			children: `[${keys.join(", ")}] as const`
 		})
-	}), /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	}), /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name: typeName,
 		isExportable: true,
 		isIndexable: true,
 		isTypeOnly: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Type, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Type, {
 			name: typeName,
 			export: true,
 			children: `ReturnType<typeof ${name}>`
@@ -924,11 +867,11 @@ function QueryOptions({ name, clientName, node, tsResolver, queryKeyName }) {
 		signal: true
 	})}
           return data`;
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			params: paramsSignature,
@@ -990,11 +933,11 @@ function InfiniteQuery({ name, queryKeyTypeName, queryOptionsName, queryKeyName,
 	const queryOptionsParamsCall = callPrinter$3.print(queryOptionsParamsNode) ?? "";
 	const paramsNode = buildInfiniteQueryParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			generics: generics.join(", "),
@@ -1051,8 +994,8 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
 	const hasNewParams = nextParam != null || previousParam != null;
 	const [getNextPageParamExpr, getPreviousPageParamExpr] = (() => {
 		if (hasNewParams) {
-			const nextAccessor = nextParam ? (0, _kubb_ast_utils.getNestedAccessor)(nextParam, "lastPage") : null;
-			const prevAccessor = previousParam ? (0, _kubb_ast_utils.getNestedAccessor)(previousParam, "firstPage") : null;
+			const nextAccessor = nextParam ? kubb_kit.ast.getNestedAccessor(nextParam, "lastPage") : null;
+			const prevAccessor = previousParam ? kubb_kit.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}']`];
@@ -1067,11 +1010,11 @@ function InfiniteQueryOptions({ name, clientName, initialPageParam, cursorParam,
       ...(query ?? {}),
       ['${queryParam}']: pageParam as unknown as ${queryParamsTypeName}['${queryParam}'],
     } as ${queryParamsTypeName}` : "";
-	if (infiniteOverrideParams) return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	if (infiniteOverrideParams) return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			params: paramsSignature,
@@ -1088,11 +1031,11 @@ return infiniteQueryOptions<${queryFnDataType}, ${errorType}, InfiniteData<${que
 `
 		})
 	});
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			params: paramsSignature,
@@ -1160,11 +1103,11 @@ function Mutation({ name, clientName, node, tsResolver, mutationKeyName }) {
 	const mutationKeyParamsCall = callPrinter$1.print(mutationKeyParamsNode) ?? "";
 	const paramsNode = buildMutationParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter$1.print(paramsNode) ?? "";
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			params: paramsSignature,
@@ -1232,11 +1175,11 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 	const queryOptionsParamsCall = callPrinter.print(queryOptionsParamsNode) ?? "";
 	const paramsNode = buildQueryParamsNode(node, { resolver: tsResolver });
 	const paramsSignature = declarationPrinter.print(paramsNode) ?? "";
-	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
+	return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Source, {
 		name,
 		isExportable: true,
 		isIndexable: true,
-		children: /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.Function, {
+		children: /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.Function, {
 			name,
 			export: true,
 			generics: generics.join(", "),
@@ -1268,13 +1211,13 @@ function Query({ name, queryKeyTypeName, queryOptionsName, queryKeyName, node, t
 * composable per query operation, wiring the configured cursor path into
 * TanStack Query's cursor-based pagination.
 */
-const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
+const infiniteQueryGenerator = (0, kubb_kit.defineGenerator)({
 	name: "vue-query-infinite",
-	renderer: _kubb_renderer_jsx.jsxRenderer,
+	renderer: kubb_jsx.jsxRenderer,
 	operation(node, ctx) {
-		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
+		if (!kubb_kit.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(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1324,16 +1267,8 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				includeParams: false
 			})
 		].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.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__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
+		return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
@@ -1354,54 +1289,49 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
 					path: contractOp.path
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["RequestConfig", "ResponseErrorConfig"],
 					root: meta.file.path,
 					path: contractOp.clientPath,
 					isTypeOnly: true
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["toValue"],
 					path: "vue"
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["MaybeRefOrGetter"],
 					path: "vue",
 					isTypeOnly: true
 				}),
-				meta.fileTs && importedTypeNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				meta.fileTs && importedTypeNames.length > 0 && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: Array.from(new Set(importedTypeNames)),
 					root: meta.file.path,
 					path: meta.fileTs.path,
 					isTypeOnly: true
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(QueryKey, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(QueryKey, {
 					name: queryKeyName,
 					typeName: queryKeyTypeName,
 					node,
 					tsResolver,
 					transformer: ctx.options.queryKey
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["InfiniteData"],
 					isTypeOnly: true,
 					path: importPath
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["infiniteQueryOptions"],
 					path: importPath
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(InfiniteQueryOptions, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(InfiniteQueryOptions, {
 					name: queryOptionsName,
 					clientName: calledClientName,
 					queryKeyName,
@@ -1413,12 +1343,12 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 					initialPageParam: infiniteOptions.initialPageParam,
 					queryParam: infiniteOptions.queryParam
 				}),
-				hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				hooks && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 						name: ["useInfiniteQuery"],
 						path: importPath
 					}),
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 						name: [
 							"QueryKey",
 							"QueryClient",
@@ -1428,7 +1358,7 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(InfiniteQuery, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(InfiniteQuery, {
 						name: queryName,
 						queryOptionsName,
 						queryKeyName,
@@ -1450,13 +1380,13 @@ const infiniteQueryGenerator = (0, _kubb_core.defineGenerator)({
 * `useFooMutation` composable per POST/PUT/DELETE operation (configurable
 * via `mutation.methods`) plus the matching `fooMutationKey` helper.
 */
-const mutationGenerator = (0, _kubb_core.defineGenerator)({
+const mutationGenerator = (0, kubb_kit.defineGenerator)({
 	name: "vue-query-mutation",
-	renderer: _kubb_renderer_jsx.jsxRenderer,
+	renderer: kubb_jsx.jsxRenderer,
 	operation(node, ctx) {
-		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
+		if (!kubb_kit.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(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1491,18 +1421,10 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.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;
-		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
+		return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
@@ -1523,53 +1445,48 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
 					path: contractOp.path
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["RequestConfig", "ResponseErrorConfig"],
 					root: meta.file.path,
 					path: contractOp.clientPath,
 					isTypeOnly: true
 				}),
-				hasRequestGroups && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				hasRequestGroups && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["toValue"],
 					path: "vue"
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["MaybeRefOrGetter"],
 					path: "vue",
 					isTypeOnly: true
 				}),
-				meta.fileTs && importedTypeNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				meta.fileTs && importedTypeNames.length > 0 && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: Array.from(new Set(importedTypeNames)),
 					root: meta.file.path,
 					path: meta.fileTs.path,
 					isTypeOnly: true
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(MutationKey, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(MutationKey, {
 					name: mutationKeyName,
 					node,
 					transformer: ctx.options.mutationKey
 				}),
-				mutation && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				mutation && hooks && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 						name: ["useMutation"],
 						path: importPath
 					}),
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 						name: ["MutationObserverOptions", "QueryClient"],
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Mutation, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Mutation, {
 						name: mutationHookName,
 						clientName: calledClientName,
 						typeName: mutationTypeName,
@@ -1589,13 +1506,13 @@ const mutationGenerator = (0, _kubb_core.defineGenerator)({
 * composable per GET operation (configurable via `query.methods`) plus the
 * matching `fooQueryKey` / `fooQueryOptions` helpers.
 */
-const queryGenerator = (0, _kubb_core.defineGenerator)({
+const queryGenerator = (0, kubb_kit.defineGenerator)({
 	name: "vue-query",
-	renderer: _kubb_renderer_jsx.jsxRenderer,
+	renderer: kubb_jsx.jsxRenderer,
 	operation(node, ctx) {
-		if (!_kubb_core.ast.isHttpOperationNode(node)) return null;
+		if (!kubb_kit.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(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(_kubb_plugin_ts.pluginTsName);
@@ -1633,16 +1550,8 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 			order: "body-response-first",
 			includeParams: false
 		})].filter((name) => Boolean(name));
-		const pluginZod = isValidatorEnabled(validator) ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : null;
-		const zodResolver = pluginZod ? driver.getResolver(_kubb_plugin_zod.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__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx.File, {
+		return /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx.File, {
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
@@ -1663,61 +1572,56 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 				}
 			}),
 			children: [
-				fileZod && zodSchemaNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
-					name: zodSchemaNames,
-					root: meta.file.path,
-					path: fileZod.path
-				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: [contractOp.name],
 					root: meta.file.path,
 					path: contractOp.path
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["RequestConfig", "ResponseErrorConfig"],
 					root: meta.file.path,
 					path: contractOp.clientPath,
 					isTypeOnly: true
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["toValue"],
 					path: "vue"
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["MaybeRefOrGetter"],
 					path: "vue",
 					isTypeOnly: true
 				}),
-				meta.fileTs && importedTypeNames.length > 0 && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				meta.fileTs && importedTypeNames.length > 0 && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: Array.from(new Set(importedTypeNames)),
 					root: meta.file.path,
 					path: meta.fileTs.path,
 					isTypeOnly: true
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(QueryKey, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(QueryKey, {
 					name: queryKeyName,
 					typeName: queryKeyTypeName,
 					node,
 					tsResolver,
 					transformer: ctx.options.queryKey
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 					name: ["queryOptions"],
 					path: importPath
 				}),
-				/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(QueryOptions, {
+				/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(QueryOptions, {
 					name: queryOptionsName,
 					clientName: calledClientName,
 					queryKeyName,
 					node,
 					tsResolver
 				}),
-				query && hooks && /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsxs)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: [
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+				query && hooks && /* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsxs)(kubb_jsx_jsx_runtime.Fragment, { children: [
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 						name: ["useQuery"],
 						path: importPath
 					}),
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Import, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(kubb_jsx.File.Import, {
 						name: [
 							"QueryKey",
 							"QueryClient",
@@ -1727,7 +1631,7 @@ const queryGenerator = (0, _kubb_core.defineGenerator)({
 						path: importPath,
 						isTypeOnly: true
 					}),
-					/* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(Query, {
+					/* @__PURE__ */ (0, kubb_jsx_jsx_runtime.jsx)(Query, {
 						name: queryName,
 						queryOptionsName,
 						queryKeyName,
@@ -1747,8 +1651,8 @@ function capitalize(name) {
 }
 /**
 * Default resolver used by `@kubb/plugin-vue-query`. Decides the names and
-* file paths for every generated TanStack Query composable (`useFooQuery`,
-* `useFooMutation`, `useFooInfiniteQuery`) and its companion helpers.
+* file paths for every generated TanStack Query composable (`useFoo`,
+* `useFooInfinite`) and its companion helpers.
 *
 * Functions and files use camelCase; composables get the `use` prefix.
 *
@@ -1761,7 +1665,7 @@ function capitalize(name) {
 * resolverVueQuery.resolveQueryOptionsName(operationNode) // 'getPetByIdQueryOptions'
 * ```
 */
-const resolverVueQuery = (0, _kubb_core.defineResolver)(() => ({
+const resolverVueQuery = (0, kubb_kit.defineResolver)(() => ({
 	name: "default",
 	pluginName: "plugin-vue-query",
 	default(name, type) {
@@ -1822,13 +1726,13 @@ const resolverVueQuery = (0, _kubb_core.defineResolver)(() => ({
 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
+* Composition API. Queries become `useFoo` (and optionally
+* `useFooInfinite`). Mutations become `useFoo` as well. Each composable
 * is fully typed end to end.
 *
 * @example
 * ```ts
-* import { defineConfig } from 'kubb'
+* import { defineConfig } from 'kubb/config'
 * import { pluginTs } from '@kubb/plugin-ts'
 * import { pluginVueQuery } from '@kubb/plugin-vue-query'
 *
@@ -1844,11 +1748,11 @@ const pluginVueQueryName = "plugin-vue-query";
 * })
 * ```
 */
-const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
+const pluginVueQuery = (0, kubb_kit.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,
@@ -1858,7 +1762,7 @@ const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
 	return {
 		name: pluginVueQueryName,
 		options,
-		dependencies: [_kubb_plugin_ts.pluginTsName, isValidatorEnabled(validator) ? _kubb_plugin_zod.pluginZodName : void 0].filter((dependency) => Boolean(dependency)),
+		dependencies: [_kubb_plugin_ts.pluginTsName],
 		hooks: { "kubb:plugin:setup"(ctx) {
 			const resolver = userResolver ? {
 				...resolverVueQuery,
@@ -1879,17 +1783,17 @@ const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
 				queryKey,
 				query: query === false ? false : {
 					importPath: "@tanstack/vue-query",
-					methods: ["get"],
+					methods: ["GET"],
 					...query
 				},
 				mutationKey,
 				mutation: mutation === false ? false : {
 					importPath: "@tanstack/vue-query",
 					methods: [
-						"post",
-						"put",
-						"patch",
-						"delete"
+						"POST",
+						"PUT",
+						"PATCH",
+						"DELETE"
 					],
 					...mutation
 				},
@@ -1902,7 +1806,6 @@ const pluginVueQuery = (0, _kubb_core.definePlugin)((options) => {
 					...infinite
 				} : false,
 				hooks,
-				validator,
 				group: groupConfig,
 				exclude,
 				include,