@kubb/plugin-client 5.0.0-alpha.34 → 5.0.0-alpha.35

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import { t as __name } from "./chunk--u3MIqq1.js";
 import * as _$_kubb_core0 from "@kubb/core";
-import { CompatibilityPreset, Exclude, FunctionParams, Generator, Group, Include, Output, Override, PluginFactoryOptions, ResolvePathOptions, Resolver, UserGroup } from "@kubb/core";
+import { CompatibilityPreset, Exclude, FunctionParams, Generator, Group, Include, Output, Override, PluginFactoryOptions, ResolvePathOptions, Resolver, UserGroup, ast } from "@kubb/core";
 import { PluginTs } from "@kubb/plugin-ts";
 import { PluginZod } from "@kubb/plugin-zod";
-import { FunctionParametersNode, OperationNode, Visitor } from "@kubb/ast/types";
 import { KubbReactNode } from "@kubb/renderer-jsx/types";
 
 //#region src/types.d.ts
@@ -182,7 +181,7 @@ type Options = {
    * Single AST visitor applied to each node before printing.
    * Return `null` or `undefined` from a method to leave the node unchanged.
    */
-  transformer?: Visitor;
+  transformer?: ast.Visitor;
   /**
    * Define some generators next to the client generators.
    */
@@ -231,7 +230,7 @@ type Props$1 = {
   paramsType: PluginClient['resolvedOptions']['pathParamsType'];
   pathParamsType: PluginClient['resolvedOptions']['pathParamsType'];
   parser: PluginClient['resolvedOptions']['parser'] | undefined;
-  node: OperationNode;
+  node: ast.OperationNode;
   tsResolver: PluginTs['resolver'];
   zodResolver?: PluginZod['resolver'];
   children?: KubbReactNode;
@@ -240,7 +239,7 @@ type GetParamsProps$1 = {
   paramsCasing: PluginClient['resolvedOptions']['paramsCasing'];
   paramsType: PluginClient['resolvedOptions']['paramsType'];
   pathParamsType: PluginClient['resolvedOptions']['pathParamsType'];
-  node: OperationNode;
+  node: ast.OperationNode;
   tsResolver: PluginTs['resolver'];
   isConfigurable: boolean;
 };
@@ -270,7 +269,7 @@ declare namespace Client {
     node,
     tsResolver,
     isConfigurable
-  }: GetParamsProps$1) => FunctionParametersNode;
+  }: GetParamsProps$1) => ast.FunctionParametersNode;
 }
 //#endregion
 //#region src/components/ClientLegacy.d.ts
@@ -400,19 +399,19 @@ declare namespace UrlLegacy {
 }
 //#endregion
 //#region src/generators/classClientGenerator.d.ts
-declare const classClientGenerator: _$_kubb_core0.Generator<PluginClient>;
+declare const classClientGenerator: _$_kubb_core0.Generator<PluginClient, unknown>;
 //#endregion
 //#region src/generators/clientGenerator.d.ts
-declare const clientGenerator: _$_kubb_core0.Generator<PluginClient>;
+declare const clientGenerator: _$_kubb_core0.Generator<PluginClient, unknown>;
 //#endregion
 //#region src/generators/groupedClientGenerator.d.ts
-declare const groupedClientGenerator: _$_kubb_core0.Generator<PluginClient>;
+declare const groupedClientGenerator: _$_kubb_core0.Generator<PluginClient, unknown>;
 //#endregion
 //#region src/generators/operationsGenerator.d.ts
-declare const operationsGenerator: _$_kubb_core0.Generator<PluginClient>;
+declare const operationsGenerator: _$_kubb_core0.Generator<PluginClient, unknown>;
 //#endregion
 //#region src/generators/staticClassClientGenerator.d.ts
-declare const staticClassClientGenerator: _$_kubb_core0.Generator<PluginClient>;
+declare const staticClassClientGenerator: _$_kubb_core0.Generator<PluginClient, unknown>;
 //#endregion
 //#region src/plugin.d.ts
 /**
@@ -436,20 +435,7 @@ declare const pluginClientName = "plugin-client";
  * })
  * ```
  */
