@kubb/plugin-fetch 5.0.0-beta.79 → 5.0.0-beta.81

package/dist/index.d.ts

@@ -7,7 +7,7 @@ import { Exclude, Group, Include, Output, OutputOptions, Override, PluginFactory
  * - `'zod'`: validates the success (2xx) response body, and the error body when a non-2xx call does
  *   not throw (`throwOnError: false`).
  * - `{ request?: 'zod'; response?: 'zod' }`: opt in per direction. `request` validates the request
- *   body and query parameters before the call; `response` validates the success response body and,
+ *   body before the call; `response` validates the success response body and,
  *   on the non-throw path, the error body.
  */
 type ValidatorOptions = false | 'zod' | {
@@ -75,6 +75,8 @@ type Options = OutputOptions & {
   override?: Array<Override<ResolvedOptions>>;
   /**
    * Base URL prepended to every request. When omitted, falls back to the adapter's server URL.
+   * Values containing a `${...}` interpolation are emitted as template literals in the generated
+   * client config, which keeps runtime environment reads dynamic.
    */
   baseURL?: string;
   /**

package/dist/index.js

@@ -430,6 +430,37 @@ function getResponseType(node) {
 	if (baseType.startsWith("text/")) return "text";
 	if (baseType === "application/octet-stream" || baseType === "application/pdf" || /^(image|audio|video)\//.test(baseType)) return "blob";
 }
+/**
+* Which of the grouped request options an operation carries.
+*/
+function getRequestGroups(node) {
+	const { path, query, header } = getOperationParameters(node);
+	return {
+		path: path.length > 0,
+		query: query.length > 0,
+		body: Boolean(node.requestBody?.content?.[0]?.schema),
+		headers: header.length > 0
+	};
+}
+/**
+* Resolves which grouped request options an operation carries together with whether each group
+* holds a required member. The grouped parameter stays optional only when nothing inside it is
+* required, matching the generated `RequestConfig` type.
+*/
+function getRequestGroupOptionality(node) {
+	const groups = getRequestGroups(node);
+	const { path, query, header } = getOperationParameters(node);
+	const hasRequiredPath = path.some((param) => param.required);
+	const hasRequiredQuery = query.some((param) => param.required);
+	const hasRequiredHeader = header.some((param) => param.required);
+	return {
+		groups,
+		hasRequiredPath,
+		hasRequiredQuery,
+		hasRequiredHeader,
+		isOptional: !hasRequiredPath && !hasRequiredQuery && !hasRequiredHeader && !groups.body
+	};
+}
 function buildOperationComments(node, options = {}) {
 	const { link = "pathTemplate", linkPosition = "afterDeprecated", splitLines = false } = options;
 	const linkComment = getOperationLink(node, link);
@@ -679,11 +710,13 @@ function buildGroupedOptionsSignature({ node, tsResolver }) {
 		node,
 		tsResolver
 	});
+	const { isOptional } = getRequestGroupOptionality(node);
 	return {
 		dataTypeName: requestConfigName,
 		paramsSignature: declarationPrinter.print(createFunctionParameters({ params: [createFunctionParameter({
 			name: "options",
-			type: `Options<${requestConfigName}, ThrowOnError>`
+			type: `Options<${requestConfigName}, ThrowOnError>`,
+			...isOptional ? { default: "{}" } : {}
 		})] })) ?? "",
 		returnType: `Promise<RequestResult<${resultGenerics}>>`,
 		generics: ["ThrowOnError extends boolean = true"],
@@ -1420,6 +1453,7 @@ const pluginFetch = definePlugin((options) => {
 			ctx.setMacros([...defaultMacros, ...options.macros ?? []]);
 			ctx.addGenerator(...selectedGenerators);
 			const root = path.resolve(ctx.config.root, ctx.config.output.path);
+			const baseURLExpression = baseURL ? baseURL.includes("${") ? `\`${baseURL.replaceAll("`", "\\`")}\`` : JSON.stringify(baseURL) : void 0;
 			ctx.injectFile({
 				baseName: "serializers.ts",
 				path: path.resolve(root, ".kubb/serializers.ts"),
@@ -1429,7 +1463,7 @@ const pluginFetch = definePlugin((options) => {
 				baseName: "client.ts",
 				path: path.resolve(root, ".kubb/client.ts"),
 				copy: fetchClientTemplatePath,
-				footer: baseURL ? `client.setConfig({ baseURL: ${JSON.stringify(baseURL)} })` : void 0
+				footer: baseURLExpression ? `client.setConfig({ baseURL: ${baseURLExpression} })` : void 0
 			});
 			ctx.injectFile({
 				baseName: "standardSchema.ts",