@kubb/plugin-client 5.0.0-beta.15 → 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

@@ -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.
@@ -862,9 +863,9 @@ const classClientGenerator = defineGenerator({
 	name: "classClient",
 	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { config, driver, resolver, root, inputNode } = ctx;
+		const { config, driver, resolver, root } = ctx;
 		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, sdk } = ctx.options;
-		const baseURL = ctx.options.baseURL ?? 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);
@@ -923,7 +924,9 @@ const classClientGenerator = defineGenerator({
 					file,
 					operations: [operationData]
 				});
-			} else if (tag) {
+				return acc;
+			}
+			if (tag) {
 				const name = groupName;
 				const file = resolver.resolveFile({
 					name,
@@ -992,11 +995,11 @@ const classClientGenerator = defineGenerator({
 				baseName: file.baseName,
 				path: file.path,
 				meta: file.meta,
-				banner: resolver.resolveBanner(inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),
@@ -1095,11 +1098,11 @@ const classClientGenerator = defineGenerator({
 				baseName: sdkFile.baseName,
 				path: sdkFile.path,
 				meta: sdkFile.meta,
-				banner: resolver.resolveBanner(inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),
@@ -1138,9 +1141,9 @@ const clientGenerator = defineGenerator({
 	name: "client",
 	renderer: jsxRendererSync,
 	operation(node, ctx) {
-		const { config, driver, resolver, root, inputNode } = ctx;
+		const { config, driver, resolver, root } = ctx;
 		const { output, urlType, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath, group } = ctx.options;
-		const baseURL = ctx.options.baseURL ?? 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);
@@ -1187,11 +1190,11 @@ const clientGenerator = defineGenerator({
 			baseName: meta.file.baseName,
 			path: meta.file.path,
 			meta: meta.file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -1271,7 +1274,7 @@ const groupedClientGenerator = defineGenerator({
 	name: "groupedClient",
 	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { config, resolver, root, inputNode } = ctx;
+		const { config, resolver, root } = ctx;
 		const { output, group } = ctx.options;
 		return /* @__PURE__ */ jsx(Fragment, { children: nodes.reduce((acc, operationNode) => {
 			if (group?.type === "tag") {
@@ -1315,11 +1318,11 @@ const groupedClientGenerator = defineGenerator({
 				baseName: file.baseName,
 				path: file.path,
 				meta: file.meta,
-				banner: resolver.resolveBanner(inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),
@@ -1368,7 +1371,7 @@ const operationsGenerator = defineGenerator({
 	name: "client",
 	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { config, resolver, root, inputNode } = ctx;
+		const { config, resolver, root } = ctx;
 		const { output, group } = ctx.options;
 		const name = "operations";
 		const file = resolver.resolveFile({
@@ -1383,11 +1386,11 @@ const operationsGenerator = defineGenerator({
 			baseName: file.baseName,
 			path: file.path,
 			meta: file.meta,
-			banner: resolver.resolveBanner(inputNode, {
+			banner: resolver.resolveBanner(ctx.meta, {
 				output,
 				config
 			}),
-			footer: resolver.resolveFooter(inputNode, {
+			footer: resolver.resolveFooter(ctx.meta, {
 				output,
 				config
 			}),
@@ -1486,9 +1489,9 @@ const staticClassClientGenerator = defineGenerator({
 	name: "staticClassClient",
 	renderer: jsxRendererSync,
 	operations(nodes, ctx) {
-		const { config, driver, resolver, root, inputNode } = ctx;
+		const { config, driver, resolver, root } = ctx;
 		const { output, group, dataReturnType, paramsCasing, paramsType, pathParamsType, parser, importPath } = ctx.options;
-		const baseURL = ctx.options.baseURL ?? 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);
@@ -1546,7 +1549,9 @@ const staticClassClientGenerator = defineGenerator({
 					file,
 					operations: [operationData]
 				});
-			} else if (tag) {
+				return acc;
+			}
+			if (tag) {
 				const name = groupName;
 				const file = resolver.resolveFile({
 					name,
@@ -1614,11 +1619,11 @@ const staticClassClientGenerator = defineGenerator({
 				baseName: file.baseName,
 				path: file.path,
 				meta: file.meta,
-				banner: resolver.resolveBanner(inputNode, {
+				banner: resolver.resolveBanner(ctx.meta, {
 					output,
 					config
 				}),
-				footer: resolver.resolveFooter(inputNode, {
+				footer: resolver.resolveFooter(ctx.meta, {
 					output,
 					config
 				}),