-declare const pluginClient: (options?: Options | undefined) => _$_kubb_core0.UserPluginWithLifeCycle<PluginClient>;
-//#endregion
-//#region src/presets.d.ts
-/**
- * Built-in preset registry for `@kubb/plugin-client`.
- *
- * - `default` — uses `resolverClient` with v5 naming conventions.
- * - `kubbV4`  — uses `resolverClientLegacy` with backward-compatible naming.
- *
- * Note: Unlike plugin-ts/plugin-zod, generators are not defined here because
- * plugin-client selects generators dynamically based on `clientType`, `group`,
- * and `operations` options. Generator selection happens in `plugin.ts`.
- */
-declare const presets: _$_kubb_core0.Presets<ResolverClient>;
+declare const pluginClient: (options?: Options | undefined) => _$_kubb_core0.HookStylePlugin<PluginClient>;
 //#endregion
 //#region src/resolvers/resolverClient.d.ts
 /**
@@ -481,5 +467,5 @@ declare const resolverClient: ResolverClient;
  */
 declare const resolverClientLegacy: ResolverClient;
 //#endregion
-export { Client, type ClientImportPath, ClientLegacy, type PluginClient, type ResolverClient, UrlLegacy, classClientGenerator, clientGenerator, groupedClientGenerator, operationsGenerator, pluginClient, pluginClientName, presets, resolverClient, resolverClientLegacy, staticClassClientGenerator };
+export { Client, type ClientImportPath, ClientLegacy, type PluginClient, type ResolverClient, UrlLegacy, classClientGenerator, clientGenerator, groupedClientGenerator, operationsGenerator, pluginClient, pluginClientName, resolverClient, resolverClientLegacy, staticClassClientGenerator };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -3,10 +3,9 @@ import { source } from "./templates/clients/axios.source.js";
 import { source as source$1 } from "./templates/clients/fetch.source.js";
 import { source as source$2 } from "./templates/config.source.js";
 import path from "node:path";
-import { caseParams, createFile, createFunctionParameter, createOperationParams, createParamsType, createSource, createText } from "@kubb/ast";
-import { FunctionParams, createPlugin, defineGenerator, definePresets, defineResolver, getPreset, mergeGenerators } from "@kubb/core";
+import { FunctionParams, ast, defineGenerator, definePlugin, defineResolver } from "@kubb/core";
 import { functionPrinter, pluginTsName } from "@kubb/plugin-ts";
-import { Const, File, Function as Function$1 } from "@kubb/renderer-jsx";
+import { Const, File, Function as Function$1, jsxRenderer } from "@kubb/renderer-jsx";
 import { Fragment, jsx, jsxs } from "@kubb/renderer-jsx/jsx-runtime";
 import { pluginZodName } from "@kubb/plugin-zod";
 //#region ../../internals/utils/src/casing.ts
