@kubb/plugin-client 4.22.3 → 4.23.0

package/src/clients/axios.ts

@@ -46,25 +46,27 @@ export const setConfig = (config: RequestConfig) => {
   return getConfig()
 }
 
+export const mergeConfig = <T extends RequestConfig>(...configs: Array<Partial<T>>): Partial<T> => {
+  return configs.reduce<Partial<T>>((merged, config) => {
+    return {
+      ...merged,
+      ...config,
+      headers: {
+        ...merged.headers,
+        ...config.headers,
+      },
+    }
+  }, {})
+}
+
 export const axiosInstance = axios.create(getConfig())
 
 export const client = async <TResponseData, TError = unknown, TRequestData = unknown>(
   config: RequestConfig<TRequestData>,
 ): Promise<ResponseConfig<TResponseData>> => {
-  const globalConfig = getConfig()
-
-  return axiosInstance
-    .request<TResponseData, ResponseConfig<TResponseData>>({
-      ...globalConfig,
-      ...config,
-      headers: {
-        ...globalConfig.headers,
-        ...config.headers,
-      },
-    })
-    .catch((e: AxiosError<TError>) => {
-      throw e
-    })
+  return axiosInstance.request<TResponseData, ResponseConfig<TResponseData>>(mergeConfig(getConfig(), config)).catch((e: AxiosError<TError>) => {
+    throw e
+  })
 }
 
 client.getConfig = getConfig

package/src/clients/fetch.ts

@@ -37,6 +37,19 @@ export const setConfig = (config: Partial<RequestConfig>) => {
   return getConfig()
 }
 
+export const mergeConfig = <T extends RequestConfig>(...configs: Array<Partial<T>>): Partial<T> => {
+  return configs.reduce<Partial<T>>((merged, config) => {
+    return {
+      ...merged,
+      ...config,
+      headers: {
+        ...(Array.isArray(merged.headers) ? Object.fromEntries(merged.headers) : merged.headers),
+        ...(Array.isArray(config.headers) ? Object.fromEntries(config.headers) : config.headers),
+      },
+    }
+  }, {})
+}
+
 export type ResponseErrorConfig<TError = unknown> = TError
 
 export type Client = <TResponseData, _TError = unknown, TRequestData = unknown>(config: RequestConfig<TRequestData>) => Promise<ResponseConfig<TResponseData>>
