@kubb/plugin-client 5.0.0-beta.25 → 5.0.0-beta.28

package/dist/index.js

@@ -185,6 +185,26 @@ function isValidVarName(name) {
 	if (!name || reservedWords.has(name)) return false;
 	return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
+/**
+* Returns `name` when it's a syntactically valid JavaScript variable name,
+* otherwise prefixes it with `_` so the result is a valid identifier.
+*
+* Useful for sanitizing OpenAPI schema names or operation IDs that start with
+* a digit (e.g. `409`, `504AccountCancel`) before using them as exported
+* variable, type, or function names.
+*
+* @example
+* ```ts
+* ensureValidVarName('409')             // '_409'
+* ensureValidVarName('504AccountCancel') // '_504AccountCancel'
+* ensureValidVarName('Pet')              // 'Pet'
+* ensureValidVarName('class')            // '_class'
+* ```
+*/
+function ensureValidVarName(name) {
+	if (!name || isValidVarName(name)) return name;
+	return `_${name}`;
+}
 //#endregion
 //#region ../../internals/utils/src/urlPath.ts
 /**
@@ -386,6 +406,10 @@ function getStatusCodeNumber(statusCode) {
 	const code = Number(statusCode);
 	return Number.isNaN(code) ? null : code;
 }
+function isSuccessStatusCode(statusCode) {
+	const code = getStatusCodeNumber(statusCode);
+	return code !== null && code >= 200 && code < 300;
+}
 function isErrorStatusCode(statusCode) {
 	const code = getStatusCodeNumber(statusCode);
 	return code !== null && code >= 400;
@@ -393,6 +417,9 @@ function isErrorStatusCode(statusCode) {
 function resolveErrorNames(node, resolver) {
 	return node.responses.filter((response) => isErrorStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
 }
+function resolveSuccessNames(node, resolver) {
+	return node.responses.filter((response) => isSuccessStatusCode(response.statusCode)).map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
+}
 function resolveStatusCodeNames(node, resolver) {
 	return node.responses.map((response) => resolver.resolveResponseStatusName(node, response.statusCode));
 }
@@ -582,7 +609,8 @@ function Client({ name, isExportable = true, isIndexable = true, returnType, bas
 	const queryParamsMapping = paramsCasing ? buildParamsMapping(originalQueryParams, casedQueryParams) : null;
 	const headerParamsMapping = paramsCasing ? buildParamsMapping(originalHeaderParams, casedHeaderParams) : null;
 	const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : null;
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const queryParamsName = originalQueryParams.length > 0 ? tsResolver.resolveQueryParamsName(node, originalQueryParams[0]) : null;
 	const headerParamsName = originalHeaderParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, originalHeaderParams[0]) : null;
 	const zodResponseName = zodResolver && parser === "zod" ? zodResolver.resolveResponseName?.(node) : null;
@@ -648,7 +676,7 @@ function Client({ name, isExportable = true, isIndexable = true, returnType, bas
 			}) },
 			returnType,
 			children: [
-				isConfigurable ? `const { client: request = fetch, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ""}...requestConfig } = config` : "",
+				isConfigurable ? `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ""}...requestConfig } = config` : "",
 				/* @__PURE__ */ jsx("br", {}),
 				/* @__PURE__ */ jsx("br", {}),
 				pathParamsMapping && Object.entries(pathParamsMapping).filter(([originalName, camelCaseName]) => isValidVarName(originalName) && originalName !== camelCaseName).map(([originalName, camelCaseName]) => `const ${originalName} = ${camelCaseName}`).join("\n"),
@@ -667,7 +695,7 @@ function Client({ name, isExportable = true, isIndexable = true, returnType, bas
 				/* @__PURE__ */ jsx("br", {}),
 				(isFormData || isMultipleContentTypes && hasFormData) && requestName && "const formData = buildFormData(requestData)",
 				/* @__PURE__ */ jsx("br", {}),
-				isConfigurable ? `const res = await request<${generics.join(", ")}>(${clientParams.toCall()})` : `const res = await fetch<${generics.join(", ")}>(${clientParams.toCall()})`,
+				isConfigurable ? `const res = await request<${generics.join(", ")}>(${clientParams.toCall()})` : `const res = await client<${generics.join(", ")}>(${clientParams.toCall()})`,
 				/* @__PURE__ */ jsx("br", {}),
 				childrenElement
 			]
@@ -688,7 +716,8 @@ function buildHeaders(contentType, hasHeaderParams) {
 * Includes response type, error type, and optional request type.
 */
 function buildGenerics(node, tsResolver) {
-	const responseName = tsResolver.resolveResponseName(node);
+	const successNames = resolveSuccessNames(node, tsResolver);
+	const responseName = successNames.length > 0 ? successNames.join(" | ") : tsResolver.resolveResponseName(node);
 	const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : null;
 	const errorNames = node.responses.filter((r) => Number.parseInt(r.statusCode, 10) >= 400).map((r) => tsResolver.resolveResponseStatusName(node, r.statusCode));
 	return [
@@ -795,7 +824,7 @@ function generateMethod$1({ node, name, tsResolver, zodResolver, baseURL, dataRe
 		zodResolver
 	});
 	return `${jsdoc}async ${name}(${paramsSignature}) {\n${[
-		`const { client: request = fetch, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ""}...requestConfig } = mergeConfig(this.#config, config)`,
+		`const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ""}...requestConfig } = mergeConfig(this.#config, config)`,
 		"",
 		requestDataLine,
 		formDataLine,
@@ -1002,16 +1031,24 @@ const classClientGenerator = defineGenerator({
 				meta: file.meta,
 				banner: resolver.resolveBanner(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: file.path,
+						baseName: file.baseName
+					}
 				}),
 				footer: resolver.resolveFooter(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: file.path,
+						baseName: file.baseName
+					}
 				}),
 				children: [
 					importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 						/* @__PURE__ */ jsx(File.Import, {
-							name: "fetch",
+							name: "client",
 							path: importPath
 						}),
 						/* @__PURE__ */ jsx(File.Import, {
@@ -1029,7 +1066,7 @@ const classClientGenerator = defineGenerator({
 						})
 					] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 						/* @__PURE__ */ jsx(File.Import, {
-							name: ["fetch"],
+							name: ["client"],
 							root: file.path,
 							path: path.resolve(root, ".kubb/client.ts")
 						}),
@@ -1105,11 +1142,19 @@ const classClientGenerator = defineGenerator({
 				meta: sdkFile.meta,
 				banner: resolver.resolveBanner(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: sdkFile.path,
+						baseName: sdkFile.baseName
+					}
 				}),
 				footer: resolver.resolveFooter(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: sdkFile.path,
+						baseName: sdkFile.baseName
+					}
 				}),
 				children: [
 					importPath ? /* @__PURE__ */ jsx(File.Import, {
@@ -1202,15 +1247,23 @@ const clientGenerator = defineGenerator({
 			meta: meta.file.meta,
 			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: meta.file.path,
+					baseName: meta.file.baseName
+				}
 			}),
 			children: [
 				importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(File.Import, {
-					name: "fetch",
+					name: "client",
 					path: importPath
 				}), /* @__PURE__ */ jsx(File.Import, {
 					name: [
@@ -1221,7 +1274,7 @@ const clientGenerator = defineGenerator({
 					path: importPath,
 					isTypeOnly: true
 				})] }) : /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(File.Import, {
-					name: ["fetch"],
+					name: ["client"],
 					root: meta.file.path,
 					path: path.resolve(root, ".kubb/client.ts")
 				}), /* @__PURE__ */ jsx(File.Import, {
@@ -1336,11 +1389,21 @@ const groupedClientGenerator = defineGenerator({
 				meta: file.meta,
 				banner: resolver.resolveBanner(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: file.path,
+						baseName: file.baseName,
+						isAggregation: true
+					}
 				}),
 				footer: resolver.resolveFooter(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: file.path,
+						baseName: file.baseName,
+						isAggregation: true
+					}
 				}),
 				children: [clients.map((client) => /* @__PURE__ */ jsx(File.Import, {
 					name: [client.name],
@@ -1410,11 +1473,19 @@ const operationsGenerator = defineGenerator({
 			meta: file.meta,
 			banner: resolver.resolveBanner(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: file.path,
+					baseName: file.baseName
+				}
 			}),
 			footer: resolver.resolveFooter(ctx.meta, {
 				output,
-				config
+				config,
+				file: {
+					path: file.path,
+					baseName: file.baseName
+				}
 			}),
 			children: /* @__PURE__ */ jsx(Operations, {
 				name,
@@ -1471,7 +1542,7 @@ function generateMethod({ node, name, tsResolver, zodResolver, baseURL, dataRetu
 		zodResolver
 	});
 	return `${jsdoc}  static async ${name}(${paramsSignature}) {\n${[
-		`const { client: request = fetch, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ""}...requestConfig } = mergeConfig(this.#config, config)`,
+		`const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ""}...requestConfig } = mergeConfig(this.#config, config)`,
 		"",
 		requestDataLine,
 		formDataLine,
@@ -1649,16 +1720,24 @@ const staticClassClientGenerator = defineGenerator({
 				meta: file.meta,
 				banner: resolver.resolveBanner(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: file.path,
+						baseName: file.baseName
+					}
 				}),
 				footer: resolver.resolveFooter(ctx.meta, {
 					output,
-					config
+					config,
+					file: {
+						path: file.path,
+						baseName: file.baseName
+					}
 				}),
 				children: [
 					importPath ? /* @__PURE__ */ jsxs(Fragment, { children: [
 						/* @__PURE__ */ jsx(File.Import, {
-							name: "fetch",
+							name: "client",
 							path: importPath
 						}),
 						/* @__PURE__ */ jsx(File.Import, {
@@ -1676,7 +1755,7 @@ const staticClassClientGenerator = defineGenerator({
 						})
 					] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
 						/* @__PURE__ */ jsx(File.Import, {
-							name: ["fetch"],
+							name: ["client"],
 							root: file.path,
 							path: path.resolve(root, ".kubb/client.ts")
 						}),
@@ -1759,7 +1838,8 @@ const resolverClient = defineResolver(() => ({
 	name: "default",
 	pluginName: "plugin-client",
 	default(name, type) {
-		return camelCase(name, { isFile: type === "file" });
+		const resolved = camelCase(name, { isFile: type === "file" });
+		return type === "file" ? resolved : ensureValidVarName(resolved);
 	},
 	resolveName(name) {
 		return this.default(name, "function");
@@ -1768,13 +1848,13 @@ const resolverClient = defineResolver(() => ({
 		return this.default(name, type);
 	},
 	resolveClassName(name) {
-		return pascalCase(name);
+		return ensureValidVarName(pascalCase(name));
 	},
 	resolveGroupName(name) {
-		return pascalCase(name);
+		return ensureValidVarName(pascalCase(name));
 	},
 	resolveClientPropertyName(name) {
-		return camelCase(name);
+		return ensureValidVarName(camelCase(name));
 	},
 	resolveUrlName(node) {
 		const name = this.resolveName(node.operationId);