@@ -318,11 +317,12 @@ function buildReturnStatement({ dataReturnType, parser, node, zodResolver }) {
 //#region src/components/Url.tsx
 const declarationPrinter$3 = functionPrinter({ mode: "declaration" });
 function getParams$2({ paramsType, paramsCasing, pathParamsType, node, tsResolver }) {
-	return createOperationParams({
+	const urlNode = {
 		...node,
 		parameters: node.parameters.filter((p) => p.in === "path"),
 		requestBody: void 0
-	}, {
+	};
+	return ast.createOperationParams(urlNode, {
 		paramsType: paramsType === "object" ? "object" : "inline",
 		pathParamsType: paramsType === "object" ? "object" : pathParamsType === "object" ? "object" : "inline",
 		paramsCasing,
@@ -341,7 +341,7 @@ function Url({ name, isExportable = true, isIndexable = true, baseURL, paramsTyp
 	});
 	const paramsSignature = declarationPrinter$3.print(paramsNode) ?? "";
 	const originalPathParams = node.parameters.filter((p) => p.in === "path");
-	const casedPathParams = caseParams(originalPathParams, paramsCasing);
+	const casedPathParams = ast.caseParams(originalPathParams, paramsCasing);
 	const pathParamsMapping = paramsCasing ? buildParamsMapping(originalPathParams, casedPathParams) : void 0;
 	return /* @__PURE__ */ jsx(File.Source, {
 		name,
@@ -370,14 +370,14 @@ Url.getParams = getParams$2;
 const declarationPrinter$2 = functionPrinter({ mode: "declaration" });
 function getParams$1({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable }) {
 	const requestName = node.requestBody?.schema ? tsResolver.resolveDataName(node) : void 0;
-	return createOperationParams(node, {
+	return ast.createOperationParams(node, {
 		paramsType,
 		pathParamsType: paramsType === "object" ? "object" : pathParamsType === "object" ? "object" : "inline",
 		paramsCasing,
 		resolver: tsResolver,
-		extraParams: isConfigurable ? [createFunctionParameter({
+		extraParams: isConfigurable ? [ast.createFunctionParameter({
 			name: "config",
-			type: createParamsType({
+			type: ast.createParamsType({
 				variant: "reference",
 				name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"
 			}),
@@ -391,11 +391,11 @@ function Client({ name, isExportable = true, isIndexable = true, returnType, bas
 	const contentType = node.requestBody?.contentType ?? "application/json";
 	const isFormData = contentType === "multipart/form-data";
 	const originalPathParams = node.parameters.filter((p) => p.in === "path");
-	const casedPathParams = caseParams(originalPathParams, paramsCasing);
+	const casedPathParams = ast.caseParams(originalPathParams, paramsCasing);
 	const originalQueryParams = node.parameters.filter((p) => p.in === "query");
-	const casedQueryParams = caseParams(originalQueryParams, paramsCasing);
+	const casedQueryParams = ast.caseParams(originalQueryParams, paramsCasing);
 	const originalHeaderParams = node.parameters.filter((p) => p.in === "header");
-	const casedHeaderParams = caseParams(originalHeaderParams, paramsCasing);
+	const casedHeaderParams = ast.caseParams(originalHeaderParams, paramsCasing);
 	const pathParamsMapping = paramsCasing && !urlName ? buildParamsMapping(originalPathParams, casedPathParams) : void 0;
 	const queryParamsMapping = paramsCasing ? buildParamsMapping(originalQueryParams, casedQueryParams) : void 0;
 	const headerParamsMapping = paramsCasing ? buildParamsMapping(originalHeaderParams, casedHeaderParams) : void 0;
@@ -866,10 +866,11 @@ function resolveZodImportNames$1(node, zodResolver) {
 __name(resolveZodImportNames$1, "resolveZodImportNames");
 const classClientGenerator = defineGenerator({
 	name: "classClient",
-	operations(nodes, options) {
-		const { adapter, config, driver, resolver, root } = this;
-		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, wrapper } = options;
-		const baseURL = options.baseURL ?? adapter.inputNode?.meta?.baseURL;
+	renderer: jsxRenderer,
+	operations(nodes, ctx) {
+		const { adapter, config, driver, resolver, root } = ctx;
+		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, wrapper } = ctx.options;
+		const baseURL = ctx.options.baseURL ?? adapter.inputNode?.meta?.baseURL;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs?.resolver) return null;
 		const tsResolver = pluginTs.resolver;
@@ -1136,16 +1137,17 @@ const classClientGenerator = defineGenerator({
 //#region src/generators/clientGenerator.tsx
 const clientGenerator = defineGenerator({
 	name: "client",
-	operation(node, options) {
-		const { adapter, config, driver, resolver, root } = this;
-		const { output, urlType, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, group } = options;
-		const baseURL = options.baseURL ?? adapter.inputNode?.meta?.baseURL;
+	renderer: jsxRenderer,
+	operation(node, ctx) {
+		const { adapter, config, driver, resolver, root } = ctx;
+		const { output, urlType, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, group } = ctx.options;
+		const baseURL = ctx.options.baseURL ?? adapter.inputNode?.meta?.baseURL;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs?.resolver) return null;
 		const tsResolver = pluginTs.resolver;
 		const pluginZod = parser === "zod" ? driver.getPlugin(pluginZodName) : void 0;
 		const zodResolver = pluginZod?.resolver;
-		const casedParams = caseParams(node.parameters, paramsCasing);
+		const casedParams = ast.caseParams(node.parameters, paramsCasing);
 		const pathParams = casedParams.filter((p) => p.in === "path");
 		const queryParams = casedParams.filter((p) => p.in === "query");
 		const headerParams = casedParams.filter((p) => p.in === "header");
@@ -1279,9 +1281,10 @@ const clientGenerator = defineGenerator({
 //#region src/generators/groupedClientGenerator.tsx
 const groupedClientGenerator = defineGenerator({
 	name: "groupedClient",
-	operations(nodes, options) {
-		const { config, resolver, adapter, root } = this;
-		const { output, group } = options;
+	renderer: jsxRenderer,
+	operations(nodes, ctx) {
+		const { config, resolver, adapter, root } = ctx;
+		const { output, group } = ctx.options;
 		return /* @__PURE__ */ jsx(Fragment, { children: nodes.reduce((acc, operationNode) => {
 			if (group?.type === "tag") {
 				const tag = operationNode.tags[0];
@@ -1375,9 +1378,10 @@ function Operations({ name, nodes }) {
 //#region src/generators/operationsGenerator.tsx
 const operationsGenerator = defineGenerator({
 	name: "client",
-	operations(nodes, options) {
-		const { config, resolver, adapter, root } = this;
-		const { output, group } = options;
+	renderer: jsxRenderer,
+	operations(nodes, ctx) {
+		const { config, resolver, adapter, root } = ctx;
+		const { output, group } = ctx.options;
 		const name = "operations";
 		const file = resolver.resolveFile({
 			name,
@@ -1492,10 +1496,11 @@ function resolveZodImportNames(node, zodResolver) {
 }
 const staticClassClientGenerator = defineGenerator({
 	name: "staticClassClient",
-	operations(nodes, options) {
-		const { adapter, config, driver, resolver, root } = this;
-		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath } = options;
-		const baseURL = options.baseURL ?? adapter.inputNode?.meta?.baseURL;
+	renderer: jsxRenderer,
+	operations(nodes, ctx) {
+		const { adapter, config, driver, resolver, root } = ctx;
+		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath } = ctx.options;
+		const baseURL = ctx.options.baseURL ?? adapter.inputNode?.meta?.baseURL;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs?.resolver) return null;
 		const tsResolver = pluginTs.resolver;
@@ -1714,9 +1719,6 @@ const staticClassClientGenerator = defineGenerator({
 	}
 });
 //#endregion
-//#region package.json
-var version = "5.0.0-alpha.34";
-//#endregion
 //#region src/resolvers/resolverClient.ts
 /**
 * Resolver for `@kubb/plugin-client` that provides the default naming
@@ -1765,28 +1767,6 @@ const resolverClientLegacy = defineResolver(() => ({
 	}
 }));
 //#endregion
-//#region src/presets.ts
-/**
-* Built-in preset registry for `@kubb/plugin-client`.
-*
-* - `default` — uses `resolverClient` with v5 naming conventions.
-* - `kubbV4`  — uses `resolverClientLegacy` with backward-compatible naming.
-*
-* Note: Unlike plugin-ts/plugin-zod, generators are not defined here because
-* plugin-client selects generators dynamically based on `clientType`, `group`,
-* and `operations` options. Generator selection happens in `plugin.ts`.
-*/
-const presets = definePresets({
-	default: {
-		name: "default",
-		resolver: resolverClient
-	},
-	kubbV4: {
-		name: "kubbV4",
-		resolver: resolverClientLegacy
-	}
-});
-//#endregion
 //#region src/plugin.ts
 /**
 * Canonical plugin name for `@kubb/plugin-client`, used to identify the plugin
@@ -1809,37 +1789,35 @@ const pluginClientName = "plugin-client";
 * })
 * ```
 */
-const pluginClient = createPlugin((options) => {
+const pluginClient = definePlugin((options) => {
 	const { output = {
 		path: "clients",
 		barrelType: "named"
-	}, group, exclude = [], include, override = [], urlType = false, dataReturnType = "data", paramsType = "inline", pathParamsType = paramsType === "object" ? "object" : options.pathParamsType || "inline", operations = false, paramsCasing, clientType = "function", parser = "client", client = "axios", importPath, bundle = false, wrapper, baseURL, compatibilityPreset = "default", resolver: userResolver, transformer: userTransformer } = options;
+	}, group, exclude = [], include, override = [], urlType = false, dataReturnType = "data", paramsType = "inline", pathParamsType = paramsType === "object" ? "object" : options.pathParamsType || "inline", operations = false, paramsCasing, clientType = "function", parser = "client", client = "axios", importPath, bundle = false, wrapper, baseURL, resolver: userResolver, transformer: userTransformer, compatibilityPreset = "default" } = options;
+	const defaultResolver = compatibilityPreset === "kubbV4" ? resolverClientLegacy : resolverClient;
 	const resolvedImportPath = importPath ?? (!bundle ? `@kubb/plugin-client/clients/${client}` : void 0);
-	const preset = getPreset({
-		preset: compatibilityPreset,
-		presets,
-		resolver: userResolver,
-		transformer: userTransformer,
-		generators: options.generators ?? [
-			clientType === "staticClass" ? staticClassClientGenerator : clientType === "class" ? classClientGenerator : clientGenerator,
-			group && clientType === "function" ? groupedClientGenerator : void 0,
-			operations ? operationsGenerator : void 0
-		].filter((x) => Boolean(x))
-	});
-	const mergedGenerator = mergeGenerators(preset.generators ?? []);
-	let resolveNameWarning = false;
-	let resolvePathWarning = false;
+	const selectedGenerators = options.generators ?? [
+		clientType === "staticClass" ? staticClassClientGenerator : clientType === "class" ? classClientGenerator : clientGenerator,
+		group && clientType === "function" ? groupedClientGenerator : void 0,
+		operations ? operationsGenerator : void 0
+	].filter((x) => Boolean(x));
+	const groupConfig = group ? {
+		...group,
+		name: group.name ? group.name : (ctx) => {
+			if (group.type === "path") return `${ctx.group.split("/")[1]}`;
+			return `${camelCase(ctx.group)}Controller`;
+		}
+	} : void 0;
 	return {
 		name: pluginClientName,
-		version,
-		get resolver() {
-			return preset.resolver;
-		},
-		get transformer() {
-			return preset.transformer;
-		},
-		get options() {
-			return {
+		options,
+		dependencies: [pluginTsName, parser === "zod" ? pluginZodName : void 0].filter(Boolean),
+		hooks: { "kubb:plugin:setup"(ctx) {
+			const resolver = userResolver ? {
+				...defaultResolver,
+				...userResolver
+			} : defaultResolver;
+			ctx.setOptions({
 				client,
 				clientType,
 				bundle,
@@ -1847,13 +1825,7 @@ const pluginClient = createPlugin((options) => {
 				exclude,
 				include,
 				override,
-				group: group ? {
-					...group,
-					name: group.name ? group.name : (ctx) => {
-						if (group.type === "path") return `${ctx.group.split("/")[1]}`;
-						return `${camelCase(ctx.group)}Controller`;
-					}
-				} : void 0,
+				group: groupConfig,
 				parser,
 				dataReturnType,
 				importPath: resolvedImportPath,
@@ -1863,66 +1835,36 @@ const pluginClient = createPlugin((options) => {
 				pathParamsType,
 				urlType,
 				wrapper,
-				resolver: preset.resolver
-			};
-		},
-		pre: [pluginTsName, parser === "zod" ? pluginZodName : void 0].filter(Boolean),
-		resolvePath(baseName, pathMode, options) {
-			if (!resolvePathWarning) {
-				this.warn("Do not use resolvePath for pluginClient, use resolverClient.resolvePath instead");
-				resolvePathWarning = true;
-			}
-			return this.plugin.resolver.resolvePath({
-				baseName,
-				pathMode,
-				tag: options?.group?.tag,
-				path: options?.group?.path
-			}, {
-				root: this.root,
-				output,
-				group: this.plugin.options.group
+				resolver
 			});
-		},
-		resolveName(name, type) {
-			if (!resolveNameWarning) {
-				this.warn("Do not use resolveName for pluginClient, use resolverClient.default instead");
-				resolveNameWarning = true;
-			}
-			return this.plugin.resolver.default(name, type);
-		},
-		async operation(node, options) {
-			return mergedGenerator.operation?.call(this, node, options);
-		},
-		async operations(nodes, options) {
-			return mergedGenerator.operations?.call(this, nodes, options);
-		},
-		async buildStart() {
-			const { plugin } = this;
-			const root = this.root;
-			if (bundle && !plugin.options.importPath) await this.addFile(createFile({
+			ctx.setResolver(resolver);
+			if (userTransformer) ctx.setTransformer(userTransformer);
+			for (const gen of selectedGenerators) ctx.addGenerator(gen);
+			const root = path.resolve(ctx.config.root, ctx.config.output.path);
+			if (bundle && !resolvedImportPath) ctx.injectFile({
 				baseName: "fetch.ts",
 				path: path.resolve(root, ".kubb/fetch.ts"),
-				sources: [createSource({
+				sources: [ast.createSource({
 					name: "fetch",
-					nodes: [createText(plugin.options.client === "fetch" ? source$1 : source)],
+					nodes: [ast.createText(client === "fetch" ? source$1 : source)],
 					isExportable: true,
 					isIndexable: true
 				})]
-			}));
-			await this.addFile(createFile({
+			});
+			ctx.injectFile({
 				baseName: "config.ts",
 				path: path.resolve(root, ".kubb/config.ts"),
-				sources: [createSource({
+				sources: [ast.createSource({
 					name: "config",
-					nodes: [createText(source$2)],
+					nodes: [ast.createText(source$2)],
 					isExportable: false,
 					isIndexable: false
 				})]
-			}));
-		}
+			});
+		} }
 	};
 });
 //#endregion
-export { Client, ClientLegacy, UrlLegacy, classClientGenerator, clientGenerator, groupedClientGenerator, operationsGenerator, pluginClient, pluginClientName, presets, resolverClient, resolverClientLegacy, staticClassClientGenerator };
+export { Client, ClientLegacy, UrlLegacy, classClientGenerator, clientGenerator, groupedClientGenerator, operationsGenerator, pluginClient, pluginClientName, resolverClient, resolverClientLegacy, staticClassClientGenerator };
 
 //# sourceMappingURL=index.js.map