@@ -46,15 +59,7 @@ export const client = async <TResponseData, _TError = unknown, RequestData = unk
 ): Promise<ResponseConfig<TResponseData>> => {
   const normalizedParams = new URLSearchParams()
 
-  const globalConfig = getConfig()
-  const config = {
-    ...globalConfig,
-    ...paramsConfig,
-    headers: {
-      ...(Array.isArray(globalConfig.headers) ? Object.fromEntries(globalConfig.headers) : globalConfig.headers),
-      ...(Array.isArray(paramsConfig.headers) ? Object.fromEntries(paramsConfig.headers) : paramsConfig.headers),
-    },
-  }
+  const config = mergeConfig(getConfig(), paramsConfig)
 
   Object.entries(config.params || {}).forEach(([key, value]) => {
     if (value !== undefined) {

package/src/components/ClassClient.tsx

@@ -74,6 +74,9 @@ function buildClientParams({
     config: {
       mode: 'object',
       children: {
+        requestConfig: {
+          mode: 'inlineSpread',
+        },
         method: {
           value: JSON.stringify(operation.method.toUpperCase()),
         },
@@ -91,9 +94,6 @@ function buildClientParams({
               value: isFormData ? 'formData as FormData' : 'requestData',
             }
           : undefined,
-        requestConfig: {
-          mode: 'inlineSpread',
-        },
         headers: headers.length
           ? {
               value: `{ ${headers.join(', ')}, ...requestConfig.headers }`,
@@ -173,7 +173,7 @@ function generateMethod({
   const returnStatement = buildReturnStatement({ dataReturnType, parser, zodSchemas })
 
   const methodBody = [
-    'const { client: request = this.#client, ...requestConfig } = config',
+    'const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)',
     '',
     requestDataLine,
     formDataLine,
@@ -216,10 +216,10 @@ export function ClassClient({
   )
 
   const classCode = `export class ${name} {
-  #client: Client
+  #config: Partial<RequestConfig> & { client?: Client }
 
   constructor(config: Partial<RequestConfig> & { client?: Client } = {}) {
-    this.#client = config.client || fetch
+    this.#config = config
   }
 
 ${methods.join('\n\n')}

package/src/components/StaticClassClient.tsx

@@ -70,6 +70,9 @@ function buildClientParams({
     config: {
       mode: 'object',
       children: {
+        requestConfig: {
+          mode: 'inlineSpread',
+        },
         method: {
           value: JSON.stringify(operation.method.toUpperCase()),
         },
@@ -87,9 +90,6 @@ function buildClientParams({
               value: isFormData ? 'formData as FormData' : 'requestData',
             }
           : undefined,
-        requestConfig: {
-          mode: 'inlineSpread',
-        },
         headers: headers.length
           ? {
               value: `{ ${headers.join(', ')}, ...requestConfig.headers }`,
@@ -169,7 +169,7 @@ function generateMethod({
   const returnStatement = buildReturnStatement({ dataReturnType, parser, zodSchemas })
 
   const methodBody = [
-    'const { client: request = this.#client, ...requestConfig } = config',
+    'const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)',
     '',
     requestDataLine,
     formDataLine,
@@ -212,7 +212,7 @@ export function StaticClassClient({
     }),
   )
 
-  const classCode = `export class ${name} {\n  static #client: Client = fetch\n\n${methods.join('\n\n')}\n}`
+  const classCode = `export class ${name} {\n  static #config: Partial<RequestConfig> & { client?: Client } = {}\n\n${methods.join('\n\n')}\n}`
 
   return (
     <File.Source name={name} isExportable={isExportable} isIndexable={isIndexable}>

package/src/generators/__snapshots__/Pet.ts

@@ -2,6 +2,7 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
+import fetch from './test/.kubb/fetch'
 import type { Client, RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type {
   UpdatePetMutationRequest,
@@ -36,13 +37,13 @@ import type {
   UploadFileQueryParams,
 } from './findByTags'
 import { buildFormData } from './test/.kubb/config'
-import { fetch } from './test/.kubb/fetch'
+import { mergeConfig } from './test/.kubb/fetch'
 
 export class Pet {
-  #client: Client
+  #config: Partial<RequestConfig> & { client?: Client }
 
   constructor(config: Partial<RequestConfig> & { client?: Client } = {}) {
-    this.#client = config.client || fetch
+    this.#config = config
   }
 
   /**
@@ -51,13 +52,13 @@ export class Pet {
    * {@link /pet}
    */
   async updatePet(data: UpdatePetMutationRequest, config: Partial<RequestConfig<UpdatePetMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<UpdatePetMutationResponse, ResponseErrorConfig<UpdatePet400 | UpdatePet404 | UpdatePet405>, UpdatePetMutationRequest>({
+      ...requestConfig,
       method: 'PUT',
       url: `/pet`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -68,13 +69,13 @@ export class Pet {
    * {@link /pet}
    */
   async addPet(data: AddPetMutationRequest, config: Partial<RequestConfig<AddPetMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<AddPetMutationResponse, ResponseErrorConfig<AddPet405>, AddPetMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/pet`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -85,12 +86,12 @@ export class Pet {
    * {@link /pet/findByStatus}
    */
   async findPetsByStatus(params?: FindPetsByStatusQueryParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<FindPetsByStatusQueryResponse, ResponseErrorConfig<FindPetsByStatus400>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/pet/findByStatus`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -101,12 +102,12 @@ export class Pet {
    * {@link /pet/findByTags}
    */
   async findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<FindPetsByTagsQueryResponse, ResponseErrorConfig<FindPetsByTags400>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/pet/findByTags`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -117,11 +118,11 @@ export class Pet {
    * {@link /pet/:petId}
    */
   async getPetById(petId: GetPetByIdPathParams['petId'], config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<GetPetByIdQueryResponse, ResponseErrorConfig<GetPetById400 | GetPetById404>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/pet/${petId}`,
-      ...requestConfig,
     })
     return res.data
   }
@@ -135,12 +136,12 @@ export class Pet {
     params?: UpdatePetWithFormQueryParams,
     config: Partial<RequestConfig> & { client?: Client } = {},
   ) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<UpdatePetWithFormMutationResponse, ResponseErrorConfig<UpdatePetWithForm405>, unknown>({
+      ...requestConfig,
       method: 'POST',
       url: `/pet/${petId}`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -151,11 +152,11 @@ export class Pet {
    * {@link /pet/:petId}
    */
   async deletePet(petId: DeletePetPathParams['petId'], headers?: DeletePetHeaderParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<DeletePetMutationResponse, ResponseErrorConfig<DeletePet400>, unknown>({
+      ...requestConfig,
       method: 'DELETE',
       url: `/pet/${petId}`,
-      ...requestConfig,
       headers: { ...headers, ...requestConfig.headers },
     })
     return res.data
@@ -171,15 +172,15 @@ export class Pet {
     params?: UploadFileQueryParams,
     config: Partial<RequestConfig<UploadFileMutationRequest>> & { client?: Client } = {},
   ) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const formData = buildFormData(requestData)
     const res = await request<UploadFileMutationResponse, ResponseErrorConfig<Error>, UploadFileMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/pet/${petId}/uploadImage`,
       params,
       data: formData as FormData,
-      ...requestConfig,
     })
     return res.data
   }

package/src/generators/__snapshots__/Store.ts

@@ -2,6 +2,7 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
+import fetch from './test/.kubb/fetch'
 import type { Client, RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type {
   GetInventoryQueryResponse,
@@ -20,13 +21,13 @@ import type {
   DeleteOrder400,
   DeleteOrder404,
 } from './findByTags'
-import { fetch } from './test/.kubb/fetch'
+import { mergeConfig } from './test/.kubb/fetch'
 
 export class Store {
-  #client: Client
+  #config: Partial<RequestConfig> & { client?: Client }
 
   constructor(config: Partial<RequestConfig> & { client?: Client } = {}) {
-    this.#client = config.client || fetch
+    this.#config = config
   }
 
   /**
@@ -35,8 +36,8 @@ export class Store {
    * {@link /store/inventory}
    */
   async getInventory(config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
-    const res = await request<GetInventoryQueryResponse, ResponseErrorConfig<Error>, unknown>({ method: 'GET', url: `/store/inventory`, ...requestConfig })
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
+    const res = await request<GetInventoryQueryResponse, ResponseErrorConfig<Error>, unknown>({ ...requestConfig, method: 'GET', url: `/store/inventory` })
     return res.data
   }
 
@@ -46,13 +47,13 @@ export class Store {
    * {@link /store/order}
    */
   async placeOrder(data?: PlaceOrderMutationRequest, config: Partial<RequestConfig<PlaceOrderMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<PlaceOrderMutationResponse, ResponseErrorConfig<PlaceOrder405>, PlaceOrderMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/store/order`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -63,13 +64,13 @@ export class Store {
    * {@link /store/order}
    */
   async placeOrderPatch(data?: PlaceOrderPatchMutationRequest, config: Partial<RequestConfig<PlaceOrderPatchMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<PlaceOrderPatchMutationResponse, ResponseErrorConfig<PlaceOrderPatch405>, PlaceOrderPatchMutationRequest>({
+      ...requestConfig,
       method: 'PATCH',
       url: `/store/order`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -80,11 +81,11 @@ export class Store {
    * {@link /store/order/:orderId}
    */
   async getOrderById(orderId: GetOrderByIdPathParams['orderId'], config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<GetOrderByIdQueryResponse, ResponseErrorConfig<GetOrderById400 | GetOrderById404>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/store/order/${orderId}`,
-      ...requestConfig,
     })
     return res.data
   }
@@ -95,11 +96,11 @@ export class Store {
    * {@link /store/order/:orderId}
    */
   async deleteOrder(orderId: DeleteOrderPathParams['orderId'], config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<DeleteOrderMutationResponse, ResponseErrorConfig<DeleteOrder400 | DeleteOrder404>, unknown>({
+      ...requestConfig,
       method: 'DELETE',
       url: `/store/order/${orderId}`,
-      ...requestConfig,
     })
     return res.data
   }

package/src/generators/__snapshots__/User.ts

@@ -2,6 +2,7 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
+import fetch from './test/.kubb/fetch'
 import type { Client, RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type {
   CreateUserMutationRequest,
@@ -24,13 +25,13 @@ import type {
   DeleteUser400,
   DeleteUser404,
 } from './findByTags'
-import { fetch } from './test/.kubb/fetch'
+import { mergeConfig } from './test/.kubb/fetch'
 
 export class User {
-  #client: Client
+  #config: Partial<RequestConfig> & { client?: Client }
 
   constructor(config: Partial<RequestConfig> & { client?: Client } = {}) {
-    this.#client = config.client || fetch
+    this.#config = config
   }
 
   /**
@@ -39,13 +40,13 @@ export class User {
    * {@link /user}
    */
   async createUser(data?: CreateUserMutationRequest, config: Partial<RequestConfig<CreateUserMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<CreateUserMutationResponse, ResponseErrorConfig<Error>, CreateUserMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/user`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -59,13 +60,13 @@ export class User {
     data?: CreateUsersWithListInputMutationRequest,
     config: Partial<RequestConfig<CreateUsersWithListInputMutationRequest>> & { client?: Client } = {},
   ) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<CreateUsersWithListInputMutationResponse, ResponseErrorConfig<Error>, CreateUsersWithListInputMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/user/createWithList`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -75,12 +76,12 @@ export class User {
    * {@link /user/login}
    */
   async loginUser(params?: LoginUserQueryParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<LoginUserQueryResponse, ResponseErrorConfig<LoginUser400>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/user/login`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -90,8 +91,8 @@ export class User {
    * {@link /user/logout}
    */
   async logoutUser(config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
-    const res = await request<LogoutUserQueryResponse, ResponseErrorConfig<Error>, unknown>({ method: 'GET', url: `/user/logout`, ...requestConfig })
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
+    const res = await request<LogoutUserQueryResponse, ResponseErrorConfig<Error>, unknown>({ ...requestConfig, method: 'GET', url: `/user/logout` })
     return res.data
   }
 
@@ -100,11 +101,11 @@ export class User {
    * {@link /user/:username}
    */
   async getUserByName(username: GetUserByNamePathParams['username'], config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<GetUserByNameQueryResponse, ResponseErrorConfig<GetUserByName400 | GetUserByName404>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/user/${username}`,
-      ...requestConfig,
     })
     return res.data
   }
@@ -119,13 +120,13 @@ export class User {
     data?: UpdateUserMutationRequest,
     config: Partial<RequestConfig<UpdateUserMutationRequest>> & { client?: Client } = {},
   ) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<UpdateUserMutationResponse, ResponseErrorConfig<Error>, UpdateUserMutationRequest>({
+      ...requestConfig,
       method: 'PUT',
       url: `/user/${username}`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -136,11 +137,11 @@ export class User {
    * {@link /user/:username}
    */
   async deleteUser(username: DeleteUserPathParams['username'], config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<DeleteUserMutationResponse, ResponseErrorConfig<DeleteUser400 | DeleteUser404>, unknown>({
+      ...requestConfig,
       method: 'DELETE',
       url: `/user/${username}`,
-      ...requestConfig,
     })
     return res.data
   }

package/src/generators/__snapshots__/static/Pet.ts

@@ -2,6 +2,7 @@
  * Generated by Kubb (https://kubb.dev/).
  * Do not edit manually.
  */
+import fetch from './test/.kubb/fetch'
 import type { Client, RequestConfig, ResponseErrorConfig } from './test/.kubb/fetch'
 import type {
   UpdatePetMutationRequest,
@@ -36,10 +37,10 @@ import type {
   UploadFileQueryParams,
 } from './findByTags'
 import { buildFormData } from './test/.kubb/config'
-import { fetch } from './test/.kubb/fetch'
+import { mergeConfig } from './test/.kubb/fetch'
 
 export class Pet {
-  static #client: Client = fetch
+  static #config: Partial<RequestConfig> & { client?: Client } = {}
 
   /**
    * @description Update an existing pet by Id
@@ -47,13 +48,13 @@ export class Pet {
    * {@link /pet}
    */
   static async updatePet(data: UpdatePetMutationRequest, config: Partial<RequestConfig<UpdatePetMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<UpdatePetMutationResponse, ResponseErrorConfig<UpdatePet400 | UpdatePet404 | UpdatePet405>, UpdatePetMutationRequest>({
+      ...requestConfig,
       method: 'PUT',
       url: `/pet`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -64,13 +65,13 @@ export class Pet {
    * {@link /pet}
    */
   static async addPet(data: AddPetMutationRequest, config: Partial<RequestConfig<AddPetMutationRequest>> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const res = await request<AddPetMutationResponse, ResponseErrorConfig<AddPet405>, AddPetMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/pet`,
       data: requestData,
-      ...requestConfig,
     })
     return res.data
   }
@@ -81,12 +82,12 @@ export class Pet {
    * {@link /pet/findByStatus}
    */
   static async findPetsByStatus(params?: FindPetsByStatusQueryParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<FindPetsByStatusQueryResponse, ResponseErrorConfig<FindPetsByStatus400>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/pet/findByStatus`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -97,12 +98,12 @@ export class Pet {
    * {@link /pet/findByTags}
    */
   static async findPetsByTags(params?: FindPetsByTagsQueryParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<FindPetsByTagsQueryResponse, ResponseErrorConfig<FindPetsByTags400>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/pet/findByTags`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -113,11 +114,11 @@ export class Pet {
    * {@link /pet/:petId}
    */
   static async getPetById(petId: GetPetByIdPathParams['petId'], config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<GetPetByIdQueryResponse, ResponseErrorConfig<GetPetById400 | GetPetById404>, unknown>({
+      ...requestConfig,
       method: 'GET',
       url: `/pet/${petId}`,
-      ...requestConfig,
     })
     return res.data
   }
@@ -131,12 +132,12 @@ export class Pet {
     params?: UpdatePetWithFormQueryParams,
     config: Partial<RequestConfig> & { client?: Client } = {},
   ) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<UpdatePetWithFormMutationResponse, ResponseErrorConfig<UpdatePetWithForm405>, unknown>({
+      ...requestConfig,
       method: 'POST',
       url: `/pet/${petId}`,
       params,
-      ...requestConfig,
     })
     return res.data
   }
@@ -147,11 +148,11 @@ export class Pet {
    * {@link /pet/:petId}
    */
   static async deletePet(petId: DeletePetPathParams['petId'], headers?: DeletePetHeaderParams, config: Partial<RequestConfig> & { client?: Client } = {}) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const res = await request<DeletePetMutationResponse, ResponseErrorConfig<DeletePet400>, unknown>({
+      ...requestConfig,
       method: 'DELETE',
       url: `/pet/${petId}`,
-      ...requestConfig,
       headers: { ...headers, ...requestConfig.headers },
     })
     return res.data
@@ -167,15 +168,15 @@ export class Pet {
     params?: UploadFileQueryParams,
     config: Partial<RequestConfig<UploadFileMutationRequest>> & { client?: Client } = {},
   ) {
-    const { client: request = this.#client, ...requestConfig } = config
+    const { client: request = fetch, ...requestConfig } = mergeConfig(this.#config, config)
     const requestData = data
     const formData = buildFormData(requestData)
     const res = await request<UploadFileMutationResponse, ResponseErrorConfig<Error>, UploadFileMutationRequest>({
+      ...requestConfig,
       method: 'POST',
       url: `/pet/${petId}/uploadImage`,
       params,
       data: formData as FormData,
-      ...requestConfig,
     })
     return res.data
   }