From 5942324bfa163c472e2da86bd17a5389f2a2a8cf Mon Sep 17 00:00:00 2001
From: Lubos <lubos@heyapi.dev>
Date: Wed, 29 Oct 2025 21:33:00 +0800
Subject: [PATCH 1/2] refactor: remove selectors from client plugins

---
 packages/custom-client/src/plugin.ts          | 25 +----
 .../sdk-client-required/sdk.gen.ts            | 97 ++++++++++---------
 .../sdk-client-required/sdk.gen.ts            | 97 ++++++++++---------
 .../sdk-client-required/sdk.gen.ts            | 97 ++++++++++---------
 .../sdk-client-required/sdk.gen.ts            | 97 ++++++++++---------
 .../sdk-client-required/sdk.gen.ts            | 97 ++++++++++---------
 .../sdk-client-required/sdk.gen.ts            | 97 ++++++++++---------
 .../my-client/base-url-false/client/plugin.ts | 25 +----
 .../base-url-number/client/plugin.ts          | 25 +----
 .../base-url-strict/client/plugin.ts          | 25 +----
 .../base-url-string/client/plugin.ts          | 25 +----
 .../clients/my-client/bundle/client/plugin.ts | 25 +----
 .../my-client/default/client/plugin.ts        | 25 +----
 .../sdk-client-optional/client/plugin.ts      | 25 +----
 .../sdk-client-required/client/plugin.ts      | 25 +----
 .../my-client/sdk-client-required/sdk.gen.ts  | 97 ++++++++++---------
 .../main/test/custom/client/plugin.ts         | 25 +----
 packages/openapi-ts/src/index.ts              |  8 +-
 .../plugins/@angular/common/httpRequests.ts   | 12 +--
 .../plugins/@hey-api/client-angular/api.ts    | 25 +----
 .../plugins/@hey-api/client-angular/config.ts |  4 +-
 .../src/plugins/@hey-api/client-axios/api.ts  | 25 +----
 .../plugins/@hey-api/client-axios/config.ts   |  4 +-
 .../plugins/@hey-api/client-core/client.ts    |  4 +-
 .../src/plugins/@hey-api/client-fetch/api.ts  | 25 +----
 .../plugins/@hey-api/client-fetch/config.ts   |  4 +-
 .../src/plugins/@hey-api/client-next/api.ts   | 25 +----
 .../plugins/@hey-api/client-next/config.ts    |  4 +-
 .../src/plugins/@hey-api/client-nuxt/api.ts   | 25 +----
 .../plugins/@hey-api/client-nuxt/config.ts    |  4 +-
 .../src/plugins/@hey-api/client-ofetch/api.ts | 25 +----
 .../plugins/@hey-api/client-ofetch/config.ts  |  4 +-
 .../src/plugins/@hey-api/sdk/shared/class.ts  | 11 +--
 .../plugins/@hey-api/sdk/shared/operation.ts  | 10 +-
 .../src/plugins/@pinia/colada/queryKey.ts     | 16 +--
 .../plugins/@tanstack/query-core/queryKey.ts  | 16 +--
 36 files changed, 418 insertions(+), 762 deletions(-)

