@kubb/plugin-client 5.0.0-beta.3 → 5.0.0-beta.30

package/package.json

@@ -1,23 +1,17 @@
 {
   "name": "@kubb/plugin-client",
-  "version": "5.0.0-beta.3",
-  "description": "API client generator plugin for Kubb, creating type-safe HTTP clients (Axios, Fetch) from OpenAPI specifications for making API requests.",
+  "version": "5.0.0-beta.30",
+  "description": "Generate type-safe HTTP clients from your OpenAPI specification. Supports Axios, Fetch, and custom client adapters with full TypeScript inference and zero boilerplate.",
   "keywords": [
     "api-client",
     "axios",
-    "code-generator",
+    "code-generation",
     "codegen",
     "fetch",
     "http-client",
     "kubb",
-    "oas",
     "openapi",
-    "plugins",
-    "rest-api",
-    "sdk-generator",
     "swagger",
-    "type-safe",
-    "type-safety",
     "typescript"
   ],
   "license": "MIT",
@@ -30,8 +24,7 @@
   "files": [
     "src",
     "dist",
-    "templates",
-    "plugin.json",
+    "extension.yaml",
     "*.d.ts",
     "*.d.cts",
     "!/**/**.test.**",
@@ -94,17 +87,18 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@kubb/core": "5.0.0-beta.3",
-    "@kubb/renderer-jsx": "5.0.0-beta.3",
-    "@kubb/plugin-ts": "5.0.0-beta.3",
-    "@kubb/plugin-zod": "5.0.0-beta.3"
+    "@kubb/core": "5.0.0-beta.29",
+    "@kubb/renderer-jsx": "5.0.0-beta.29",
+    "@kubb/plugin-ts": "5.0.0-beta.30",
+    "@kubb/plugin-zod": "5.0.0-beta.30"
   },
   "devDependencies": {
-    "axios": "^1.15.2",
+    "axios": "^1.16.1",
+    "@internals/shared": "0.0.0",
     "@internals/utils": "0.0.0"
   },
   "peerDependencies": {
-    "@kubb/renderer-jsx": "5.0.0-beta.3",
+    "@kubb/renderer-jsx": "5.0.0-beta.29",
     "axios": "^1.7.2"
   },
   "peerDependenciesMeta": {

package/src/clients/axios.ts

@@ -4,6 +4,13 @@ import axios from 'axios'
 declare const AXIOS_BASE: string
 declare const AXIOS_HEADERS: string
 
+/**
+ * Header values may be objects (e.g. JSON-encoded headers like `X-Filter` in the Linode API).
+ * Non-string values are JSON-serialized before the request is sent.
+ */
+export type HeaderValue = string | number | boolean | null | undefined | object
+export type HeadersInit = Array<[string, HeaderValue]> | Record<string, HeaderValue>
+
 /**
  * Subset of AxiosRequestConfig
  */
@@ -16,8 +23,9 @@ export type RequestConfig<TData = unknown> = {
   responseType?: 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
   signal?: AbortSignal
   validateStatus?: (status: number) => boolean
-  headers?: AxiosRequestConfig['headers']
+  headers?: HeadersInit
   paramsSerializer?: AxiosRequestConfig['paramsSerializer']
+  contentType?: string
 }
 
 /**
@@ -55,22 +63,48 @@ export const mergeConfig = <T extends RequestConfig>(...configs: Array<Partial<T
       ...merged,
       ...config,
       headers: {
-        ...merged.headers,
-        ...config.headers,
+        ...(Array.isArray(merged.headers) ? Object.fromEntries(merged.headers) : merged.headers),
+        ...(Array.isArray(config.headers) ? Object.fromEntries(config.headers) : config.headers),
       },
     }
   }, {})
 }
 
-export const axiosInstance = axios.create(getConfig())
+/**
+ * Serializes header values into the string form axios ultimately puts on the wire.
+ * Objects (including arrays) are JSON-stringified so spec-defined object headers like `X-Filter`
+ * are sent in their canonical JSON-string form rather than `[object Object]`.
+ */
+function serializeHeaders(headers: HeadersInit | undefined): Record<string, string> {
+  if (!headers) return {}
+  const entries = Array.isArray(headers) ? headers : Object.entries(headers)
+  const result: Record<string, string> = {}
+  for (const [key, value] of entries) {
+    if (value === undefined || value === null) continue
+    result[key] = typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : String(value)
+  }
+  return result
+}
+
+export const axiosInstance = axios.create(getConfig() as AxiosRequestConfig)
 
 export const client = async <TResponseData, TError = unknown, TRequestData = unknown>(
   config: RequestConfig<TRequestData>,
   _request?: unknown,
 ): Promise<ResponseConfig<TResponseData>> => {
-  return axiosInstance.request<TResponseData, ResponseConfig<TResponseData>>(mergeConfig(getConfig(), config)).catch((e: AxiosError<TError>) => {
-    throw e
-  })
+  const requestConfig = mergeConfig(getConfig(), config)
+  const { contentType, headers, ...axiosConfig } = requestConfig
+  return axiosInstance
+    .request<TResponseData, ResponseConfig<TResponseData>>({
+      ...axiosConfig,
+      headers: {
+        ...(contentType && contentType !== 'multipart/form-data' ? { 'Content-Type': contentType } : {}),
+        ...serializeHeaders(headers),
+      },
+    })
+    .catch((e: AxiosError<TError>) => {
+      throw e
+    })
 }
 
 client.getConfig = getConfig

package/src/clients/fetch.ts

@@ -3,6 +3,13 @@
  */
 export type RequestCredentials = 'omit' | 'same-origin' | 'include'
 
+/**
+ * Header values may be objects (e.g. JSON-encoded filter headers like `X-Filter`).
+ * Non-string values are JSON-serialized before the request is sent.
+ */
+export type HeaderValue = string | number | boolean | null | undefined | object
+export type HeadersInit = Array<[string, HeaderValue]> | Record<string, HeaderValue>
+
 /**
  * Subset of FetchRequestConfig
  */
@@ -14,8 +21,9 @@ export type RequestConfig<TData = unknown> = {
   data?: TData | FormData
   responseType?: 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream'
   signal?: AbortSignal
-  headers?: [string, string][] | Record<string, string>
+  headers?: HeadersInit
   credentials?: RequestCredentials
+  contentType?: string
 }
 
 /**
@@ -50,6 +58,22 @@ export const mergeConfig = <T extends RequestConfig>(...configs: Array<Partial<T
   }, {})
 }
 
+/**
+ * Serializes header values into the string form `fetch` expects.
+ * Objects (including arrays) are JSON-stringified so spec-defined object
+ * headers like `X-Filter` are sent in their canonical JSON-string form.
+ */
+function serializeHeaders(headers: HeadersInit | undefined): Record<string, string> {
+  if (!headers) return {}
+  const entries = Array.isArray(headers) ? headers : Object.entries(headers)
+  const result: Record<string, string> = {}
+  for (const [key, value] of entries) {
+    if (value === undefined || value === null) continue
+    result[key] = typeof value === 'string' ? value : typeof value === 'object' ? JSON.stringify(value) : String(value)
+  }
+  return result
+}
+
 export type ResponseErrorConfig<TError = unknown> = TError
 
 export type Client = <TResponseData, _TError = unknown, TRequestData = unknown>(
@@ -77,12 +101,15 @@ export const client = async <TResponseData, _TError = unknown, RequestData = unk
     targetUrl += `?${normalizedParams}`
   }
 
-  const response = await fetch(targetUrl, {
+  const response = await globalThis.fetch(targetUrl, {
     credentials: config.credentials || 'same-origin',
     method: config.method?.toUpperCase(),
     body: config.data instanceof FormData ? config.data : JSON.stringify(config.data),
     signal: config.signal,
-    headers: config.headers,
+    headers: {
+      ...(config.contentType && config.contentType !== 'multipart/form-data' ? { 'Content-Type': config.contentType } : {}),
+      ...serializeHeaders(config.headers),
+    },
   })
 
   const data = [204, 205, 304].includes(response.status) || !response.body ? {} : await response.json()

package/src/components/ClassClient.tsx

@@ -1,3 +1,4 @@
+import { buildOperationComments, getContentTypeInfo, getOperationParameters } from '@internals/shared'
 import { buildJSDoc, URLPath } from '@internals/utils'
 import type { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
@@ -6,14 +7,14 @@ import type { ResolverZod } from '@kubb/plugin-zod'
 import { File } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginClient } from '../types.ts'
-import { buildClassClientParams, buildFormDataLine, buildGenerics, buildHeaders, buildRequestDataLine, buildReturnStatement, getComments } from '../utils.ts'
-import { Client } from './Client.tsx'
+import { buildClassClientParams, buildFormDataLine, buildGenerics, buildHeaders, buildRequestDataLine, buildReturnStatement } from '../utils.ts'
+import { buildClientParamsNode } from './Client.tsx'
 
 type OperationData = {
   node: ast.OperationNode
   name: string
   tsResolver: ResolverTs
-  zodResolver?: ResolverZod
+  zodResolver?: ResolverZod | null
 }
 
 type Props = {
@@ -21,7 +22,7 @@ type Props = {
   isExportable?: boolean
   isIndexable?: boolean
   operations: Array<OperationData>
-  baseURL: string | undefined
+  baseURL: string | null | undefined
   dataReturnType: PluginClient['resolvedOptions']['dataReturnType']
   paramsCasing: PluginClient['resolvedOptions']['paramsCasing']
   paramsType: PluginClient['resolvedOptions']['pathParamsType']
@@ -34,8 +35,8 @@ type GenerateMethodProps = {
   node: ast.OperationNode
   name: string
   tsResolver: ResolverTs
-  zodResolver?: ResolverZod
-  baseURL: string | undefined
+  zodResolver?: ResolverZod | null
+  baseURL: string | null | undefined
   dataReturnType: PluginClient['resolvedOptions']['dataReturnType']
   parser: PluginClient['resolvedOptions']['parser'] | undefined
   paramsType: PluginClient['resolvedOptions']['paramsType']
@@ -58,25 +59,23 @@ function generateMethod({
   pathParamsType,
 }: GenerateMethodProps): string {
   const path = new URLPath(node.path, { casing: paramsCasing })
-  const contentType = node.requestBody?.content?.[0]?.contentType ?? 'application/json'
-  const isFormData = contentType === 'multipart/form-data'
-  const headerParamsName =
-    node.parameters.filter((p) => p.in === 'header').length > 0
-      ? tsResolver.resolveHeaderParamsName(node, node.parameters.filter((p) => p.in === 'header')[0]!)
-      : undefined
-  const headers = buildHeaders(contentType, !!headerParamsName)
+  const { defaultContentType: contentType, isMultipleContentTypes, hasFormData } = getContentTypeInfo(node)
+  const isFormData = !isMultipleContentTypes && contentType === 'multipart/form-data'
+  const { header: headerParams } = getOperationParameters(node)
+  const headerParamsName = headerParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, headerParams[0]!) : null
+  const headers = isMultipleContentTypes ? (headerParamsName ? ['...headers'] : []) : buildHeaders(contentType, !!headerParamsName)
   const generics = buildGenerics(node, tsResolver)
-  const paramsNode = ClassClient.getParams({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable: true })
+  const paramsNode = buildClientParamsNode({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable: true })
   const paramsSignature = declarationPrinter.print(paramsNode) ?? ''
-  const clientParams = buildClassClientParams({ node, path, baseURL, tsResolver, isFormData, headers })
-  const jsdoc = buildJSDoc(getComments(node))
+  const clientParams = buildClassClientParams({ node, path, baseURL, tsResolver, isFormData, isMultipleContentTypes, hasFormData, headers })
+  const jsdoc = buildJSDoc(buildOperationComments(node, { link: 'urlPath', linkPosition: 'beforeDeprecated', splitLines: true }))
 
   const requestDataLine = buildRequestDataLine({ parser, node, zodResolver })
-  const formDataLine = buildFormDataLine(isFormData, !!node.requestBody?.content?.[0]?.schema)
+  const formDataLine = buildFormDataLine(isFormData || (isMultipleContentTypes && hasFormData), !!node.requestBody?.content?.[0]?.schema)
   const returnStatement = buildReturnStatement({ dataReturnType, parser, node, zodResolver })
 
   const methodBody = [
-    'const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)',
+    `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ''}...requestConfig } = mergeConfig(this.#config, config)`,
     '',
     requestDataLine,
     formDataLine,
@@ -135,4 +134,3 @@ ${methods.join('\n\n')}
     </File.Source>
   )
 }
-ClassClient.getParams = Client.getParams

package/src/components/Client.tsx

@@ -1,3 +1,11 @@
+import {
+  buildOperationComments,
+  buildParamsMapping,
+  buildRequestConfigType,
+  getContentTypeInfo,
+  getOperationParameters,
+  resolveSuccessNames,
+} from '@internals/shared'
 import { isValidVarName, URLPath } from '@internals/utils'
 import { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
@@ -7,8 +15,7 @@ import { File, Function } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import { createFunctionParams } from '../functionParams.ts'
 import type { PluginClient } from '../types.ts'
-import { buildParamsMapping, getComments } from '../utils.ts'
-import { Url } from './Url.tsx'
+import { buildUrlParamsNode } from './Url.tsx'
 
 type Props = {
   name: string
@@ -18,7 +25,7 @@ type Props = {
   isConfigurable?: boolean
   returnType?: string
 
-  baseURL: string | undefined
+  baseURL: string | null | undefined
   dataReturnType: PluginClient['resolvedOptions']['dataReturnType']
   paramsCasing: PluginClient['resolvedOptions']['paramsCasing']
   paramsType: PluginClient['resolvedOptions']['pathParamsType']
@@ -26,7 +33,7 @@ type Props = {
   parser: PluginClient['resolvedOptions']['parser'] | undefined
   node: ast.OperationNode
   tsResolver: ResolverTs
-  zodResolver?: ResolverZod
+  zodResolver?: ResolverZod | null
   children?: KubbReactNode
 }
 
@@ -41,26 +48,33 @@ type GetParamsProps = {
 
 const declarationPrinter = functionPrinter({ mode: 'declaration' })
 
-function getParams({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable }: GetParamsProps): ast.FunctionParametersNode {
-  const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : undefined
-
+export function buildClientParamsNode({
+  paramsType,
+  paramsCasing,
+  pathParamsType,
+  node,
+  tsResolver,
+  isConfigurable,
+}: GetParamsProps): ast.FunctionParametersNode {
   return ast.createOperationParams(node, {
     paramsType,
     pathParamsType: paramsType === 'object' ? 'object' : pathParamsType === 'object' ? 'object' : 'inline',
     paramsCasing,
     resolver: tsResolver,
-    extraParams: isConfigurable
-      ? [
-          ast.createFunctionParameter({
-            name: 'config',
-            type: ast.createParamsType({
-              variant: 'reference',
-              name: requestName ? `Partial<RequestConfig<${requestName}>> & { client?: Client }` : 'Partial<RequestConfig> & { client?: Client }',
+    extraParams: [
+      ...(isConfigurable
+        ? [
+            ast.createFunctionParameter({
+              name: 'config',
+              type: ast.createParamsType({
+                variant: 'reference',
+                name: buildRequestConfigType(node, tsResolver),
+              }),
+              default: '{}',
             }),
-            default: '{}',
-          }),
-        ]
-      : [],
+          ]
+        : []),
+    ],
   })
 }
 
@@ -83,27 +97,24 @@ export function Client({
   isConfigurable = true,
 }: Props): KubbReactNode {
   const path = new URLPath(node.path)
-  const contentType = node.requestBody?.content?.[0]?.contentType ?? 'application/json'
-  const isFormData = contentType === 'multipart/form-data'
+  const { defaultContentType: contentType, isMultipleContentTypes, hasFormData } = getContentTypeInfo(node)
+  const isFormData = !isMultipleContentTypes && contentType === 'multipart/form-data'
 
-  const originalPathParams = node.parameters.filter((p) => p.in === 'path')
-  const casedPathParams = ast.caseParams(originalPathParams, paramsCasing)
-  const originalQueryParams = node.parameters.filter((p) => p.in === 'query')
-  const casedQueryParams = ast.caseParams(originalQueryParams, paramsCasing)
-  const originalHeaderParams = node.parameters.filter((p) => p.in === 'header')
-  const casedHeaderParams = ast.caseParams(originalHeaderParams, paramsCasing)
+  const { path: originalPathParams, query: originalQueryParams, header: originalHeaderParams } = getOperationParameters(node)
+  const { path: casedPathParams, query: casedQueryParams, header: casedHeaderParams } = getOperationParameters(node, { paramsCasing })
 
-  const pathParamsMapping = paramsCasing && !urlName ? buildParamsMapping(originalPathParams, casedPathParams) : undefined
-  const queryParamsMapping = paramsCasing ? buildParamsMapping(originalQueryParams, casedQueryParams) : undefined
-  const headerParamsMapping = paramsCasing ? buildParamsMapping(originalHeaderParams, casedHeaderParams) : undefined
+  const pathParamsMapping = paramsCasing && !urlName ? buildParamsMapping(originalPathParams, casedPathParams) : null
+  const queryParamsMapping = paramsCasing ? buildParamsMapping(originalQueryParams, casedQueryParams) : null
+  const headerParamsMapping = paramsCasing ? buildParamsMapping(originalHeaderParams, casedHeaderParams) : null
 
-  const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : undefined
-  const responseName = tsResolver.resolveResponseName(node)
-  const queryParamsName = originalQueryParams.length > 0 ? tsResolver.resolveQueryParamsName(node, originalQueryParams[0]!) : undefined
-  const headerParamsName = originalHeaderParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, originalHeaderParams[0]!) : undefined
+  const requestName = node.requestBody?.content?.[0]?.schema ? tsResolver.resolveDataName(node) : null
+  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) : undefined
-  const zodRequestName = zodResolver && parser === 'zod' && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : undefined
+  const zodResponseName = zodResolver && parser === 'zod' ? zodResolver.resolveResponseName?.(node) : null
+  const zodRequestName = zodResolver && parser === 'zod' && node.requestBody?.content?.[0]?.schema ? zodResolver.resolveDataName?.(node) : null
 
   const errorNames = node.responses
     .filter((r) => {
@@ -113,14 +124,14 @@ export function Client({
     .map((r) => tsResolver.resolveResponseStatusName(node, r.statusCode))
 
   const headers = [
-    contentType !== 'application/json' && contentType !== 'multipart/form-data' ? `'Content-Type': '${contentType}'` : undefined,
-    headerParamsName ? (headerParamsMapping ? '...mappedHeaders' : '...headers') : undefined,
+    !isMultipleContentTypes && contentType !== 'application/json' && contentType !== 'multipart/form-data' ? `'Content-Type': '${contentType}'` : null,
+    headerParamsName ? (headerParamsMapping ? '...mappedHeaders' : '...headers') : null,
   ].filter(Boolean)
 
   const TError = `ResponseErrorConfig<${errorNames.length > 0 ? errorNames.join(' | ') : 'Error'}>`
 
   const generics = [responseName, TError, requestName || 'unknown'].filter(Boolean)
-  const paramsNode = getParams({
+  const paramsNode = buildClientParamsNode({
     paramsType,
     paramsCasing,
     pathParamsType,
@@ -130,7 +141,7 @@ export function Client({
   })
   const paramsSignature = declarationPrinter.print(paramsNode) ?? ''
 
-  const urlParamsNode = Url.getParams({
+  const urlParamsNode = buildUrlParamsNode({
     paramsType,
     paramsCasing,
     pathParamsType,
@@ -155,23 +166,29 @@ export function Client({
             ? {
                 value: `\`${baseURL}\``,
               }
-            : undefined,
-        params: queryParamsName ? (queryParamsMapping ? { value: 'mappedParams' } : {}) : undefined,
+            : null,
+        params: queryParamsName ? (queryParamsMapping ? { value: 'mappedParams' } : {}) : null,
         data: requestName
           ? {
-              value: isFormData ? 'formData as FormData' : 'requestData',
+              value:
+                isMultipleContentTypes && hasFormData
+                  ? "contentType === 'multipart/form-data' ? formData as FormData : requestData"
+                  : isFormData
+                    ? 'formData as FormData'
+                    : 'requestData',
             }
-          : undefined,
+          : null,
+        contentType: isConfigurable && isMultipleContentTypes ? {} : null,
         requestConfig: isConfigurable
           ? {
               mode: 'inlineSpread',
             }
-          : undefined,
+          : null,
         headers: headers.length
           ? {
               value: isConfigurable ? `{ ${headers.join(', ')}, ...requestConfig.headers }` : `{ ${headers.join(', ')} }`,
             }
-          : undefined,
+          : null,
       },
     },
   })
@@ -198,11 +215,13 @@ export function Client({
           export={isExportable}
           params={paramsSignature}
           JSDoc={{
-            comments: getComments(node),
+            comments: buildOperationComments(node, { link: 'urlPath', linkPosition: 'beforeDeprecated', splitLines: true }),
           }}
           returnType={returnType}
         >
-          {isConfigurable ? 'const { client: request = fetch, ...requestConfig } = config' : ''}
+          {isConfigurable
+            ? `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ''}...requestConfig } = config`
+            : ''}
           <br />
           <br />
           {pathParamsMapping &&
@@ -236,11 +255,11 @@ export function Client({
           )}
           {parser === 'zod' && zodRequestName ? `const requestData = ${zodRequestName}.parse(data)` : requestName && 'const requestData = data'}
           <br />
-          {isFormData && requestName && 'const formData = buildFormData(requestData)'}
+          {(isFormData || (isMultipleContentTypes && hasFormData)) && requestName && 'const formData = buildFormData(requestData)'}
           <br />
           {isConfigurable
             ? `const res = await request<${generics.join(', ')}>(${clientParams.toCall()})`
-            : `const res = await fetch<${generics.join(', ')}>(${clientParams.toCall()})`}
+            : `const res = await client<${generics.join(', ')}>(${clientParams.toCall()})`}
           <br />
           {childrenElement}
         </Function>
@@ -248,5 +267,3 @@ export function Client({
     </>
   )
 }
-
-Client.getParams = getParams

package/src/components/StaticClassClient.tsx

@@ -1,3 +1,4 @@
+import { buildOperationComments, getContentTypeInfo, getOperationParameters } from '@internals/shared'
 import { buildJSDoc, URLPath } from '@internals/utils'
 import type { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
@@ -6,14 +7,14 @@ import type { ResolverZod } from '@kubb/plugin-zod'
 import { File } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginClient } from '../types.ts'
-import { buildClassClientParams, buildFormDataLine, buildGenerics, buildHeaders, buildRequestDataLine, buildReturnStatement, getComments } from '../utils.ts'
-import { Client } from './Client.tsx'
+import { buildClassClientParams, buildFormDataLine, buildGenerics, buildHeaders, buildRequestDataLine, buildReturnStatement } from '../utils.ts'
+import { buildClientParamsNode } from './Client.tsx'
 
 type OperationData = {
   node: ast.OperationNode
   name: string
   tsResolver: ResolverTs
-  zodResolver?: ResolverZod
+  zodResolver?: ResolverZod | null
 }
 
 type Props = {
@@ -21,7 +22,7 @@ type Props = {
   isExportable?: boolean
   isIndexable?: boolean
   operations: Array<OperationData>
-  baseURL: string | undefined
+  baseURL: string | null | undefined
   dataReturnType: PluginClient['resolvedOptions']['dataReturnType']
   paramsCasing: PluginClient['resolvedOptions']['paramsCasing']
   paramsType: PluginClient['resolvedOptions']['pathParamsType']
@@ -34,8 +35,8 @@ type GenerateMethodProps = {
   node: ast.OperationNode
   name: string
   tsResolver: ResolverTs
-  zodResolver?: ResolverZod
-  baseURL: string | undefined
+  zodResolver?: ResolverZod | null
+  baseURL: string | null | undefined
   dataReturnType: PluginClient['resolvedOptions']['dataReturnType']
   parser: PluginClient['resolvedOptions']['parser'] | undefined
   paramsType: PluginClient['resolvedOptions']['paramsType']
@@ -58,25 +59,23 @@ function generateMethod({
   pathParamsType,
 }: GenerateMethodProps): string {
   const path = new URLPath(node.path, { casing: paramsCasing })
-  const contentType = node.requestBody?.content?.[0]?.contentType ?? 'application/json'
-  const isFormData = contentType === 'multipart/form-data'
-  const headerParamsName =
-    node.parameters.filter((p) => p.in === 'header').length > 0
-      ? tsResolver.resolveHeaderParamsName(node, node.parameters.filter((p) => p.in === 'header')[0]!)
-      : undefined
-  const headers = buildHeaders(contentType, !!headerParamsName)
+  const { defaultContentType: contentType, isMultipleContentTypes, hasFormData } = getContentTypeInfo(node)
+  const isFormData = !isMultipleContentTypes && contentType === 'multipart/form-data'
+  const { header: headerParams } = getOperationParameters(node)
+  const headerParamsName = headerParams.length > 0 ? tsResolver.resolveHeaderParamsName(node, headerParams[0]!) : null
+  const headers = isMultipleContentTypes ? (headerParamsName ? ['...headers'] : []) : buildHeaders(contentType, !!headerParamsName)
   const generics = buildGenerics(node, tsResolver)
-  const paramsNode = Client.getParams({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable: true })
+  const paramsNode = buildClientParamsNode({ paramsType, paramsCasing, pathParamsType, node, tsResolver, isConfigurable: true })
   const paramsSignature = declarationPrinter.print(paramsNode) ?? ''
-  const clientParams = buildClassClientParams({ node, path, baseURL, tsResolver, isFormData, headers })
-  const jsdoc = buildJSDoc(getComments(node))
+  const clientParams = buildClassClientParams({ node, path, baseURL, tsResolver, isFormData, isMultipleContentTypes, hasFormData, headers })
+  const jsdoc = buildJSDoc(buildOperationComments(node, { link: 'urlPath', linkPosition: 'beforeDeprecated', splitLines: true }))
 
   const requestDataLine = buildRequestDataLine({ parser, node, zodResolver })
-  const formDataLine = buildFormDataLine(isFormData, !!node.requestBody?.content?.[0]?.schema)
+  const formDataLine = buildFormDataLine(isFormData || (isMultipleContentTypes && hasFormData), !!node.requestBody?.content?.[0]?.schema)
   const returnStatement = buildReturnStatement({ dataReturnType, parser, node, zodResolver })
 
   const methodBody = [
-    'const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)',
+    `const { client: request = client, ${isMultipleContentTypes ? `contentType = ${JSON.stringify(contentType)}, ` : ''}...requestConfig } = mergeConfig(this.#config, config)`,
     '',
     requestDataLine,
     formDataLine,
@@ -127,4 +126,3 @@ export function StaticClassClient({
     </File.Source>
   )
 }
-StaticClassClient.getParams = Client.getParams

package/src/components/Url.tsx

@@ -1,3 +1,4 @@
+import { buildParamsMapping, getOperationParameters } from '@internals/shared'
 import { isValidVarName, URLPath } from '@internals/utils'
 import { ast } from '@kubb/core'
 import type { ResolverTs } from '@kubb/plugin-ts'
@@ -5,14 +6,13 @@ import { functionPrinter } from '@kubb/plugin-ts'
 import { Const, File, Function } from '@kubb/renderer-jsx'
 import type { KubbReactNode } from '@kubb/renderer-jsx/types'
 import type { PluginClient } from '../types.ts'
-import { buildParamsMapping } from '../utils.ts'
 
 type Props = {
   name: string
   isExportable?: boolean
   isIndexable?: boolean
 
-  baseURL: string | undefined
+  baseURL: string | null | undefined
   paramsCasing: PluginClient['resolvedOptions']['paramsCasing']
   paramsType: PluginClient['resolvedOptions']['pathParamsType']
   pathParamsType: PluginClient['resolvedOptions']['pathParamsType']
@@ -30,7 +30,7 @@ type GetParamsProps = {
 
 const declarationPrinter = functionPrinter({ mode: 'declaration' })
 
-function getParams({ paramsType, paramsCasing, pathParamsType, node, tsResolver }: GetParamsProps): ast.FunctionParametersNode {
+export function buildUrlParamsNode({ paramsType, paramsCasing, pathParamsType, node, tsResolver }: GetParamsProps): ast.FunctionParametersNode {
   // Build a URL-only node with only path params (no body, query, header)
   const urlNode: ast.OperationNode = {
     ...node,
@@ -59,7 +59,7 @@ export function Url({
 }: Props): KubbReactNode {
   const path = new URLPath(node.path)
 
-  const paramsNode = getParams({
+  const paramsNode = buildUrlParamsNode({
     paramsType,
     paramsCasing,
     pathParamsType,
@@ -68,9 +68,9 @@ export function Url({
   })
   const paramsSignature = declarationPrinter.print(paramsNode) ?? ''
 
-  const originalPathParams = node.parameters.filter((p) => p.in === 'path')
-  const casedPathParams = ast.caseParams(originalPathParams, paramsCasing)
-  const pathParamsMapping = paramsCasing ? buildParamsMapping(originalPathParams, casedPathParams) : undefined
+  const { path: originalPathParams } = getOperationParameters(node)
+  const { path: casedPathParams } = getOperationParameters(node, { paramsCasing })
+  const pathParamsMapping = paramsCasing ? buildParamsMapping(originalPathParams, casedPathParams) : null
 
   return (
     <File.Source name={name} isExportable={isExportable} isIndexable={isIndexable}>
@@ -88,5 +88,3 @@ export function Url({
     </File.Source>
   )
 }
-
-Url.getParams = getParams