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

package/dist/clients/axios.cjs

@@ -4,7 +4,7 @@ Object.defineProperties(exports, {
 });
 const require_chunk = require("../chunk-ByKO4r7w.cjs");
 let axios = require("axios");
-axios = require_chunk.__toESM(axios);
+axios = require_chunk.__toESM(axios, 1);
 //#region src/clients/axios.ts
 let _config = {
 	baseURL: typeof AXIOS_BASE !== "undefined" ? AXIOS_BASE : void 0,

package/dist/index.cjs

@@ -4,8 +4,8 @@ const require_templates_clients_axios_source = require("./templates/clients/axio
 const require_templates_clients_fetch_source = require("./templates/clients/fetch.source.cjs");
 const require_templates_config_source = require("./templates/config.source.cjs");
 let node_path = require("node:path");
+let node_path$1 = require_chunk.__toESM(node_path, 1);
 node_path = require_chunk.__toESM(node_path);
-let _kubb_ast = require("@kubb/ast");
 let _kubb_core = require("@kubb/core");
 let _kubb_plugin_ts = require("@kubb/plugin-ts");
 let _kubb_renderer_jsx = require("@kubb/renderer-jsx");
@@ -320,11 +320,12 @@ function buildReturnStatement({ dataReturnType, parser, node, zodResolver }) {
 //#region src/components/Url.tsx
 const declarationPrinter$3 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function getParams$2({ paramsType, paramsCasing, pathParamsType, node, tsResolver }) {
-	return (0, _kubb_ast.createOperationParams)({
+	const urlNode = {
 		...node,
 		parameters: node.parameters.filter((p) => p.in === "path"),
 		requestBody: void 0
-	}, {
+	};
+	return _kubb_core.ast.createOperationParams(urlNode, {
 		paramsType: paramsType === "object" ? "object" : "inline",
 		pathParamsType: paramsType === "object" ? "object" : pathParamsType === "object" ? "object" : "inline",
 		paramsCasing,
@@ -343,7 +344,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 = (0, _kubb_ast.caseParams)(originalPathParams, paramsCasing);
+	const casedPathParams = _kubb_core.ast.caseParams(originalPathParams, paramsCasing);
 	const pathParamsMapping = paramsCasing ? buildParamsMapping(originalPathParams, casedPathParams) : void 0;
 	return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx.File.Source, {
 		name,
@@ -372,14 +373,14 @@ Url.getParams = getParams$2;
 const declarationPrinter$2 = (0, _kubb_plugin_ts.functionPrinter)({ mode: "declaration" });
 function getParams$1({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable }) {
 	const requestName = node.requestBody?.schema ? tsResolver.resolveDataName(node) : void 0;
-	return (0, _kubb_ast.createOperationParams)(node, {
+	return _kubb_core.ast.createOperationParams(node, {
 		paramsType,
 		pathParamsType: paramsType === "object" ? "object" : pathParamsType === "object" ? "object" : "inline",
 		paramsCasing,
 		resolver: tsResolver,
-		extraParams: isConfigurable ? [(0, _kubb_ast.createFunctionParameter)({
+		extraParams: isConfigurable ? [_kubb_core.ast.createFunctionParameter({
 			name: "config",
-			type: (0, _kubb_ast.createParamsType)({
+			type: _kubb_core.ast.createParamsType({
 				variant: "reference",
 				name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : "Partial<RequestConfig> & { client?: Client }"
 			}),
@@ -393,11 +394,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 = (0, _kubb_ast.caseParams)(originalPathParams, paramsCasing);
+	const casedPathParams = _kubb_core.ast.caseParams(originalPathParams, paramsCasing);
 	const originalQueryParams = node.parameters.filter((p) => p.in === "query");
-	const casedQueryParams = (0, _kubb_ast.caseParams)(originalQueryParams, paramsCasing);
+	const casedQueryParams = _kubb_core.ast.caseParams(originalQueryParams, paramsCasing);
 	const originalHeaderParams = node.parameters.filter((p) => p.in === "header");
-	const casedHeaderParams = (0, _kubb_ast.caseParams)(originalHeaderParams, paramsCasing);
+	const casedHeaderParams = _kubb_core.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;
@@ -868,10 +869,11 @@ function resolveZodImportNames$1(node, zodResolver) {
 require_chunk.__name(resolveZodImportNames$1, "resolveZodImportNames");
 const classClientGenerator = (0, _kubb_core.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: _kubb_renderer_jsx.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(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs?.resolver) return null;
 		const tsResolver = pluginTs.resolver;
@@ -1138,16 +1140,17 @@ const classClientGenerator = (0, _kubb_core.defineGenerator)({
 //#region src/generators/clientGenerator.tsx
 const clientGenerator = (0, _kubb_core.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: _kubb_renderer_jsx.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(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs?.resolver) return null;
 		const tsResolver = pluginTs.resolver;
 		const pluginZod = parser === "zod" ? driver.getPlugin(_kubb_plugin_zod.pluginZodName) : void 0;
 		const zodResolver = pluginZod?.resolver;
-		const casedParams = (0, _kubb_ast.caseParams)(node.parameters, paramsCasing);
+		const casedParams = _kubb_core.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");
@@ -1281,9 +1284,10 @@ const clientGenerator = (0, _kubb_core.defineGenerator)({
 //#region src/generators/groupedClientGenerator.tsx
 const groupedClientGenerator = (0, _kubb_core.defineGenerator)({
 	name: "groupedClient",
-	operations(nodes, options) {
-		const { config, resolver, adapter, root } = this;
-		const { output, group } = options;
+	renderer: _kubb_renderer_jsx.jsxRenderer,
+	operations(nodes, ctx) {
+		const { config, resolver, adapter, root } = ctx;
+		const { output, group } = ctx.options;
 		return /* @__PURE__ */ (0, _kubb_renderer_jsx_jsx_runtime.jsx)(_kubb_renderer_jsx_jsx_runtime.Fragment, { children: nodes.reduce((acc, operationNode) => {
 			if (group?.type === "tag") {
 				const tag = operationNode.tags[0];
@@ -1377,9 +1381,10 @@ function Operations({ name, nodes }) {
 //#region src/generators/operationsGenerator.tsx
 const operationsGenerator = (0, _kubb_core.defineGenerator)({
 	name: "client",
-	operations(nodes, options) {
-		const { config, resolver, adapter, root } = this;
-		const { output, group } = options;
+	renderer: _kubb_renderer_jsx.jsxRenderer,
+	operations(nodes, ctx) {
+		const { config, resolver, adapter, root } = ctx;
+		const { output, group } = ctx.options;
 		const name = "operations";
 		const file = resolver.resolveFile({
 			name,
@@ -1494,10 +1499,11 @@ function resolveZodImportNames(node, zodResolver) {
 }
 const staticClassClientGenerator = (0, _kubb_core.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: _kubb_renderer_jsx.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(_kubb_plugin_ts.pluginTsName);
 		if (!pluginTs?.resolver) return null;
 		const tsResolver = pluginTs.resolver;
@@ -1716,9 +1722,6 @@ const staticClassClientGenerator = (0, _kubb_core.defineGenerator)({
 	}
 });
 //#endregion
-//#region package.json
-var version = "5.0.0-alpha.33";
-//#endregion
 //#region src/resolvers/resolverClient.ts
 /**
 * Resolver for `@kubb/plugin-client` that provides the default naming
@@ -1767,28 +1770,6 @@ const resolverClientLegacy = (0, _kubb_core.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 = (0, _kubb_core.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
@@ -1811,37 +1792,35 @@ const pluginClientName = "plugin-client";
 * })
 * ```
 */
-const pluginClient = (0, _kubb_core.createPlugin)((options) => {
+const pluginClient = (0, _kubb_core.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 = (0, _kubb_core.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 = (0, _kubb_core.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: [_kubb_plugin_ts.pluginTsName, parser === "zod" ? _kubb_plugin_zod.pluginZodName : void 0].filter(Boolean),
+		hooks: { "kubb:plugin:setup"(ctx) {
+			const resolver = userResolver ? {
+				...defaultResolver,
+				...userResolver
+			} : defaultResolver;
+			ctx.setOptions({
 				client,
 				clientType,
 				bundle,
@@ -1849,13 +1828,7 @@ const pluginClient = (0, _kubb_core.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,
@@ -1865,63 +1838,33 @@ const pluginClient = (0, _kubb_core.createPlugin)((options) => {
 				pathParamsType,
 				urlType,
 				wrapper,
-				resolver: preset.resolver
-			};
-		},
-		pre: [_kubb_plugin_ts.pluginTsName, parser === "zod" ? _kubb_plugin_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((0, _kubb_ast.createFile)({
+			ctx.setResolver(resolver);
+			if (userTransformer) ctx.setTransformer(userTransformer);
+			for (const gen of selectedGenerators) ctx.addGenerator(gen);
+			const root = node_path$1.default.resolve(ctx.config.root, ctx.config.output.path);
+			if (bundle && !resolvedImportPath) ctx.injectFile({
 				baseName: "fetch.ts",
-				path: node_path.default.resolve(root, ".kubb/fetch.ts"),
-				sources: [(0, _kubb_ast.createSource)({
+				path: node_path$1.default.resolve(root, ".kubb/fetch.ts"),
+				sources: [_kubb_core.ast.createSource({
 					name: "fetch",
-					nodes: [(0, _kubb_ast.createText)(plugin.options.client === "fetch" ? require_templates_clients_fetch_source.source : require_templates_clients_axios_source.source)],
+					nodes: [_kubb_core.ast.createText(client === "fetch" ? require_templates_clients_fetch_source.source : require_templates_clients_axios_source.source)],
 					isExportable: true,
 					isIndexable: true
 				})]
-			}));
-			await this.addFile((0, _kubb_ast.createFile)({
+			});
+			ctx.injectFile({
 				baseName: "config.ts",
-				path: node_path.default.resolve(root, ".kubb/config.ts"),
-				sources: [(0, _kubb_ast.createSource)({
+				path: node_path$1.default.resolve(root, ".kubb/config.ts"),
+				sources: [_kubb_core.ast.createSource({
 					name: "config",
-					nodes: [(0, _kubb_ast.createText)(require_templates_config_source.source)],
+					nodes: [_kubb_core.ast.createText(require_templates_config_source.source)],
 					isExportable: false,
 					isIndexable: false
 				})]
-			}));
-		}
+			});
+		} }
 	};
 });
 //#endregion
@@ -1934,7 +1877,6 @@ exports.groupedClientGenerator = groupedClientGenerator;
 exports.operationsGenerator = operationsGenerator;
 exports.pluginClient = pluginClient;
 exports.pluginClientName = pluginClientName;
-exports.presets = presets;
 exports.resolverClient = resolverClient;
 exports.resolverClientLegacy = resolverClientLegacy;
 exports.staticClassClientGenerator = staticClassClientGenerator;