diff --git a/packages/custom-client/src/plugin.ts b/packages/custom-client/src/plugin.ts
index a69653309..07967bd22 100644
--- a/packages/custom-client/src/plugin.ts
+++ b/packages/custom-client/src/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type CustomClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: CustomClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/custom-client',
-  }),
+  api: new Api(),
   config: {
     ...clientDefaultConfig,
     bundle: false,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts
index bcdd2c9b8..7669e3bbf 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts
@@ -1,6 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -18,21 +19,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return options.client.post<ImportResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/no+tag',
         ...options,
@@ -44,14 +45,14 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/simple/$count',
         ...options
@@ -59,7 +60,7 @@ export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = f
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/simple:operation',
         ...options
@@ -67,63 +68,63 @@ export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.head<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.options<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.patch<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -133,14 +134,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -151,7 +152,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -162,7 +163,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -173,7 +174,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/parameters',
         ...options,
@@ -185,7 +186,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -196,7 +197,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -208,63 +209,63 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
@@ -272,7 +273,7 @@ export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolea
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
@@ -280,21 +281,21 @@ export const dummyA = <ThrowOnError extends boolean = false>(options: Options<Du
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/response',
         ...options
@@ -302,7 +303,7 @@ export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/response',
         ...options
@@ -310,14 +311,14 @@ export const callWithResponses = <ThrowOnError extends boolean = false>(options:
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return options.client.get<TypesResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/types',
         ...options
@@ -325,7 +326,7 @@ export const types = <ThrowOnError extends boolean = false>(options: Options<Typ
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         responseType: 'json',
         url: '/api/v{api-version}/upload',
@@ -338,7 +339,7 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
         responseType: 'blob',
         url: '/api/v{api-version}/file/{id}',
         ...options
@@ -346,7 +347,7 @@ export const fileResponse = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -363,14 +364,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -382,7 +383,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/complex/{id}',
         ...options,
@@ -394,21 +395,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
@@ -419,7 +420,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts
index 46c88a35e..36eebd166 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts
@@ -1,6 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -18,21 +19,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return options.client.post<ImportResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -43,84 +44,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.head<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.options<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.patch<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -130,14 +131,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -148,7 +149,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -159,7 +160,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -170,7 +171,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -181,7 +182,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -192,7 +193,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -204,119 +205,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return options.client.get<TypesResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -328,14 +329,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -351,14 +352,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -370,7 +371,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -381,21 +382,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -405,7 +406,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts
index 46c88a35e..36eebd166 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts
@@ -1,6 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -18,21 +19,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return options.client.post<ImportResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -43,84 +44,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.head<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.options<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.patch<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -130,14 +131,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -148,7 +149,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -159,7 +160,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -170,7 +171,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -181,7 +182,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -192,7 +193,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -204,119 +205,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return options.client.get<TypesResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -328,14 +329,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -351,14 +352,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -370,7 +371,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -381,21 +382,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -405,7 +406,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts
index 7531bcd3d..1b5a3684e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts
@@ -1,6 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, TypesResponse, UploadFileData, UploadFileResponse } from './types.gen';
 
 export type Options<TComposable extends Composable = '$fetch', TData extends TDataShape = TDataShape, ResT = unknown, DefaultT = undefined> = Options2<TComposable, TData, ResT, DefaultT> & {
@@ -18,21 +19,21 @@ export type Options<TComposable extends Composable = '$fetch', TData extends TDa
 };
 
 export const export_ = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, ExportData, unknown, DefaultT>) => {
-    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PatchApiVbyApiVersionNoTagData, unknown, DefaultT>) => {
-    return options.client.patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <TComposable extends Composable = '$fetch', DefaultT extends ImportResponse = ImportResponse>(options: Options<TComposable, ImportData, ImportResponse, DefaultT>) => {
-    return options.client.post<TComposable, ImportResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, ImportResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -43,84 +44,84 @@ export const import_ = <TComposable extends Composable = '$fetch', DefaultT exte
 };
 
 export const fooWow = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, FooWowData, unknown, DefaultT>) => {
-    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <TComposable extends Composable = '$fetch', DefaultT extends ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponse>(options: Options<TComposable, ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, DefaultT>) => {
-    return options.client.get<TComposable, ApiVVersionODataControllerCountResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, ApiVVersionODataControllerCountResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <TComposable extends Composable = '$fetch', DefaultT extends GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponse>(options: Options<TComposable, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationResponse, DefaultT>) => {
-    return options.client.get<TComposable, GetApiVbyApiVersionSimpleOperationResponse | DefaultT, GetApiVbyApiVersionSimpleOperationError, DefaultT>({
+    return (options.client ?? client).get<TComposable, GetApiVbyApiVersionSimpleOperationResponse | DefaultT, GetApiVbyApiVersionSimpleOperationError, DefaultT>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DeleteCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, GetCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, HeadCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.head<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).head<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, OptionsCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.options<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).options<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PatchCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PostCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PutCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DeleteFooData3, unknown, DefaultT>) => {
-    return options.client.delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithDescriptionsData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -130,14 +131,14 @@ export const callWithDescriptions = <TComposable extends Composable = '$fetch',
  * @deprecated
  */
 export const deprecatedCall = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DeprecatedCallData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithParametersData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -148,7 +149,7 @@ export const callWithParameters = <TComposable extends Composable = '$fetch', De
 };
 
 export const callWithWeirdParameterNames = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithWeirdParameterNamesData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -159,7 +160,7 @@ export const callWithWeirdParameterNames = <TComposable extends Composable = '$f
 };
 
 export const getCallWithOptionalParam = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, GetCallWithOptionalParamData, unknown, DefaultT>) => {
-    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -170,7 +171,7 @@ export const getCallWithOptionalParam = <TComposable extends Composable = '$fetc
 };
 
 export const postCallWithOptionalParam = <TComposable extends Composable = '$fetch', DefaultT extends PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponse>(options: Options<TComposable, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, DefaultT>) => {
-    return options.client.post<TComposable, PostCallWithOptionalParamResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, PostCallWithOptionalParamResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -181,7 +182,7 @@ export const postCallWithOptionalParam = <TComposable extends Composable = '$fet
 };
 
 export const postApiVbyApiVersionRequestBody = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PostApiVbyApiVersionRequestBodyData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -192,7 +193,7 @@ export const postApiVbyApiVersionRequestBody = <TComposable extends Composable =
 };
 
 export const postApiVbyApiVersionFormData = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PostApiVbyApiVersionFormDataData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -204,119 +205,119 @@ export const postApiVbyApiVersionFormData = <TComposable extends Composable = '$
 };
 
 export const callWithDefaultParameters = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithDefaultParametersData, unknown, DefaultT>) => {
-    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithDefaultOptionalParametersData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallToTestOrderOfParamsData, unknown, DefaultT>) => {
-    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateNameData, unknown, DefaultT>) => {
-    return options.client.delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateName2Data, unknown, DefaultT>) => {
-    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateName3Data, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateName4Data, unknown, DefaultT>) => {
-    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <TComposable extends Composable = '$fetch', DefaultT extends CallWithNoContentResponseResponse = CallWithNoContentResponseResponse>(options: Options<TComposable, CallWithNoContentResponseData, CallWithNoContentResponseResponse, DefaultT>) => {
-    return options.client.get<TComposable, CallWithNoContentResponseResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, CallWithNoContentResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <TComposable extends Composable = '$fetch', DefaultT extends CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponse>(options: Options<TComposable, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, DefaultT>) => {
-    return options.client.get<TComposable, CallWithResponseAndNoContentResponseResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, CallWithResponseAndNoContentResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <TComposable extends Composable = '$fetch', DefaultT extends DummyAResponse = DummyAResponse>(options: Options<TComposable, DummyAData, DummyAResponse, DefaultT>) => {
-    return options.client.get<TComposable, DummyAResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, DummyAResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <TComposable extends Composable = '$fetch', DefaultT extends DummyBResponse = DummyBResponse>(options: Options<TComposable, DummyBData, DummyBResponse, DefaultT>) => {
-    return options.client.get<TComposable, DummyBResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, DummyBResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <TComposable extends Composable = '$fetch', DefaultT extends CallWithResponseResponse = CallWithResponseResponse>(options: Options<TComposable, CallWithResponseData, CallWithResponseResponse, DefaultT>) => {
-    return options.client.get<TComposable, CallWithResponseResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, CallWithResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <TComposable extends Composable = '$fetch', DefaultT extends CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponse>(options: Options<TComposable, CallWithDuplicateResponsesData, CallWithDuplicateResponsesResponse, DefaultT>) => {
-    return options.client.post<TComposable, CallWithDuplicateResponsesResponse | DefaultT, CallWithDuplicateResponsesError, DefaultT>({
+    return (options.client ?? client).post<TComposable, CallWithDuplicateResponsesResponse | DefaultT, CallWithDuplicateResponsesError, DefaultT>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <TComposable extends Composable = '$fetch', DefaultT extends CallWithResponsesResponse = CallWithResponsesResponse>(options: Options<TComposable, CallWithResponsesData, CallWithResponsesResponse, DefaultT>) => {
-    return options.client.put<TComposable, CallWithResponsesResponse | DefaultT, CallWithResponsesError, DefaultT>({
+    return (options.client ?? client).put<TComposable, CallWithResponsesResponse | DefaultT, CallWithResponsesError, DefaultT>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CollectionFormatData, unknown, DefaultT>) => {
-    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <TComposable extends Composable = '$fetch', DefaultT extends TypesResponse = TypesResponse>(options: Options<TComposable, TypesData, TypesResponse, DefaultT>) => {
-    return options.client.get<TComposable, TypesResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, TypesResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <TComposable extends Composable = '$fetch', DefaultT extends UploadFileResponse = UploadFileResponse>(options: Options<TComposable, UploadFileData, UploadFileResponse, DefaultT>) => {
-    return options.client.post<TComposable, UploadFileResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, UploadFileResponse | DefaultT, unknown, DefaultT>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -328,14 +329,14 @@ export const uploadFile = <TComposable extends Composable = '$fetch', DefaultT e
 };
 
 export const fileResponse = <TComposable extends Composable = '$fetch', DefaultT extends FileResponseResponse = FileResponseResponse>(options: Options<TComposable, FileResponseData, FileResponseResponse, DefaultT>) => {
-    return options.client.get<TComposable, FileResponseResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, FileResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <TComposable extends Composable = '$fetch', DefaultT extends ComplexTypesResponse = ComplexTypesResponse>(options: Options<TComposable, ComplexTypesData, ComplexTypesResponse, DefaultT>) => {
-    return options.client.get<TComposable, ComplexTypesResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, ComplexTypesResponse | DefaultT, unknown, DefaultT>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -351,14 +352,14 @@ export const complexTypes = <TComposable extends Composable = '$fetch', DefaultT
 };
 
 export const multipartResponse = <TComposable extends Composable = '$fetch', DefaultT extends MultipartResponseResponse = MultipartResponseResponse>(options: Options<TComposable, MultipartResponseData, MultipartResponseResponse, DefaultT>) => {
-    return options.client.get<TComposable, MultipartResponseResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).get<TComposable, MultipartResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, MultipartRequestData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -370,7 +371,7 @@ export const multipartRequest = <TComposable extends Composable = '$fetch', Defa
 };
 
 export const complexParams = <TComposable extends Composable = '$fetch', DefaultT extends ComplexParamsResponse = ComplexParamsResponse>(options: Options<TComposable, ComplexParamsData, ComplexParamsResponse, DefaultT>) => {
-    return options.client.put<TComposable, ComplexParamsResponse | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).put<TComposable, ComplexParamsResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -381,21 +382,21 @@ export const complexParams = <TComposable extends Composable = '$fetch', Default
 };
 
 export const callWithResultFromHeader = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithResultFromHeaderData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, TestErrorCodeData, unknown, DefaultT>) => {
-    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <TComposable extends Composable = '$fetch', DefaultT extends NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Response>(options: Options<TComposable, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultT>) => {
-    return options.client.post<TComposable, NonAsciiæøåÆøÅöôêÊ字符串Response | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).post<TComposable, NonAsciiæøåÆøÅöôêÊ字符串Response | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -405,7 +406,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <TComposable extends Compos
  * Login User
  */
 export const putWithFormUrlEncoded = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PutWithFormUrlEncodedData, unknown, DefaultT>) => {
-    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts
index 46c88a35e..36eebd166 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts
@@ -1,6 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -18,21 +19,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return options.client.post<ImportResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -43,84 +44,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.head<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.options<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.patch<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -130,14 +131,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -148,7 +149,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -159,7 +160,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -170,7 +171,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -181,7 +182,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -192,7 +193,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -204,119 +205,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return options.client.get<TypesResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -328,14 +329,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -351,14 +352,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -370,7 +371,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -381,21 +382,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -405,7 +406,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts
index c3a5a488c..dc72200dc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts
@@ -2,6 +2,7 @@
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client';
 
+import { client } from './custom-client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -19,21 +20,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return options.client.post<ImportResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -44,84 +45,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.head<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.options<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.patch<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -131,14 +132,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -149,7 +150,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -160,7 +161,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -171,7 +172,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -182,7 +183,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -193,7 +194,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -205,119 +206,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return options.client.get<TypesResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -329,14 +330,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -352,14 +353,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -371,7 +372,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -382,21 +383,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -406,7 +407,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-false/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-number/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-strict/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/base-url-string/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/bundle/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/default/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-optional/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/client/plugin.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts
index 46c88a35e..716d0ec2a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts
@@ -1,6 +1,7 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './custom.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -18,21 +19,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return options.client.post<ImportResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -43,84 +44,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.head<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.options<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.patch<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -130,14 +131,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -148,7 +149,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -159,7 +160,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -170,7 +171,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -181,7 +182,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -192,7 +193,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -204,119 +205,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return options.client.delete<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return options.client.get<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return options.client.get<TypesResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -328,14 +329,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -351,14 +352,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return options.client.post<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -370,7 +371,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -381,21 +382,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -405,7 +406,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return options.client.put<unknown, unknown, ThrowOnError>({
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/custom/client/plugin.ts b/packages/openapi-ts-tests/main/test/custom/client/plugin.ts
index c11a1606a..73f26494e 100644
--- a/packages/openapi-ts-tests/main/test/custom/client/plugin.ts
+++ b/packages/openapi-ts-tests/main/test/custom/client/plugin.ts
@@ -1,4 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
 import {
   type Client,
   clientDefaultConfig,
@@ -8,25 +7,9 @@ import {
   definePluginConfig,
 } from '@hey-api/openapi-ts';
 
-type SelectorType = 'client';
+export type IApi = any;
 
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Pick<Config, 'name'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
 
 export type Config = Client.Config & {
   /**
@@ -39,9 +22,7 @@ export type MyClientPlugin = DefinePlugin<Config, Config, IApi>;
 
 export const defaultConfig: MyClientPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: __filename,
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: __filename,
diff --git a/packages/openapi-ts/src/index.ts b/packages/openapi-ts/src/index.ts
index fca759857..f0a2f4dc8 100644
--- a/packages/openapi-ts/src/index.ts
+++ b/packages/openapi-ts/src/index.ts
@@ -15,7 +15,13 @@ declare module '@hey-api/codegen-core' {
   }
 
   interface SymbolMeta {
-    category?: 'external' | 'schema' | 'sdk' | 'type' | (string & {});
+    category?:
+      | 'client'
+      | 'external'
+      | 'schema'
+      | 'sdk'
+      | 'type'
+      | (string & {});
     /**
      * Path to the resource this symbol represents.
      */
diff --git a/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts b/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts
index d1e77a1cf..001318570 100644
--- a/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts
+++ b/packages/openapi-ts/src/plugins/@angular/common/httpRequests.ts
@@ -3,7 +3,6 @@ import type ts from 'typescript';
 
 import type { IR } from '~/ir/types';
 import { buildName } from '~/openApi/shared/utils/name';
-import { getClientPlugin } from '~/plugins/@hey-api/client-core/utils';
 import { operationClasses } from '~/plugins/@hey-api/sdk/shared/operation';
 import {
   createOperationComment,
@@ -210,14 +209,9 @@ const generateRequestCallExpression = ({
   operation: IR.OperationObject;
   plugin: AngularCommonPlugin['Instance'];
 }) => {
-  const client = getClientPlugin(plugin.context.config);
-  const symbolClient =
-    client.api && 'selector' in client.api
-      ? plugin.getSymbol(
-          // @ts-expect-error
-          client.api.selector('client'),
-        )
-      : undefined;
+  const symbolClient = plugin.getSymbol({
+    category: 'client',
+  });
 
   const optionsClient = tsc.propertyAccessExpression({
     expression: tsc.identifier({ text: 'options' }),
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-angular/api.ts b/packages/openapi-ts/src/plugins/@hey-api/client-angular/api.ts
index d43e70f26..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-angular/api.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-angular/api.ts
@@ -1,24 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType = 'client';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@hey-api/client-angular'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-angular/config.ts b/packages/openapi-ts/src/plugins/@hey-api/client-angular/config.ts
index f15b005af..4c83beaf1 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-angular/config.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-angular/config.ts
@@ -10,9 +10,7 @@ import type { HeyApiClientAngularPlugin } from './types';
 
 export const defaultConfig: HeyApiClientAngularPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/client-angular',
-  }),
+  api: new Api(),
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-axios/api.ts b/packages/openapi-ts/src/plugins/@hey-api/client-axios/api.ts
index 4081e0dc2..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-axios/api.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-axios/api.ts
@@ -1,24 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType = 'client';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@hey-api/client-axios'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-axios/config.ts b/packages/openapi-ts/src/plugins/@hey-api/client-axios/config.ts
index cfb1d088f..8f6bd333f 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-axios/config.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-axios/config.ts
@@ -10,9 +10,7 @@ import type { HeyApiClientAxiosPlugin } from './types';
 
 export const defaultConfig: HeyApiClientAxiosPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/client-axios',
-  }),
+  api: new Api(),
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts b/packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts
index 4a5bc7697..2e15033b6 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-core/client.ts
@@ -94,8 +94,10 @@ export const createClient: PluginHandler = ({ plugin }) => {
   ];
 
   const symbolClient = plugin.registerSymbol({
+    meta: {
+      category: 'client',
+    },
     name: 'client',
-    selector: plugin.api.selector('client'),
   });
   const statement = tsc.constVariable({
     exportConst: true,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/api.ts b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/api.ts
index 6904136cb..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/api.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/api.ts
@@ -1,24 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType = 'client';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@hey-api/client-fetch'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/config.ts b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/config.ts
index 0e50f65d0..84bd0a542 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/config.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/config.ts
@@ -10,9 +10,7 @@ import type { HeyApiClientFetchPlugin } from './types';
 
 export const defaultConfig: HeyApiClientFetchPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/client-fetch',
-  }),
+  api: new Api(),
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-next/api.ts b/packages/openapi-ts/src/plugins/@hey-api/client-next/api.ts
index 5cd68151b..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-next/api.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-next/api.ts
@@ -1,24 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType = 'client';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@hey-api/client-next'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-next/config.ts b/packages/openapi-ts/src/plugins/@hey-api/client-next/config.ts
index e219b4992..67bf1a5fa 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-next/config.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-next/config.ts
@@ -10,9 +10,7 @@ import type { HeyApiClientNextPlugin } from './types';
 
 export const defaultConfig: HeyApiClientNextPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/client-next',
-  }),
+  api: new Api(),
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/api.ts b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/api.ts
index a3441eaba..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/api.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/api.ts
@@ -1,24 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType = 'client';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@hey-api/client-nuxt'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/config.ts b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/config.ts
index 6a686ecd4..bfb6cda63 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/config.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-nuxt/config.ts
@@ -10,9 +10,7 @@ import type { HeyApiClientNuxtPlugin } from './types';
 
 export const defaultConfig: HeyApiClientNuxtPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/client-nuxt',
-  }),
+  api: new Api(),
   config: clientDefaultConfig,
   handler: clientPluginHandler,
   name: '@hey-api/client-nuxt',
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/api.ts b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/api.ts
index 252bb2ceb..1496308d2 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/api.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/api.ts
@@ -1,24 +1,3 @@
-import type { Selector } from '@hey-api/codegen-core';
+export type IApi = any;
 
-import type { Plugin } from '~/plugins';
-
-type SelectorType = 'client';
-
-export type IApi = {
-  /**
-   * @param type Selector type.
-   * @param value Depends on `type`:
-   *  - `client`: never
-   * @returns Selector array
-   * @deprecated
-   */
-  selector: (type: SelectorType, value?: string) => Selector;
-};
-
-export class Api implements IApi {
-  constructor(public meta: Plugin.Name<'@hey-api/client-ofetch'>) {}
-
-  selector(...args: ReadonlyArray<string | undefined>): Selector {
-    return [this.meta.name, ...(args as Selector)];
-  }
-}
+export class Api implements IApi {}
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/config.ts b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/config.ts
index adf180f20..094694128 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/config.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/config.ts
@@ -10,9 +10,7 @@ import type { HeyApiClientOfetchPlugin } from './types';
 
 export const defaultConfig: HeyApiClientOfetchPlugin['Config'] = {
   ...clientDefaultMeta,
-  api: new Api({
-    name: '@hey-api/client-ofetch',
-  }),
+  api: new Api(),
   config: {
     ...clientDefaultConfig,
     throwOnError: false,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
index c2cfa21ad..975882024 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/class.ts
@@ -63,14 +63,9 @@ const createClientClassNodes = ({
   });
 
   const symbolClient = plugin.referenceSymbol(plugin.api.selector('Client'));
-  const client = getClientPlugin(plugin.context.config);
-  const symClient =
-    client.api && 'selector' in client.api
-      ? plugin.getSymbol(
-          // @ts-expect-error
-          client.api.selector('client'),
-        )
-      : undefined;
+  const symClient = plugin.getSymbol({
+    category: 'client',
+  });
 
   return [
     tsc.propertyDeclaration({
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts
index 9d1ad9563..d5e2be899 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts
@@ -683,13 +683,9 @@ export const operationStatements = ({
     }
   }
 
-  const symbolClient =
-    plugin.config.client && client.api && 'selector' in client.api
-      ? plugin.getSymbol(
-          // @ts-expect-error
-          client.api.selector('client'),
-        )
-      : undefined;
+  const symbolClient = plugin.getSymbol({
+    category: 'client',
+  });
 
   const optionsClient = tsc.propertyAccessExpression({
     expression: tsc.identifier({ text: 'options' }),
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
index b34408d12..60b5bd7ce 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryKey.ts
@@ -5,10 +5,7 @@ import { clientFolderAbsolutePath } from '~/generate/client';
 import { hasOperationDataRequired } from '~/ir/operation';
 import type { IR } from '~/ir/types';
 import { buildName } from '~/openApi/shared/utils/name';
-import {
-  getClientBaseUrlKey,
-  getClientPlugin,
-} from '~/plugins/@hey-api/client-core/utils';
+import { getClientBaseUrlKey } from '~/plugins/@hey-api/client-core/utils';
 import { type Property, tsc } from '~/tsc';
 
 import type { PiniaColadaPlugin } from './types';
@@ -56,14 +53,9 @@ export const createQueryKeyFunction = ({
   const symbolOptions = plugin.referenceSymbol(
     sdkPlugin.api.selector('Options'),
   );
-  const client = getClientPlugin(plugin.context.config);
-  const symbolClient =
-    client.api && 'selector' in client.api
-      ? plugin.getSymbol(
-          // @ts-expect-error
-          client.api.selector('client'),
-        )
-      : undefined;
+  const symbolClient = plugin.getSymbol({
+    category: 'client',
+  });
 
   const clientModule = clientFolderAbsolutePath(plugin.context.config);
   const symbolSerializeQueryValue = plugin.registerSymbol({
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
index 8d72bfda7..ebb530c1e 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryKey.ts
@@ -4,10 +4,7 @@ import type { Expression } from 'typescript';
 import { hasOperationDataRequired } from '~/ir/operation';
 import type { IR } from '~/ir/types';
 import { buildName } from '~/openApi/shared/utils/name';
-import {
-  getClientBaseUrlKey,
-  getClientPlugin,
-} from '~/plugins/@hey-api/client-core/utils';
+import { getClientBaseUrlKey } from '~/plugins/@hey-api/client-core/utils';
 import { type Property, tsc } from '~/tsc';
 
 import type { PluginInstance } from './types';
@@ -48,14 +45,9 @@ export const createQueryKeyFunction = ({
 
   const baseUrlKey = getClientBaseUrlKey(plugin.context.config);
 
-  const client = getClientPlugin(plugin.context.config);
-  const symbolClient =
-    client.api && 'selector' in client.api
-      ? plugin.getSymbol(
-          // @ts-expect-error
-          client.api.selector('client'),
-        )
-      : undefined;
+  const symbolClient = plugin.getSymbol({
+    category: 'client',
+  });
 
   const sdkPlugin = plugin.getPluginOrThrow('@hey-api/sdk');
   const symbolOptions = plugin.referenceSymbol(

From 74a37d362e54c4f82e45a6d48ef7eaba9587282b Mon Sep 17 00:00:00 2001
From: Lubos <lubos@heyapi.dev>
Date: Wed, 29 Oct 2025 21:43:16 +0800
Subject: [PATCH 2/2] test: fix snapshots

---
 .../sdk-client-required/sdk.gen.ts            | 97 +++++++++----------
 .../sdk-client-required/sdk.gen.ts            | 97 +++++++++----------
 .../sdk-client-required/sdk.gen.ts            | 97 +++++++++----------
 .../sdk-client-required/sdk.gen.ts            | 97 +++++++++----------
 .../sdk-client-required/sdk.gen.ts            | 97 +++++++++----------
 .../sdk-client-required/sdk.gen.ts            | 97 +++++++++----------
 .../my-client/sdk-client-required/sdk.gen.ts  | 97 +++++++++----------
 .../plugins/@hey-api/sdk/shared/operation.ts  |  8 +-
 8 files changed, 341 insertions(+), 346 deletions(-)

diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts
index 7669e3bbf..bcdd2c9b8 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-axios/sdk-client-required/sdk.gen.ts
@@ -1,7 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
-import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -19,21 +18,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+    return options.client.post<ImportResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/no+tag',
         ...options,
@@ -45,14 +44,14 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/simple/$count',
         ...options
@@ -60,7 +59,7 @@ export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = f
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/simple:operation',
         ...options
@@ -68,63 +67,63 @@ export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
+    return options.client.head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
+    return options.client.options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
+    return options.client.patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -134,14 +133,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -152,7 +151,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -163,7 +162,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -174,7 +173,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/parameters',
         ...options,
@@ -186,7 +185,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -197,7 +196,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -209,63 +208,63 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
@@ -273,7 +272,7 @@ export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolea
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
@@ -281,21 +280,21 @@ export const dummyA = <ThrowOnError extends boolean = false>(options: Options<Du
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/response',
         ...options
@@ -303,7 +302,7 @@ export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/response',
         ...options
@@ -311,14 +310,14 @@ export const callWithResponses = <ThrowOnError extends boolean = false>(options:
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+    return options.client.get<TypesResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/types',
         ...options
@@ -326,7 +325,7 @@ export const types = <ThrowOnError extends boolean = false>(options: Options<Typ
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         responseType: 'json',
         url: '/api/v{api-version}/upload',
@@ -339,7 +338,7 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
         responseType: 'blob',
         url: '/api/v{api-version}/file/{id}',
         ...options
@@ -347,7 +346,7 @@ export const fileResponse = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -364,14 +363,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -383,7 +382,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/complex/{id}',
         ...options,
@@ -395,21 +394,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         responseType: 'json',
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
@@ -420,7 +419,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts
index 36eebd166..46c88a35e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/sdk.gen.ts
@@ -1,7 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
-import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -19,21 +18,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+    return options.client.post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -44,84 +43,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
+    return options.client.head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
+    return options.client.options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
+    return options.client.patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -131,14 +130,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -149,7 +148,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -160,7 +159,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -171,7 +170,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -182,7 +181,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -193,7 +192,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -205,119 +204,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+    return options.client.get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -329,14 +328,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -352,14 +351,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -371,7 +370,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -382,21 +381,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -406,7 +405,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts
index 36eebd166..46c88a35e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-next/sdk-client-required/sdk.gen.ts
@@ -1,7 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
-import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -19,21 +18,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+    return options.client.post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -44,84 +43,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
+    return options.client.head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
+    return options.client.options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
+    return options.client.patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -131,14 +130,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -149,7 +148,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -160,7 +159,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -171,7 +170,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -182,7 +181,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -193,7 +192,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -205,119 +204,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+    return options.client.get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -329,14 +328,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -352,14 +351,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -371,7 +370,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -382,21 +381,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -406,7 +405,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts
index 1b5a3684e..7531bcd3d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-nuxt/sdk-client-required/sdk.gen.ts
@@ -1,7 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, type Composable, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
-import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithNoContentResponseResponse, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, CallWithResponseData, CallWithResponseResponse, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, ComplexTypesResponse, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponse, DummyBData, DummyBResponse, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponse, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, MultipartResponseResponse, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, TypesResponse, UploadFileData, UploadFileResponse } from './types.gen';
 
 export type Options<TComposable extends Composable = '$fetch', TData extends TDataShape = TDataShape, ResT = unknown, DefaultT = undefined> = Options2<TComposable, TData, ResT, DefaultT> & {
@@ -19,21 +18,21 @@ export type Options<TComposable extends Composable = '$fetch', TData extends TDa
 };
 
 export const export_ = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, ExportData, unknown, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PatchApiVbyApiVersionNoTagData, unknown, DefaultT>) => {
-    return (options.client ?? client).patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <TComposable extends Composable = '$fetch', DefaultT extends ImportResponse = ImportResponse>(options: Options<TComposable, ImportData, ImportResponse, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, ImportResponse | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, ImportResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -44,84 +43,84 @@ export const import_ = <TComposable extends Composable = '$fetch', DefaultT exte
 };
 
 export const fooWow = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, FooWowData, unknown, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <TComposable extends Composable = '$fetch', DefaultT extends ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponse>(options: Options<TComposable, ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, ApiVVersionODataControllerCountResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, ApiVVersionODataControllerCountResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <TComposable extends Composable = '$fetch', DefaultT extends GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponse>(options: Options<TComposable, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, GetApiVbyApiVersionSimpleOperationResponse | DefaultT, GetApiVbyApiVersionSimpleOperationError, DefaultT>({
+    return options.client.get<TComposable, GetApiVbyApiVersionSimpleOperationResponse | DefaultT, GetApiVbyApiVersionSimpleOperationError, DefaultT>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DeleteCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, GetCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, HeadCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).head<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.head<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, OptionsCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).options<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.options<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PatchCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.patch<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PostCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PutCallWithoutParametersAndResponseData, unknown, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DeleteFooData3, unknown, DefaultT>) => {
-    return (options.client ?? client).delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithDescriptionsData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -131,14 +130,14 @@ export const callWithDescriptions = <TComposable extends Composable = '$fetch',
  * @deprecated
  */
 export const deprecatedCall = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DeprecatedCallData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithParametersData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -149,7 +148,7 @@ export const callWithParameters = <TComposable extends Composable = '$fetch', De
 };
 
 export const callWithWeirdParameterNames = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithWeirdParameterNamesData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -160,7 +159,7 @@ export const callWithWeirdParameterNames = <TComposable extends Composable = '$f
 };
 
 export const getCallWithOptionalParam = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, GetCallWithOptionalParamData, unknown, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -171,7 +170,7 @@ export const getCallWithOptionalParam = <TComposable extends Composable = '$fetc
 };
 
 export const postCallWithOptionalParam = <TComposable extends Composable = '$fetch', DefaultT extends PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponse>(options: Options<TComposable, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, PostCallWithOptionalParamResponse | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, PostCallWithOptionalParamResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -182,7 +181,7 @@ export const postCallWithOptionalParam = <TComposable extends Composable = '$fet
 };
 
 export const postApiVbyApiVersionRequestBody = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PostApiVbyApiVersionRequestBodyData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -193,7 +192,7 @@ export const postApiVbyApiVersionRequestBody = <TComposable extends Composable =
 };
 
 export const postApiVbyApiVersionFormData = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PostApiVbyApiVersionFormDataData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -205,119 +204,119 @@ export const postApiVbyApiVersionFormData = <TComposable extends Composable = '$
 };
 
 export const callWithDefaultParameters = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithDefaultParametersData, unknown, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithDefaultOptionalParametersData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallToTestOrderOfParamsData, unknown, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateNameData, unknown, DefaultT>) => {
-    return (options.client ?? client).delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.delete<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateName2Data, unknown, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateName3Data, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, DuplicateName4Data, unknown, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <TComposable extends Composable = '$fetch', DefaultT extends CallWithNoContentResponseResponse = CallWithNoContentResponseResponse>(options: Options<TComposable, CallWithNoContentResponseData, CallWithNoContentResponseResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, CallWithNoContentResponseResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, CallWithNoContentResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <TComposable extends Composable = '$fetch', DefaultT extends CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponse>(options: Options<TComposable, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, CallWithResponseAndNoContentResponseResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, CallWithResponseAndNoContentResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <TComposable extends Composable = '$fetch', DefaultT extends DummyAResponse = DummyAResponse>(options: Options<TComposable, DummyAData, DummyAResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, DummyAResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, DummyAResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <TComposable extends Composable = '$fetch', DefaultT extends DummyBResponse = DummyBResponse>(options: Options<TComposable, DummyBData, DummyBResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, DummyBResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, DummyBResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <TComposable extends Composable = '$fetch', DefaultT extends CallWithResponseResponse = CallWithResponseResponse>(options: Options<TComposable, CallWithResponseData, CallWithResponseResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, CallWithResponseResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, CallWithResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <TComposable extends Composable = '$fetch', DefaultT extends CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponse>(options: Options<TComposable, CallWithDuplicateResponsesData, CallWithDuplicateResponsesResponse, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, CallWithDuplicateResponsesResponse | DefaultT, CallWithDuplicateResponsesError, DefaultT>({
+    return options.client.post<TComposable, CallWithDuplicateResponsesResponse | DefaultT, CallWithDuplicateResponsesError, DefaultT>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <TComposable extends Composable = '$fetch', DefaultT extends CallWithResponsesResponse = CallWithResponsesResponse>(options: Options<TComposable, CallWithResponsesData, CallWithResponsesResponse, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, CallWithResponsesResponse | DefaultT, CallWithResponsesError, DefaultT>({
+    return options.client.put<TComposable, CallWithResponsesResponse | DefaultT, CallWithResponsesError, DefaultT>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CollectionFormatData, unknown, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <TComposable extends Composable = '$fetch', DefaultT extends TypesResponse = TypesResponse>(options: Options<TComposable, TypesData, TypesResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, TypesResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, TypesResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <TComposable extends Composable = '$fetch', DefaultT extends UploadFileResponse = UploadFileResponse>(options: Options<TComposable, UploadFileData, UploadFileResponse, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, UploadFileResponse | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, UploadFileResponse | DefaultT, unknown, DefaultT>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -329,14 +328,14 @@ export const uploadFile = <TComposable extends Composable = '$fetch', DefaultT e
 };
 
 export const fileResponse = <TComposable extends Composable = '$fetch', DefaultT extends FileResponseResponse = FileResponseResponse>(options: Options<TComposable, FileResponseData, FileResponseResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, FileResponseResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, FileResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <TComposable extends Composable = '$fetch', DefaultT extends ComplexTypesResponse = ComplexTypesResponse>(options: Options<TComposable, ComplexTypesData, ComplexTypesResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, ComplexTypesResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, ComplexTypesResponse | DefaultT, unknown, DefaultT>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -352,14 +351,14 @@ export const complexTypes = <TComposable extends Composable = '$fetch', DefaultT
 };
 
 export const multipartResponse = <TComposable extends Composable = '$fetch', DefaultT extends MultipartResponseResponse = MultipartResponseResponse>(options: Options<TComposable, MultipartResponseData, MultipartResponseResponse, DefaultT>) => {
-    return (options.client ?? client).get<TComposable, MultipartResponseResponse | DefaultT, unknown, DefaultT>({
+    return options.client.get<TComposable, MultipartResponseResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, MultipartRequestData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -371,7 +370,7 @@ export const multipartRequest = <TComposable extends Composable = '$fetch', Defa
 };
 
 export const complexParams = <TComposable extends Composable = '$fetch', DefaultT extends ComplexParamsResponse = ComplexParamsResponse>(options: Options<TComposable, ComplexParamsData, ComplexParamsResponse, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, ComplexParamsResponse | DefaultT, unknown, DefaultT>({
+    return options.client.put<TComposable, ComplexParamsResponse | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -382,21 +381,21 @@ export const complexParams = <TComposable extends Composable = '$fetch', Default
 };
 
 export const callWithResultFromHeader = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, CallWithResultFromHeaderData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, TestErrorCodeData, unknown, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, unknown | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <TComposable extends Composable = '$fetch', DefaultT extends NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Response>(options: Options<TComposable, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultT>) => {
-    return (options.client ?? client).post<TComposable, NonAsciiæøåÆøÅöôêÊ字符串Response | DefaultT, unknown, DefaultT>({
+    return options.client.post<TComposable, NonAsciiæøåÆøÅöôêÊ字符串Response | DefaultT, unknown, DefaultT>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -406,7 +405,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <TComposable extends Compos
  * Login User
  */
 export const putWithFormUrlEncoded = <TComposable extends Composable = '$fetch', DefaultT = undefined>(options: Options<TComposable, PutWithFormUrlEncodedData, unknown, DefaultT>) => {
-    return (options.client ?? client).put<TComposable, unknown | DefaultT, unknown, DefaultT>({
+    return options.client.put<TComposable, unknown | DefaultT, unknown, DefaultT>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts
index 36eebd166..46c88a35e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/sdk.gen.ts
@@ -1,7 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
-import { client } from './client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -19,21 +18,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+    return options.client.post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -44,84 +43,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
+    return options.client.head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
+    return options.client.options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
+    return options.client.patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -131,14 +130,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -149,7 +148,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -160,7 +159,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -171,7 +170,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -182,7 +181,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -193,7 +192,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -205,119 +204,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+    return options.client.get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -329,14 +328,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -352,14 +351,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -371,7 +370,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -382,21 +381,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -406,7 +405,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts
index dc72200dc..c3a5a488c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/client-custom/sdk-client-required/sdk.gen.ts
@@ -2,7 +2,6 @@
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from '@hey-api/custom-client';
 
-import { client } from './custom-client.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -20,21 +19,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+    return options.client.post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -45,84 +44,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
+    return options.client.head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
+    return options.client.options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
+    return options.client.patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -132,14 +131,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -150,7 +149,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -161,7 +160,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -172,7 +171,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -183,7 +182,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -194,7 +193,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -206,119 +205,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+    return options.client.get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -330,14 +329,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -353,14 +352,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -372,7 +371,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -383,21 +382,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -407,7 +406,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts
index 716d0ec2a..46c88a35e 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/my-client/sdk-client-required/sdk.gen.ts
@@ -1,7 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
 import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
-import { client } from './custom.gen';
 import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
 
 export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
@@ -19,21 +18,21 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export const export_ = <ThrowOnError extends boolean = false>(options: Options<ExportData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
-    return (options.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+    return options.client.patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
-    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+    return options.client.post<ImportResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options,
         headers: {
@@ -44,84 +43,84 @@ export const import_ = <ThrowOnError extends boolean = false>(options: Options<I
 };
 
 export const fooWow = <ThrowOnError extends boolean = false>(options: Options<FooWowData, ThrowOnError>) => {
-    return (options.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+    return options.client.put<FooWowResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no+tag',
         ...options
     });
 };
 
 export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
-    return (options.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+    return options.client.get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple/$count',
         ...options
     });
 };
 
 export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
-    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+    return options.client.get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
         url: '/api/v{api-version}/simple:operation',
         ...options
     });
 };
 
 export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).head<unknown, unknown, ThrowOnError>({
+    return options.client.head<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).options<unknown, unknown, ThrowOnError>({
+    return options.client.options<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).patch<unknown, unknown, ThrowOnError>({
+    return options.client.patch<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/simple',
         ...options
     });
 };
 
 export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
         ...options
     });
 };
 
 export const callWithDescriptions = <ThrowOnError extends boolean = false>(options: Options<CallWithDescriptionsData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/descriptions',
         ...options
     });
@@ -131,14 +130,14 @@ export const callWithDescriptions = <ThrowOnError extends boolean = false>(optio
  * @deprecated
  */
 export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/deprecated',
         ...options
     });
 };
 
 export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameterPath}',
         ...options,
         headers: {
@@ -149,7 +148,7 @@ export const callWithParameters = <ThrowOnError extends boolean = false>(options
 };
 
 export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
         ...options,
         headers: {
@@ -160,7 +159,7 @@ export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false
 };
 
 export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -171,7 +170,7 @@ export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(o
 };
 
 export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
-    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+    return options.client.post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/parameters',
         ...options,
         headers: {
@@ -182,7 +181,7 @@ export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(
 };
 
 export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/requestBody',
         ...options,
         headers: {
@@ -193,7 +192,7 @@ export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = f
 };
 
 export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/formData',
         ...options,
@@ -205,119 +204,119 @@ export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = fals
 };
 
 export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/defaults',
         ...options
     });
 };
 
 export const duplicateName = <ThrowOnError extends boolean = false>(options: Options<DuplicateNameData, ThrowOnError>) => {
-    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+    return options.client.delete<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName2 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName2Data, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName3 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName3Data, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const duplicateName4 = <ThrowOnError extends boolean = false>(options: Options<DuplicateName4Data, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/duplicate',
         ...options
     });
 };
 
 export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/no-content',
         ...options
     });
 };
 
 export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/response-and-no-content',
         ...options
     });
 };
 
 export const dummyA = <ThrowOnError extends boolean = false>(options: Options<DummyAData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyAResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/a',
         ...options
     });
 };
 
 export const dummyB = <ThrowOnError extends boolean = false>(options: Options<DummyBData, ThrowOnError>) => {
-    return (options.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+    return options.client.get<DummyBResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multiple-tags/b',
         ...options
     });
 };
 
 export const callWithResponse = <ThrowOnError extends boolean = false>(options: Options<CallWithResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<CallWithResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+    return options.client.post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const callWithResponses = <ThrowOnError extends boolean = false>(options: Options<CallWithResponsesData, ThrowOnError>) => {
-    return (options.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+    return options.client.put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
         url: '/api/v{api-version}/response',
         ...options
     });
 };
 
 export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
-    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+    return options.client.get<unknown, unknown, ThrowOnError>({
         url: '/api/v{api-version}/collectionFormat',
         ...options
     });
 };
 
 export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+    return options.client.get<TypesResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/types',
         ...options
     });
 };
 
 export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
-    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+    return options.client.post<UploadFileResponses, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/upload',
         ...options,
@@ -329,14 +328,14 @@ export const uploadFile = <ThrowOnError extends boolean = false>(options: Option
 };
 
 export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<FileResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/file/{id}',
         ...options
     });
 };
 
 export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
-    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+    return options.client.get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
         querySerializer: {
             parameters: {
                 parameterObject: {
@@ -352,14 +351,14 @@ export const complexTypes = <ThrowOnError extends boolean = false>(options: Opti
 };
 
 export const multipartResponse = <ThrowOnError extends boolean = false>(options: Options<MultipartResponseData, ThrowOnError>) => {
-    return (options.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+    return options.client.get<MultipartResponseResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/multipart',
         ...options
     });
 };
 
 export const multipartRequest = <ThrowOnError extends boolean = false>(options: Options<MultipartRequestData, ThrowOnError>) => {
-    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+    return options.client.post<unknown, unknown, ThrowOnError>({
         ...formDataBodySerializer,
         url: '/api/v{api-version}/multipart',
         ...options,
@@ -371,7 +370,7 @@ export const multipartRequest = <ThrowOnError extends boolean = false>(options:
 };
 
 export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
-    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+    return options.client.put<ComplexParamsResponses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/complex/{id}',
         ...options,
         headers: {
@@ -382,21 +381,21 @@ export const complexParams = <ThrowOnError extends boolean = false>(options: Opt
 };
 
 export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
-    return (options.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+    return options.client.post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
         url: '/api/v{api-version}/header',
         ...options
     });
 };
 
 export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
-    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+    return options.client.post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
         url: '/api/v{api-version}/error',
         ...options
     });
 };
 
 export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
-    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+    return options.client.post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options
     });
@@ -406,7 +405,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boole
  * Login User
  */
 export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
-    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+    return options.client.put<unknown, unknown, ThrowOnError>({
         ...urlSearchParamsBodySerializer,
         url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
         ...options,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts
index d5e2be899..a857afca1 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/shared/operation.ts
@@ -683,9 +683,11 @@ export const operationStatements = ({
     }
   }
 
-  const symbolClient = plugin.getSymbol({
-    category: 'client',
-  });
+  const symbolClient = plugin.config.client
+    ? plugin.getSymbol({
+        category: 'client',
+      })
+    : undefined;
 
   const optionsClient = tsc.propertyAccessExpression({
     expression: tsc.identifier({ text: 'options' }),