@kubb/plugin-client 5.0.0-beta.10 → 5.0.0-beta.22

package/dist/index.d.ts

@@ -256,7 +256,7 @@ type Props = {
   isIndexable?: boolean;
   isConfigurable?: boolean;
   returnType?: string;
-  baseURL: string | undefined;
+  baseURL: string | null | undefined;
   dataReturnType: PluginClient['resolvedOptions']['dataReturnType'];
   paramsCasing: PluginClient['resolvedOptions']['paramsCasing'];
   paramsType: PluginClient['resolvedOptions']['pathParamsType'];

package/dist/index.js

@@ -5,7 +5,7 @@ import { source as source$2 } from "./templates/config.source.js";
 import path from "node:path";
 import { ast, defineGenerator, definePlugin, defineResolver } from "@kubb/core";
 import { functionPrinter, pluginTsName } from "@kubb/plugin-ts";
-import { Const, File, Function, jsxRenderer } from "@kubb/renderer-jsx";
+import { Const, File, Function, jsxRendererSync } 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
@@ -294,12 +294,13 @@ var URLPath = class {
 	* @example
 	* new URLPath('/pet/{petId}').toTemplateString() // '`/pet/${petId}`'
 	*/
-	toTemplateString({ prefix = "", replacer } = {}) {
-		return `\`${prefix}${this.path.split(/\{([^}]+)\}/).map((part, i) => {
+	toTemplateString({ prefix, replacer } = {}) {
+		const result = this.path.split(/\{([^}]+)\}/).map((part, i) => {
 			if (i % 2 === 0) return part;
 			const param = this.#transformParam(part);
 			return `\${${replacer ? replacer(param) : param}}`;
-		}).join("")}\``;
+		}).join("");
+		return `\`${prefix ?? ""}${result}\``;
 	}
 	/**
 	* Extracts all `{param}` segments from the path and returns them as a key-value map.
@@ -395,7 +396,17 @@ function resolveErrorNames(node, resolver) {
 function resolveStatusCodeNames(node, resolver) {
 	return node.responses.map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
 }
+const typeNamesByResolver = /* @__PURE__ */ new WeakMap();
 function resolveOperationTypeNames(node, resolver, options = {}) {
+	const cacheKey = `${node.operationId}\0${options.paramsCasing ?? ""}\0${options.order ?? ""}\0${options.responseStatusNames ?? ""}\0${(options.exclude ?? []).join(",")}`;
+	let byResolver = typeNamesByResolver.get(resolver);
+	if (byResolver) {
+		const cached = byResolver.get(cacheKey);
+		if (cached) return cached;
+	} else {
+		byResolver = /* @__PURE__ */ new Map();
+		typeNamesByResolver.set(resolver, byResolver);
+	}
 	const { path, query, header } = getOperationParameters(node, { paramsCasing: options.paramsCasing });
 	const responseStatusNames = options.responseStatusNames === "error" ? resolveErrorNames(node, resolver) : options.responseStatusNames === false ? [] : resolveStatusCodeNames(node, resolver);
 	const exclude = new Set(options.exclude ?? []);
@@ -405,7 +416,7 @@ function resolveOperationTypeNames(node, resolver, options = {}) {
 		...header.map((param) => resolver.resolveHeaderParamsName(node, param))
 	];
 	const bodyAndResponseNames = [node.requestBody?.content?.[0]?.schema ? resolver.resolveDataName(node) : void 0, resolver.resolveResponseName(node)];
-	return (options.order === "body-response-first" ? [
+	const result = (options.order === "body-response-first" ? [
 		...bodyAndResponseNames,
 		...paramNames,
 		...responseStatusNames
@@ -414,6 +425,8 @@ function resolveOperationTypeNames(node, resolver, options = {}) {
 		...bodyAndResponseNames,
 		...responseStatusNames
 	]).filter((name) => Boolean(name) && !exclude.has(name));
+	byResolver.set(cacheKey, result);
+	return result;
 }
 //#endregion
 //#region ../../internals/shared/src/params.ts
@@ -848,11 +861,11 @@ function resolveZodImportNames$1(node, zodResolver) {
 __name(resolveZodImportNames$1, "resolveZodImportNames");
 const classClientGenerator = defineGenerator({
 	name: "classClient",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
+		const { config, driver, resolver, root } = ctx;
 		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, sdk } = ctx.options;
-		const baseURL = ctx.options.baseURL ?? adapter.inputNode?.meta?.baseURL;
+		const baseURL = ctx.options.baseURL ?? ctx.meta.baseURL;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -911,7 +924,9 @@ const classClientGenerator = defineGenerator({
 					file,
 					operations: [operationData]
 				});
-			} else if (tag) {
+				return acc;
+			}
+			if (tag) {
 				const name = groupName;
 				const file = resolver.resolveFile({
 					name,
@@ -980,11 +995,11 @@ const classClientGenerator = defineGenerator({
 				baseName: file.baseName,
 				path: file.path,
 				meta: file.meta,
-				banner: resolver.resolveBanner(adapter.inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(adapter.inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),
@@ -1083,11 +1098,11 @@ const classClientGenerator = defineGenerator({
 				baseName: sdkFile.baseName,
 				path: sdkFile.path,
 				meta: sdkFile.meta,
-				banner: resolver.resolveBanner(adapter.inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(adapter.inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),
@@ -1124,11 +1139,11 @@ const classClientGenerator = defineGenerator({
 //#region src/generators/clientGenerator.tsx
 const clientGenerator = defineGenerator({
 	name: "client",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
+		const { 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 baseURL = ctx.options.baseURL ?? ctx.meta.baseURL;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1175,11 +1190,11 @@ const clientGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -1257,9 +1272,9 @@ const clientGenerator = defineGenerator({
 //#region src/generators/groupedClientGenerator.tsx
 const groupedClientGenerator = defineGenerator({
 	name: "groupedClient",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { config, resolver, adapter, root } = ctx;
+		const { config, resolver, root } = ctx;
 		const { output, group } = ctx.options;
 		return /* @__PURE__ */ jsx(Fragment, { children: nodes.reduce((acc, operationNode) => {
 			if (group?.type === "tag") {
@@ -1303,11 +1318,11 @@ const groupedClientGenerator = defineGenerator({
 				baseName: file.baseName,
 				path: file.path,
 				meta: file.meta,
-				banner: resolver.resolveBanner(adapter.inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(adapter.inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),
@@ -1354,9 +1369,9 @@ function Operations({ name, nodes }) {
 //#region src/generators/operationsGenerator.tsx
 const operationsGenerator = defineGenerator({
 	name: "client",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { config, resolver, adapter, root } = ctx;
+		const { config, resolver, root } = ctx;
 		const { output, group } = ctx.options;
 		const name = "operations";
 		const file = resolver.resolveFile({
@@ -1371,11 +1386,11 @@ const operationsGenerator = defineGenerator({
 			baseName: file.baseName,
 			path: file.path,
 			meta: file.meta,
-			banner: resolver.resolveBanner(adapter.inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(adapter.inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -1472,11 +1487,11 @@ function resolveZodImportNames(node, zodResolver) {
 }
 const staticClassClientGenerator = defineGenerator({
 	name: "staticClassClient",
-	renderer: jsxRenderer,
+	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { adapter, config, driver, resolver, root } = ctx;
+		const { 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 baseURL = ctx.options.baseURL ?? ctx.meta.baseURL;
 		const pluginTs = driver.getPlugin(pluginTsName);
 		if (!pluginTs) return null;
 		const tsResolver = driver.getResolver(pluginTsName);
@@ -1534,7 +1549,9 @@ const staticClassClientGenerator = defineGenerator({
 					file,
 					operations: [operationData]
 				});
-			} else if (tag) {
+				return acc;
+			}
+			if (tag) {
 				const name = groupName;
 				const file = resolver.resolveFile({
 					name,
@@ -1602,11 +1619,11 @@ const staticClassClientGenerator = defineGenerator({
 				baseName: file.baseName,
 				path: file.path,
 				meta: file.meta,
-				banner: resolver.resolveBanner(adapter.inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(adapter.inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),