diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
index 7f69870ff..8d12fcbb0 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
@@ -9,454 +9,720 @@ import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData
 
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceRequests {
-    public serviceWithEmptyTag<ThrowOnError extends boolean = false>(options?: Options<ServiceWithEmptyTagData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PATCH',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
+    public serviceWithEmptyTag<ThrowOnError extends boolean = false>(options?: Options<ServiceWithEmptyTagData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PATCH',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
     
     /**
      * Body should not be unknown
      *
      * Body should not be unknown
      */
-    public postApiVbyApiVersionBody<ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/body',
-        ...options
-    }); }
+    public postApiVbyApiVersionBody<ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/body',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceRequests {
-    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'HEAD',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'OPTIONS',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PATCH',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
+    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'HEAD',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'OPTIONS',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PATCH',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceRequests {
-    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/descriptions/',
-        ...options
-    }); }
+    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/descriptions/',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceRequests {
-    public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/{parameterPath}',
-        ...options
-    }); }
-    
-    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
-        ...options
-    }); }
+    public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/{parameterPath}',
+            ...options
+        });
+    }
+    
+    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceRequests {
-    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
-    
-    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
-    
-    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
+    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
+    
+    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
+    
+    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceRequests {
-    public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
+    public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/no-content',
-        ...options
-    }); }
-    
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
-        ...options
-    }); }
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/no-content',
+            ...options
+        });
+    }
+    
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceRequests {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
-        ...options
-    }); }
-    
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
-    
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
-    
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+            ...options
+        });
+    }
+    
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
+    
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
+    
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/a',
-        ...options
-    }); }
-    
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/a',
+            ...options
+        });
+    }
+    
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/a',
-        ...options
-    }); }
-    
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/a',
+            ...options
+        });
+    }
+    
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceRequests {
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceRequests {
-    public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/collectionFormat',
-        ...options
-    }); }
+    public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/collectionFormat',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceRequests {
-    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/types',
-        ...options
-    }); }
+    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/types',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceRequests {
-    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/complex',
-        ...options
-    }); }
+    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/complex',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceRequests {
-    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/header',
-        ...options
-    }); }
+    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/header',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceRequests {
-    public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/error',
-        ...options
-    }); }
+    public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/error',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
-        ...options
-    }); }
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceResources {
-    public serviceWithEmptyTag<ThrowOnError extends boolean = false>(options?: () => Options<ServiceWithEmptyTagData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).serviceWithEmptyTag(opts) : undefined; }); }
-    
-    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined; }); }
-    
-    public fooWow<ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined; }); }
+    public serviceWithEmptyTag<ThrowOnError extends boolean = false>(options?: () => Options<ServiceWithEmptyTagData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).serviceWithEmptyTag(opts) : undefined;
+        });
+    }
+    
+    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined;
+        });
+    }
+    
+    public fooWow<ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined;
+        });
+    }
     
     /**
      * Body should not be unknown
      *
      * Body should not be unknown
      */
-    public postApiVbyApiVersionBody<ThrowOnError extends boolean = false>(options: () => Options<PostApiVbyApiVersionBodyData, ThrowOnError> | undefined) { return httpResource<PostApiVbyApiVersionBodyResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).postApiVbyApiVersionBody(opts) : undefined; }); }
+    public postApiVbyApiVersionBody<ThrowOnError extends boolean = false>(options: () => Options<PostApiVbyApiVersionBodyData, ThrowOnError> | undefined) {
+        return httpResource<PostApiVbyApiVersionBodyResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).postApiVbyApiVersionBody(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceResources {
-    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined; }); }
+    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceResources {
-    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined; }); }
+    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceResources {
-    public callWithParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined; }); }
+    public callWithParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined;
+        });
+    }
     
-    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined; }); }
+    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceResources {
-    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined; }); }
+    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined;
+        });
+    }
     
-    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined; }); }
+    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined;
+        });
+    }
     
-    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined; }); }
+    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceResources {
-    public duplicateName<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined; }); }
-    
-    public duplicateName2<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined; }); }
-    
-    public duplicateName3<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined; }); }
-    
-    public duplicateName4<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined; }); }
+    public duplicateName<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined;
+        });
+    }
+    
+    public duplicateName2<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined;
+        });
+    }
+    
+    public duplicateName3<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined;
+        });
+    }
+    
+    public duplicateName4<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceResources {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined; }); }
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined;
+        });
+    }
     
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceResources {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; }); }
-    
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined; }); }
-    
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) { return httpResource<CallWithDuplicateResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined; }); }
-    
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) { return httpResource<CallWithResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined; }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined;
+        });
+    }
+    
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined;
+        });
+    }
+    
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) {
+        return httpResource<CallWithDuplicateResponsesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined;
+        });
+    }
+    
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponsesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceResources {
-    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined;
+        });
+    }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceResources {
-    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined;
+        });
+    }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceResources {
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceResources {
-    public collectionFormat<ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined; }); }
+    public collectionFormat<ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceResources {
-    public types<ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) { return httpResource<TypesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(TypesServiceRequests).types(opts) : undefined; }); }
+    public types<ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) {
+        return httpResource<TypesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(TypesServiceRequests).types(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceResources {
-    public complexTypes<ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) { return httpResource<ComplexTypesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined; }); }
+    public complexTypes<ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) {
+        return httpResource<ComplexTypesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceResources {
-    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined; }); }
+    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceResources {
-    public testErrorCode<ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined; }); }
+    public testErrorCode<ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceResources {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) { return httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => { const opts = options ? options() : undefined; return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; }); }
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) {
+        return httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined;
+        });
+    }
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts
index 4972827ea..51d36d352 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/@angular/common.gen.ts
@@ -249,75 +249,177 @@ export const postApiVbyApiVersionBodyRequest = <ThrowOnError extends boolean = f
     ...options
 });
 
-export const serviceWithEmptyTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<ServiceWithEmptyTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? serviceWithEmptyTagRequest(opts) : undefined; });
+export const serviceWithEmptyTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<ServiceWithEmptyTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? serviceWithEmptyTagRequest(opts) : undefined;
+});
 
-export const patchApiVbyApiVersionNoTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; });
+export const patchApiVbyApiVersionNoTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined;
+});
 
-export const fooWowResource = <ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? fooWowRequest(opts) : undefined; });
+export const fooWowResource = <ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? fooWowRequest(opts) : undefined;
+});
 
-export const deleteCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const deleteCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const getCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const getCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const headCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const headCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const optionsCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const optionsCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const patchCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const patchCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const postCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const postCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const putCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const putCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const callWithDescriptionsResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDescriptionsRequest(opts) : undefined; });
+export const callWithDescriptionsResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDescriptionsRequest(opts) : undefined;
+});
 
-export const callWithParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithParametersRequest(opts) : undefined; });
+export const callWithParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithParametersRequest(opts) : undefined;
+});
 
-export const callWithWeirdParameterNamesResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; });
+export const callWithWeirdParameterNamesResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithWeirdParameterNamesRequest(opts) : undefined;
+});
 
-export const callWithDefaultParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDefaultParametersRequest(opts) : undefined; });
+export const callWithDefaultParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDefaultParametersRequest(opts) : undefined;
+});
 
-export const callWithDefaultOptionalParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; });
+export const callWithDefaultOptionalParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined;
+});
 
-export const callToTestOrderOfParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callToTestOrderOfParamsRequest(opts) : undefined; });
+export const callToTestOrderOfParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callToTestOrderOfParamsRequest(opts) : undefined;
+});
 
-export const duplicateNameResource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateNameRequest(opts) : undefined; });
+export const duplicateNameResource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateNameRequest(opts) : undefined;
+});
 
-export const duplicateName2Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName2Request(opts) : undefined; });
+export const duplicateName2Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName2Request(opts) : undefined;
+});
 
-export const duplicateName3Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName3Request(opts) : undefined; });
+export const duplicateName3Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName3Request(opts) : undefined;
+});
 
-export const duplicateName4Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName4Request(opts) : undefined; });
+export const duplicateName4Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName4Request(opts) : undefined;
+});
 
-export const callWithNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithNoContentResponseRequest(opts) : undefined; });
+export const callWithNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithNoContentResponseRequest(opts) : undefined;
+});
 
-export const callWithResponseAndNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; });
+export const callWithResponseAndNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined;
+});
 
-export const dummyAResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? dummyARequest(opts) : undefined; });
+export const dummyAResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? dummyARequest(opts) : undefined;
+});
 
-export const dummyBResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? dummyBRequest(opts) : undefined; });
+export const dummyBResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? dummyBRequest(opts) : undefined;
+});
 
-export const callWithResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponseRequest(opts) : undefined; });
+export const callWithResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponseRequest(opts) : undefined;
+});
 
-export const callWithDuplicateResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) => httpResource<CallWithDuplicateResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithDuplicateResponsesRequest(opts) : undefined; });
+export const callWithDuplicateResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) => httpResource<CallWithDuplicateResponsesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDuplicateResponsesRequest(opts) : undefined;
+});
 
-export const callWithResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) => httpResource<CallWithResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponsesRequest(opts) : undefined; });
+export const callWithResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) => httpResource<CallWithResponsesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponsesRequest(opts) : undefined;
+});
 
-export const collectionFormatResource = <ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? collectionFormatRequest(opts) : undefined; });
+export const collectionFormatResource = <ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? collectionFormatRequest(opts) : undefined;
+});
 
-export const typesResource = <ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) => httpResource<TypesResponse>(() => { const opts = options ? options() : undefined; return opts ? typesRequest(opts) : undefined; });
+export const typesResource = <ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) => httpResource<TypesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? typesRequest(opts) : undefined;
+});
 
-export const complexTypesResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) => httpResource<ComplexTypesResponse>(() => { const opts = options ? options() : undefined; return opts ? complexTypesRequest(opts) : undefined; });
+export const complexTypesResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) => httpResource<ComplexTypesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? complexTypesRequest(opts) : undefined;
+});
 
-export const callWithResultFromHeaderResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithResultFromHeaderRequest(opts) : undefined; });
+export const callWithResultFromHeaderResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResultFromHeaderRequest(opts) : undefined;
+});
 
-export const testErrorCodeResource = <ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? testErrorCodeRequest(opts) : undefined; });
+export const testErrorCodeResource = <ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? testErrorCodeRequest(opts) : undefined;
+});
 
-export const nonAsciiæøåÆøÅöôêÊ字符串Resource = <ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) => httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => { const opts = options ? options() : undefined; return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; });
+export const nonAsciiæøåÆøÅöôêÊ字符串Resource = <ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) => httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined;
+});
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyResource = <ThrowOnError extends boolean = false>(options: () => Options<PostApiVbyApiVersionBodyData, ThrowOnError> | undefined) => httpResource<PostApiVbyApiVersionBodyResponse>(() => { const opts = options ? options() : undefined; return opts ? postApiVbyApiVersionBodyRequest(opts) : undefined; });
+export const postApiVbyApiVersionBodyResource = <ThrowOnError extends boolean = false>(options: () => Options<PostApiVbyApiVersionBodyData, ThrowOnError> | undefined) => httpResource<PostApiVbyApiVersionBodyResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postApiVbyApiVersionBodyRequest(opts) : undefined;
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
index 88a1b02c6..effd73175 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
@@ -23,13 +23,19 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class Domains extends HeyApiClient {
-    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) { return (options?.client ?? this.client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) { return (options?.client ?? this.client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
 }
 
 export class Providers extends HeyApiClient {
@@ -37,7 +43,9 @@ export class Providers extends HeyApiClient {
 }
 
 export class Business extends HeyApiClient {
-    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) { return (options?.client ?? this.client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options });
+    }
     
     providers = new Providers({ client: this.client });
 }
@@ -55,7 +63,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class NestedSdkWithInstance extends HeyApiClient {
@@ -64,11 +74,18 @@ export class NestedSdkWithInstance extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); NestedSdkWithInstance.__registry.set(this, args?.key); }
+    }) {
+        super(args);
+        NestedSdkWithInstance.__registry.set(this, args?.key);
+    }
     
-    public putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options });
+    }
     
     business = new Business({ client: this.client });
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
index bc2324ac0..8c055a5e4 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
@@ -19,11 +19,17 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class Domains {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) { return (options?.client ?? client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public static post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) { return (options?.client ?? client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public static putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) { return (options?.client ?? client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
 }
 
 export class Providers {
@@ -31,13 +37,17 @@ export class Providers {
 }
 
 export class Business {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) { return (options?.client ?? client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options });
+    }
     
     static providers = Providers;
 }
 
 export class Locations {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options });
+    }
     
     static business = Business;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
index 5196fa3c5..966bfdf87 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
@@ -23,19 +23,29 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class Bar extends HeyApiClient {
-    public post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? this.client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? this.client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class Foo extends HeyApiClient {
-    public post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? this.client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? this.client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     bar = new Bar({ client: this.client });
 }
@@ -53,7 +63,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class Sdk extends HeyApiClient {
@@ -62,11 +74,18 @@ export class Sdk extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); Sdk.__registry.set(this, args?.key); }
+    }) {
+        super(args);
+        Sdk.__registry.set(this, args?.key);
+    }
     
-    public getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? this.client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? this.client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     foo = new Foo({ client: this.client });
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
index 4d964f9a6..9c52054bc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
@@ -1,3 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const fooSchemaResponseTransformer = (data: any) => { data.foo = BigInt(data.foo.toString()); return data; };
+const fooSchemaResponseTransformer = (data: any) => {
+    data.foo = BigInt(data.foo.toString());
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
index 4d964f9a6..9c52054bc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
@@ -1,3 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const fooSchemaResponseTransformer = (data: any) => { data.foo = BigInt(data.foo.toString()); return data; };
+const fooSchemaResponseTransformer = (data: any) => {
+    data.foo = BigInt(data.foo.toString());
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
index 26abe5f67..3aeed5221 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
@@ -46,52 +46,70 @@ export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey(
 
 export const getFooQuery = defineQueryOptions((options?: Options<GetFooData>) => ({
     key: getFooQueryKey(options),
-    query: async (context) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, Options<FooPostData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.post({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, Options<FooPutData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.put({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarQuery = defineQueryOptions((options?: Options<GetFooBarData>) => ({
     key: getFooBarQueryKey(options),
-    query: async (context) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, Options<FooBarPostData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.barService.post({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, Options<FooBarPutData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.barService.put({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
index 800a25863..14aff2882 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
@@ -46,284 +46,377 @@ export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTa
 
 export const serviceWithEmptyTagQuery = defineQueryOptions((options?: Options<ServiceWithEmptyTagData>) => ({
     key: serviceWithEmptyTagQueryKey(options),
-    query: async (context) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => ({
-    mutation: async (vars) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await patchApiVbyApiVersionNoTag({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => ({
-    mutation: async (vars) => { const { data } = await fooWow({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await fooWow({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deleteCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
     key: getCallWithoutParametersAndResponseQueryKey(options),
-    query: async (context) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await patchCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await putCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDescriptions({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithParameters({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithParameters({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithWeirdParameterNames({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersQuery = defineQueryOptions((options: Options<CallWithDefaultParametersData>) => ({
     key: callWithDefaultParametersQueryKey(options),
-    query: async (context) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDefaultOptionalParameters({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callToTestOrderOfParams({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
     key: duplicateName2QueryKey(options),
-    query: async (context) => { const { data } = await duplicateName2({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName3({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName3({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName4({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName4({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
     key: callWithNoContentResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
     key: callWithResponseAndNoContentResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
     key: dummyAQueryKey(options),
-    query: async (context) => { const { data } = await dummyA({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await dummyA({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
     key: dummyBQueryKey(options),
-    query: async (context) => { const { data } = await dummyB({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await dummyB({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
     key: callWithResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => ({
-    mutation: async (vars) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDuplicateResponses({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => ({
-    mutation: async (vars) => { const { data } = await callWithResponses({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithResponses({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
     key: collectionFormatQueryKey(options),
-    query: async (context) => { const { data } = await collectionFormat({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
     key: typesQueryKey(options),
-    query: async (context) => { const { data } = await types({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await types({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
     key: complexTypesQueryKey(options),
-    query: async (context) => { const { data } = await complexTypes({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithResultFromHeader({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => ({
-    mutation: async (vars) => { const { data } = await testErrorCode({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await testErrorCode({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 /**
@@ -332,9 +425,12 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * Body should not be unknown
  */
 export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, Options<PostApiVbyApiVersionBodyData>, PostApiVbyApiVersionBodyError> => ({
-    mutation: async (vars) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postApiVbyApiVersionBody({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
index 058ef89f1..6f71bcc40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
index a634fcc90..cef8fd363 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
@@ -43,308 +43,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
index 32339876d..5087360ef 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
@@ -42,308 +42,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
index 6d7c758df..b144ed7a2 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
index 077353a6c..74f3f999f 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
index a49776312..da398d170 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
@@ -43,308 +43,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
index 3a6c7b8c9..ef023fe2c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
@@ -42,308 +42,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
index 52077bd6b..43c90277c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
index 3be7126b7..908344e1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
index fd8e94352..7a51e436a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
@@ -43,308 +43,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
index 5737b3c02..c4092a30b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
@@ -42,308 +42,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
index 6e56543cd..ba1febdda 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
index 8a3f1dff8..4f7ad47a7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
index fb5aa3181..8900d4a58 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
@@ -43,308 +43,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
index 4253cdefe..e14c0d70c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
@@ -42,308 +42,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
index 9b44f31cf..6a831b5b3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
index 1d7442c84..767635c77 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
index 5d2f30b60..5a5ce3b11 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
@@ -43,308 +43,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, AxiosError<PostApiVbyApiVersionBodyError>, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
index ce7280a3d..b545d1817 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
@@ -42,308 +42,464 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
 
 export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof serviceWithEmptyTagQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await serviceWithEmptyTag({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await serviceWithEmptyTag({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: serviceWithEmptyTagQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Body should not be unknown
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => { const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
index 6ed25f5f3..bfd35f1d6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/@tanstack/react-query.gen.ts
index 1cc839174..c7e01dadf 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/@tanstack/react-query.gen.ts
@@ -42,27 +42,42 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const createQueryKey2 = (options?: Options<CreateData>) => createQueryKey('create', options);
 
 export const createOptions = (options?: Options<CreateData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof createQueryKey2>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await create({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await create({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: createQueryKey2(options)
 });
 
-export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMutationOptions<unknown, DefaultError, Options<Create2Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create2Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await create2({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMutationOptions<unknown, DefaultError, Options<Create2Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create2Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await create2({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMutationOptions<unknown, DefaultError, Options<Create3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await create3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMutationOptions<unknown, DefaultError, Options<Create3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await create3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
index feeaafc50..2cb208158 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
@@ -9,49 +9,61 @@ import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCou
 
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceRequests {
-    public export<ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PATCH',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple:operation',
-        ...options
-    }); }
+    public export<ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PATCH',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple:operation',
+            ...options
+        });
+    }
 }
 
 export class ODataControllerServiceRequests {
-    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple/$count',
-        ...options
-    }); }
+    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple/$count',
+            ...options
+        });
+    }
 }
 
 export class VVersionServiceRequests {
@@ -64,103 +76,129 @@ export class ApiServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceRequests {
-    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'HEAD',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'OPTIONS',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PATCH',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
+    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'HEAD',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'OPTIONS',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PATCH',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
     apiService = new ApiServiceRequests();
 }
 
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceRequests {
-    public deleteFoo<ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
-        ...options
-    }); }
-    
-    public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/{parameterPath}',
-        ...options
-    }); }
-    
-    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
-        ...options
-    }); }
-    
-    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/parameters',
-        ...options
-    }); }
-    
-    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters',
-        ...options
-    }); }
+    public deleteFoo<ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+            ...options
+        });
+    }
+    
+    public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/{parameterPath}',
+            ...options
+        });
+    }
+    
+    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+            ...options
+        });
+    }
+    
+    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/parameters',
+            ...options
+        });
+    }
+    
+    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceRequests {
-    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/descriptions',
-        ...options
-    }); }
+    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/descriptions',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
@@ -168,310 +206,406 @@ export class DeprecatedServiceRequests {
     /**
      * @deprecated
      */
-    public deprecatedCall<ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/deprecated',
-        ...options
-    }); }
+    public deprecatedCall<ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/deprecated',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class RequestBodyServiceRequests {
-    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/requestBody',
-        ...options
-    }); }
+    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/requestBody',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FormDataServiceRequests {
-    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/formData',
-        ...options
-    }); }
+    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/formData',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceRequests {
-    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
-    
-    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
-    
-    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
+    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
+    
+    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
+    
+    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceRequests {
-    public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
+    public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/no-content',
-        ...options
-    }); }
-    
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
-        ...options
-    }); }
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/no-content',
+            ...options
+        });
+    }
+    
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceRequests {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
-        ...options
-    }); }
-    
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
-    
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
-    
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+            ...options
+        });
+    }
+    
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
+    
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
+    
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/a',
-        ...options
-    }); }
-    
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/a',
+            ...options
+        });
+    }
+    
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/a',
-        ...options
-    }); }
-    
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/a',
+            ...options
+        });
+    }
+    
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceRequests {
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceRequests {
-    public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/collectionFormat',
-        ...options
-    }); }
+    public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/collectionFormat',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceRequests {
-    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/types',
-        ...options
-    }); }
+    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/types',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class UploadServiceRequests {
-    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/upload',
-        ...options
-    }); }
+    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/upload',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FileResponseServiceRequests {
-    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/file/{id}',
-        ...options
-    }); }
+    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/file/{id}',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceRequests {
-    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/complex',
-        ...options
-    }); }
-    
-    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/complex/{id}',
-        ...options
-    }); }
+    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/complex',
+            ...options
+        });
+    }
+    
+    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/complex/{id}',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipartServiceRequests {
-    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multipart',
-        ...options
-    }); }
-    
-    public multipartRequest<ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/multipart',
-        ...options
-    }); }
+    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multipart',
+            ...options
+        });
+    }
+    
+    public multipartRequest<ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/multipart',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceRequests {
-    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/header',
-        ...options
-    }); }
+    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/header',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceRequests {
-    public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/error',
-        ...options
-    }); }
+    public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/error',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
-        ...options
-    }); }
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+            ...options
+        });
+    }
     
     /**
      * Login User
      */
-    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
-        ...options
-    }); }
+    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceResources {
-    public export<ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).export(opts) : undefined; }); }
-    
-    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined; }); }
-    
-    public import<ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) { return httpResource<ImportResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).import(opts) : undefined; }); }
-    
-    public fooWow<ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined; }); }
-    
-    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) { return httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).getApiVbyApiVersionSimpleOperation(opts) : undefined; }); }
+    public export<ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).export(opts) : undefined;
+        });
+    }
+    
+    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined;
+        });
+    }
+    
+    public import<ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) {
+        return httpResource<ImportResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).import(opts) : undefined;
+        });
+    }
+    
+    public fooWow<ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined;
+        });
+    }
+    
+    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) {
+        return httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).getApiVbyApiVersionSimpleOperation(opts) : undefined;
+        });
+    }
 }
 
 export class ODataControllerServiceResources {
-    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) { return httpResource<ApiVVersionODataControllerCountResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).apiService.vVersionService.oDataControllerService.apiVVersionODataControllerCount(opts) : undefined; }); }
+    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) {
+        return httpResource<ApiVVersionODataControllerCountResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).apiService.vVersionService.oDataControllerService.apiVVersionODataControllerCount(opts) : undefined;
+        });
+    }
 }
 
 export class VVersionServiceResources {
@@ -484,38 +618,103 @@ export class ApiServiceResources {
 
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceResources {
-    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined; }); }
+    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
     apiService = new ApiServiceResources();
 }
 
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceResources {
-    public deleteFoo<ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).deleteFoo(opts) : undefined; }); }
-    
-    public callWithParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined; }); }
-    
-    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined; }); }
-    
-    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).getCallWithOptionalParam(opts) : undefined; }); }
-    
-    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) { return httpResource<PostCallWithOptionalParamResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).postCallWithOptionalParam(opts) : undefined; }); }
+    public deleteFoo<ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).deleteFoo(opts) : undefined;
+        });
+    }
+    
+    public callWithParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined;
+        });
+    }
+    
+    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined;
+        });
+    }
+    
+    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).getCallWithOptionalParam(opts) : undefined;
+        });
+    }
+    
+    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) {
+        return httpResource<PostCallWithOptionalParamResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).postCallWithOptionalParam(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceResources {
-    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined; }); }
+    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
@@ -523,126 +722,291 @@ export class DeprecatedServiceResources {
     /**
      * @deprecated
      */
-    public deprecatedCall<ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DeprecatedServiceRequests).deprecatedCall(opts) : undefined; }); }
+    public deprecatedCall<ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DeprecatedServiceRequests).deprecatedCall(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class RequestBodyServiceResources {
-    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(RequestBodyServiceRequests).postApiVbyApiVersionRequestBody(opts) : undefined; }); }
+    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(RequestBodyServiceRequests).postApiVbyApiVersionRequestBody(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FormDataServiceResources {
-    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(FormDataServiceRequests).postApiVbyApiVersionFormData(opts) : undefined; }); }
+    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(FormDataServiceRequests).postApiVbyApiVersionFormData(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceResources {
-    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined; }); }
+    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined;
+        });
+    }
     
-    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined; }); }
+    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined;
+        });
+    }
     
-    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined; }); }
+    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceResources {
-    public duplicateName<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined; }); }
-    
-    public duplicateName2<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined; }); }
-    
-    public duplicateName3<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined; }); }
-    
-    public duplicateName4<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined; }); }
+    public duplicateName<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined;
+        });
+    }
+    
+    public duplicateName2<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined;
+        });
+    }
+    
+    public duplicateName3<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined;
+        });
+    }
+    
+    public duplicateName4<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceResources {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined; }); }
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined;
+        });
+    }
     
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceResources {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; }); }
-    
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined; }); }
-    
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) { return httpResource<CallWithDuplicateResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined; }); }
-    
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) { return httpResource<CallWithResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined; }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined;
+        });
+    }
+    
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined;
+        });
+    }
+    
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) {
+        return httpResource<CallWithDuplicateResponsesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined;
+        });
+    }
+    
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponsesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceResources {
-    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) { return httpResource<DummyAResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) {
+        return httpResource<DummyAResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined;
+        });
+    }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<DummyBResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceResources {
-    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) { return httpResource<DummyAResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) {
+        return httpResource<DummyAResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined;
+        });
+    }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<DummyBResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceResources {
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<DummyBResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceResources {
-    public collectionFormat<ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined; }); }
+    public collectionFormat<ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceResources {
-    public types<ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) { return httpResource<TypesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(TypesServiceRequests).types(opts) : undefined; }); }
+    public types<ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) {
+        return httpResource<TypesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(TypesServiceRequests).types(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class UploadServiceResources {
-    public uploadFile<ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) { return httpResource<UploadFileResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(UploadServiceRequests).uploadFile(opts) : undefined; }); }
+    public uploadFile<ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) {
+        return httpResource<UploadFileResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(UploadServiceRequests).uploadFile(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FileResponseServiceResources {
-    public fileResponse<ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) { return httpResource<FileResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(FileResponseServiceRequests).fileResponse(opts) : undefined; }); }
+    public fileResponse<ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) {
+        return httpResource<FileResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(FileResponseServiceRequests).fileResponse(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceResources {
-    public complexTypes<ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) { return httpResource<ComplexTypesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined; }); }
+    public complexTypes<ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) {
+        return httpResource<ComplexTypesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined;
+        });
+    }
     
-    public complexParams<ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) { return httpResource<ComplexParamsResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ComplexServiceRequests).complexParams(opts) : undefined; }); }
+    public complexParams<ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) {
+        return httpResource<ComplexParamsResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ComplexServiceRequests).complexParams(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipartServiceResources {
-    public multipartResponse<ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) { return httpResource<MultipartResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipartServiceRequests).multipartResponse(opts) : undefined; }); }
+    public multipartResponse<ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) {
+        return httpResource<MultipartResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipartServiceRequests).multipartResponse(opts) : undefined;
+        });
+    }
     
-    public multipartRequest<ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipartServiceRequests).multipartRequest(opts) : undefined; }); }
+    public multipartRequest<ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipartServiceRequests).multipartRequest(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceResources {
-    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined; }); }
+    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceResources {
-    public testErrorCode<ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined; }); }
+    public testErrorCode<ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceResources {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) { return httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => { const opts = options ? options() : undefined; return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; }); }
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) {
+        return httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined;
+        });
+    }
     
     /**
      * Login User
      */
-    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).putWithFormUrlEncoded(opts) : undefined; }); }
+    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).putWithFormUrlEncoded(opts) : undefined;
+        });
+    }
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts
index 2aeb7aacc..474d7c8c6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/@angular/common.gen.ts
@@ -348,104 +348,248 @@ export const putWithFormUrlEncodedRequest = <ThrowOnError extends boolean = fals
     ...options
 });
 
-export const exportResource = <ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? exportRequest(opts) : undefined; });
+export const exportResource = <ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? exportRequest(opts) : undefined;
+});
 
-export const patchApiVbyApiVersionNoTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; });
+export const patchApiVbyApiVersionNoTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined;
+});
 
-export const importResource = <ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) => httpResource<ImportResponse>(() => { const opts = options ? options() : undefined; return opts ? importRequest(opts) : undefined; });
+export const importResource = <ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) => httpResource<ImportResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? importRequest(opts) : undefined;
+});
 
-export const fooWowResource = <ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? fooWowRequest(opts) : undefined; });
+export const fooWowResource = <ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? fooWowRequest(opts) : undefined;
+});
 
-export const apiVVersionODataControllerCountResource = <ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) => httpResource<ApiVVersionODataControllerCountResponse>(() => { const opts = options ? options() : undefined; return opts ? apiVVersionODataControllerCountRequest(opts) : undefined; });
+export const apiVVersionODataControllerCountResource = <ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) => httpResource<ApiVVersionODataControllerCountResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? apiVVersionODataControllerCountRequest(opts) : undefined;
+});
 
-export const getApiVbyApiVersionSimpleOperationResource = <ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) => httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => { const opts = options ? options() : undefined; return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined; });
+export const getApiVbyApiVersionSimpleOperationResource = <ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) => httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined;
+});
 
-export const deleteCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const deleteCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const getCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const getCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const headCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const headCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const optionsCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const optionsCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const patchCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const patchCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const postCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const postCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const putCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const putCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const deleteFooResource = <ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deleteFooRequest(opts) : undefined; });
+export const deleteFooResource = <ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deleteFooRequest(opts) : undefined;
+});
 
-export const callWithDescriptionsResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDescriptionsRequest(opts) : undefined; });
+export const callWithDescriptionsResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDescriptionsRequest(opts) : undefined;
+});
 
 /**
  * @deprecated
  */
-export const deprecatedCallResource = <ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deprecatedCallRequest(opts) : undefined; });
+export const deprecatedCallResource = <ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deprecatedCallRequest(opts) : undefined;
+});
 
-export const callWithParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithParametersRequest(opts) : undefined; });
+export const callWithParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithParametersRequest(opts) : undefined;
+});
 
-export const callWithWeirdParameterNamesResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; });
+export const callWithWeirdParameterNamesResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithWeirdParameterNamesRequest(opts) : undefined;
+});
 
-export const getCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? getCallWithOptionalParamRequest(opts) : undefined; });
+export const getCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getCallWithOptionalParamRequest(opts) : undefined;
+});
 
-export const postCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<PostCallWithOptionalParamResponse>(() => { const opts = options ? options() : undefined; return opts ? postCallWithOptionalParamRequest(opts) : undefined; });
+export const postCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<PostCallWithOptionalParamResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postCallWithOptionalParamRequest(opts) : undefined;
+});
 
-export const postApiVbyApiVersionRequestBodyResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined; });
+export const postApiVbyApiVersionRequestBodyResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined;
+});
 
-export const postApiVbyApiVersionFormDataResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined; });
+export const postApiVbyApiVersionFormDataResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined;
+});
 
-export const callWithDefaultParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDefaultParametersRequest(opts) : undefined; });
+export const callWithDefaultParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDefaultParametersRequest(opts) : undefined;
+});
 
-export const callWithDefaultOptionalParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; });
+export const callWithDefaultOptionalParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined;
+});
 
-export const callToTestOrderOfParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callToTestOrderOfParamsRequest(opts) : undefined; });
+export const callToTestOrderOfParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callToTestOrderOfParamsRequest(opts) : undefined;
+});
 
-export const duplicateNameResource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateNameRequest(opts) : undefined; });
+export const duplicateNameResource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateNameRequest(opts) : undefined;
+});
 
-export const duplicateName2Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName2Request(opts) : undefined; });
+export const duplicateName2Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName2Request(opts) : undefined;
+});
 
-export const duplicateName3Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName3Request(opts) : undefined; });
+export const duplicateName3Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName3Request(opts) : undefined;
+});
 
-export const duplicateName4Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName4Request(opts) : undefined; });
+export const duplicateName4Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName4Request(opts) : undefined;
+});
 
-export const callWithNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithNoContentResponseRequest(opts) : undefined; });
+export const callWithNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithNoContentResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithNoContentResponseRequest(opts) : undefined;
+});
 
-export const callWithResponseAndNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; });
+export const callWithResponseAndNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined;
+});
 
-export const dummyAResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) => httpResource<DummyAResponse>(() => { const opts = options ? options() : undefined; return opts ? dummyARequest(opts) : undefined; });
+export const dummyAResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) => httpResource<DummyAResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? dummyARequest(opts) : undefined;
+});
 
-export const dummyBResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) => httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? dummyBRequest(opts) : undefined; });
+export const dummyBResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) => httpResource<DummyBResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? dummyBRequest(opts) : undefined;
+});
 
-export const callWithResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponseRequest(opts) : undefined; });
+export const callWithResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponseRequest(opts) : undefined;
+});
 
-export const callWithDuplicateResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) => httpResource<CallWithDuplicateResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithDuplicateResponsesRequest(opts) : undefined; });
+export const callWithDuplicateResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) => httpResource<CallWithDuplicateResponsesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDuplicateResponsesRequest(opts) : undefined;
+});
 
-export const callWithResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) => httpResource<CallWithResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponsesRequest(opts) : undefined; });
+export const callWithResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) => httpResource<CallWithResponsesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponsesRequest(opts) : undefined;
+});
 
-export const collectionFormatResource = <ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? collectionFormatRequest(opts) : undefined; });
+export const collectionFormatResource = <ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? collectionFormatRequest(opts) : undefined;
+});
 
-export const typesResource = <ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) => httpResource<TypesResponse>(() => { const opts = options ? options() : undefined; return opts ? typesRequest(opts) : undefined; });
+export const typesResource = <ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) => httpResource<TypesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? typesRequest(opts) : undefined;
+});
 
-export const uploadFileResource = <ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) => httpResource<UploadFileResponse>(() => { const opts = options ? options() : undefined; return opts ? uploadFileRequest(opts) : undefined; });
+export const uploadFileResource = <ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) => httpResource<UploadFileResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? uploadFileRequest(opts) : undefined;
+});
 
-export const fileResponseResource = <ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) => httpResource<FileResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? fileResponseRequest(opts) : undefined; });
+export const fileResponseResource = <ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) => httpResource<FileResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? fileResponseRequest(opts) : undefined;
+});
 
-export const complexTypesResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) => httpResource<ComplexTypesResponse>(() => { const opts = options ? options() : undefined; return opts ? complexTypesRequest(opts) : undefined; });
+export const complexTypesResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) => httpResource<ComplexTypesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? complexTypesRequest(opts) : undefined;
+});
 
-export const multipartResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) => httpResource<MultipartResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? multipartResponseRequest(opts) : undefined; });
+export const multipartResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) => httpResource<MultipartResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? multipartResponseRequest(opts) : undefined;
+});
 
-export const multipartRequestResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? multipartRequestRequest(opts) : undefined; });
+export const multipartRequestResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? multipartRequestRequest(opts) : undefined;
+});
 
-export const complexParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) => httpResource<ComplexParamsResponse>(() => { const opts = options ? options() : undefined; return opts ? complexParamsRequest(opts) : undefined; });
+export const complexParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) => httpResource<ComplexParamsResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? complexParamsRequest(opts) : undefined;
+});
 
-export const callWithResultFromHeaderResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithResultFromHeaderRequest(opts) : undefined; });
+export const callWithResultFromHeaderResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResultFromHeaderRequest(opts) : undefined;
+});
 
-export const testErrorCodeResource = <ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? testErrorCodeRequest(opts) : undefined; });
+export const testErrorCodeResource = <ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? testErrorCodeRequest(opts) : undefined;
+});
 
-export const nonAsciiæøåÆøÅöôêÊ字符串Resource = <ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) => httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => { const opts = options ? options() : undefined; return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; });
+export const nonAsciiæøåÆøÅöôêÊ字符串Resource = <ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) => httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined;
+});
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedResource = <ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? putWithFormUrlEncodedRequest(opts) : undefined; });
+export const putWithFormUrlEncodedResource = <ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? putWithFormUrlEncodedRequest(opts) : undefined;
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
index 88a1b02c6..effd73175 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
@@ -23,13 +23,19 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class Domains extends HeyApiClient {
-    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) { return (options?.client ?? this.client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) { return (options?.client ?? this.client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
 }
 
 export class Providers extends HeyApiClient {
@@ -37,7 +43,9 @@ export class Providers extends HeyApiClient {
 }
 
 export class Business extends HeyApiClient {
-    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) { return (options?.client ?? this.client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options });
+    }
     
     providers = new Providers({ client: this.client });
 }
@@ -55,7 +63,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class NestedSdkWithInstance extends HeyApiClient {
@@ -64,11 +74,18 @@ export class NestedSdkWithInstance extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); NestedSdkWithInstance.__registry.set(this, args?.key); }
+    }) {
+        super(args);
+        NestedSdkWithInstance.__registry.set(this, args?.key);
+    }
     
-    public putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options });
+    }
     
     business = new Business({ client: this.client });
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
index bc2324ac0..8c055a5e4 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
@@ -19,11 +19,17 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class Domains {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) { return (options?.client ?? client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public static post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) { return (options?.client ?? client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public static putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) { return (options?.client ?? client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
 }
 
 export class Providers {
@@ -31,13 +37,17 @@ export class Providers {
 }
 
 export class Business {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) { return (options?.client ?? client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options });
+    }
     
     static providers = Providers;
 }
 
 export class Locations {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options });
+    }
     
     static business = Business;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
index 5196fa3c5..966bfdf87 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
@@ -23,19 +23,29 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class Bar extends HeyApiClient {
-    public post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? this.client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? this.client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class Foo extends HeyApiClient {
-    public post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? this.client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? this.client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     bar = new Bar({ client: this.client });
 }
@@ -53,7 +63,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class Sdk extends HeyApiClient {
@@ -62,11 +74,18 @@ export class Sdk extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); Sdk.__registry.set(this, args?.key); }
+    }) {
+        super(args);
+        Sdk.__registry.set(this, args?.key);
+    }
     
-    public getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? this.client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? this.client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     foo = new Foo({ client: this.client });
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
index 4d964f9a6..9c52054bc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
@@ -1,3 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const fooSchemaResponseTransformer = (data: any) => { data.foo = BigInt(data.foo.toString()); return data; };
+const fooSchemaResponseTransformer = (data: any) => {
+    data.foo = BigInt(data.foo.toString());
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
index 4d964f9a6..9c52054bc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
@@ -1,3 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const fooSchemaResponseTransformer = (data: any) => { data.foo = BigInt(data.foo.toString()); return data; };
+const fooSchemaResponseTransformer = (data: any) => {
+    data.foo = BigInt(data.foo.toString());
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
index 26abe5f67..3aeed5221 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
@@ -46,52 +46,70 @@ export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey(
 
 export const getFooQuery = defineQueryOptions((options?: Options<GetFooData>) => ({
     key: getFooQueryKey(options),
-    query: async (context) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, Options<FooPostData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.post({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, Options<FooPutData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.put({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarQuery = defineQueryOptions((options?: Options<GetFooBarData>) => ({
     key: getFooBarQueryKey(options),
-    query: async (context) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, Options<FooBarPostData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.barService.post({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, Options<FooBarPutData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.barService.put({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
index 1aef078ed..81651e8f9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
@@ -46,423 +46,561 @@ export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey(
 
 export const exportQuery = defineQueryOptions((options?: Options<ExportData>) => ({
     key: exportQueryKey(options),
-    query: async (context) => { const { data } = await export_({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await export_({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => ({
-    mutation: async (vars) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await patchApiVbyApiVersionNoTag({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, Options<ImportData>, Error> => ({
-    mutation: async (vars) => { const { data } = await import_({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await import_({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => ({
-    mutation: async (vars) => { const { data } = await fooWow({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await fooWow({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountQuery = defineQueryOptions((options?: Options<ApiVVersionODataControllerCountData>) => ({
     key: apiVVersionODataControllerCountQueryKey(options),
-    query: async (context) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationQuery = defineQueryOptions((options: Options<GetApiVbyApiVersionSimpleOperationData>) => ({
     key: getApiVbyApiVersionSimpleOperationQueryKey(options),
-    query: async (context) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deleteCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
     key: getCallWithoutParametersAndResponseQueryKey(options),
-    query: async (context) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await patchCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await putCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, Options<DeleteFooData3>, Error> => ({
-    mutation: async (vars) => { const { data } = await deleteFoo({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deleteFoo({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDescriptions({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, Options<DeprecatedCallData>, Error> => ({
-    mutation: async (vars) => { const { data } = await deprecatedCall({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deprecatedCall({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithParameters({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithParameters({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithWeirdParameterNames({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamQuery = defineQueryOptions((options: Options<GetCallWithOptionalParamData>) => ({
     key: getCallWithOptionalParamQueryKey(options),
-    query: async (context) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, Options<PostCallWithOptionalParamData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postCallWithOptionalParam({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionRequestBodyData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postApiVbyApiVersionRequestBody({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionFormDataData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postApiVbyApiVersionFormData({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersQuery = defineQueryOptions((options?: Options<CallWithDefaultParametersData>) => ({
     key: callWithDefaultParametersQueryKey(options),
-    query: async (context) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDefaultOptionalParameters({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callToTestOrderOfParams({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
     key: duplicateName2QueryKey(options),
-    query: async (context) => { const { data } = await duplicateName2({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName3({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName3({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName4({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName4({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
     key: callWithNoContentResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
     key: callWithResponseAndNoContentResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
     key: dummyAQueryKey(options),
-    query: async (context) => { const { data } = await dummyA({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await dummyA({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
     key: dummyBQueryKey(options),
-    query: async (context) => { const { data } = await dummyB({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await dummyB({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
     key: callWithResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => ({
-    mutation: async (vars) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDuplicateResponses({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => ({
-    mutation: async (vars) => { const { data } = await callWithResponses({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithResponses({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
     key: collectionFormatQueryKey(options),
-    query: async (context) => { const { data } = await collectionFormat({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
     key: typesQueryKey(options),
-    query: async (context) => { const { data } = await types({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await types({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, Options<UploadFileData>, Error> => ({
-    mutation: async (vars) => { const { data } = await uploadFile({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await uploadFile({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseQuery = defineQueryOptions((options: Options<FileResponseData>) => ({
     key: fileResponseQueryKey(options),
-    query: async (context) => { const { data } = await fileResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
     key: complexTypesQueryKey(options),
-    query: async (context) => { const { data } = await complexTypes({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseQuery = defineQueryOptions((options?: Options<MultipartResponseData>) => ({
     key: multipartResponseQueryKey(options),
-    query: async (context) => { const { data } = await multipartResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, Options<MultipartRequestData>, Error> => ({
-    mutation: async (vars) => { const { data } = await multipartRequest({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await multipartRequest({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, Options<ComplexParamsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await complexParams({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await complexParams({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithResultFromHeader({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => ({
-    mutation: async (vars) => { const { data } = await testErrorCode({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await testErrorCode({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 /**
  * Login User
  */
 export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, Options<PutWithFormUrlEncodedData>, Error> => ({
-    mutation: async (vars) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await putWithFormUrlEncoded({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
index 058ef89f1..6f71bcc40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
index d577b3aff..5b07cde6a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
index 41213b036..6cc80fb17 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
index 6d7c758df..b144ed7a2 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
index 077353a6c..74f3f999f 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
index 8f9f18754..38403265b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
index d5b97ba94..378082bd0 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
index 52077bd6b..43c90277c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
index 3be7126b7..908344e1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
index 4a5b4971c..203534a86 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
index 548d90159..358caac28 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
index 6e56543cd..ba1febdda 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
index 8a3f1dff8..4f7ad47a7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
index a66a84de1..9e78e66d2 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
index 346c579b6..7e81c3731 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
index 9b44f31cf..6a831b5b3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
index 1d7442c84..767635c77 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
index 0d2884d1b..f839621a3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
index b68fd8934..bbcab4d5a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
index 6ed25f5f3..bfd35f1d6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/transformers.gen.ts
index d535c1ec3..9c53d7569 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/transformers.gen.ts
@@ -1,7 +1,13 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const quxSchemaResponseTransformer = (data: any) => { if (data.baz) {
-    data.baz = new Date(data.baz);
-} return data; };
+const quxSchemaResponseTransformer = (data: any) => {
+    if (data.baz) {
+        data.baz = new Date(data.baz);
+    }
+    return data;
+};
 
-const bazSchemaResponseTransformer = (data: any) => { data.bar = new Date(data.bar); return data; };
+const bazSchemaResponseTransformer = (data: any) => {
+    data.bar = new Date(data.bar);
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/transformers.gen.ts
index 55875bf9f..fc50ee927 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/transformers.gen.ts
@@ -2,4 +2,10 @@
 
 import type { GetFooResponse } from './types.gen';
 
-export const getFooResponseTransformer = async (data: any): Promise<GetFooResponse> => { data.foo = data.foo.map((item: any) => { item.baz = new Date(item.baz); return item; }); return data; };
+export const getFooResponseTransformer = async (data: any): Promise<GetFooResponse> => {
+    data.foo = data.foo.map((item: any) => {
+        item.baz = new Date(item.baz);
+        return item;
+    });
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/@tanstack/react-query.gen.ts
index 1cc839174..c7e01dadf 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/@tanstack/react-query.gen.ts
@@ -42,27 +42,42 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const createQueryKey2 = (options?: Options<CreateData>) => createQueryKey('create', options);
 
 export const createOptions = (options?: Options<CreateData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof createQueryKey2>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await create({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await create({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: createQueryKey2(options)
 });
 
-export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMutationOptions<unknown, DefaultError, Options<Create2Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create2Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await create2({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMutationOptions<unknown, DefaultError, Options<Create2Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create2Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await create2({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMutationOptions<unknown, DefaultError, Options<Create3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await create3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMutationOptions<unknown, DefaultError, Options<Create3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await create3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/@tanstack/react-query.gen.ts
index aa0761eb1..b9e75835b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/@tanstack/react-query.gen.ts
@@ -42,12 +42,15 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
@@ -104,10 +107,16 @@ export const getFooInfiniteOptions = (options: Options<GetFooData>) => infiniteQ
     queryKey: getFooInfiniteQueryKey(options)
 });
 
-export const postFooMutation = (options?: Partial<Options<PostFooData>>): UseMutationOptions<unknown, DefaultError, Options<PostFooData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostFooData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postFooMutation = (options?: Partial<Options<PostFooData>>): UseMutationOptions<unknown, DefaultError, Options<PostFooData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostFooData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts
index feeaafc50..2cb208158 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts
@@ -9,49 +9,61 @@ import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCou
 
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceRequests {
-    public export<ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PATCH',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/no+tag',
-        ...options
-    }); }
-    
-    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple:operation',
-        ...options
-    }); }
+    public export<ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PATCH',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/no+tag',
+            ...options
+        });
+    }
+    
+    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple:operation',
+            ...options
+        });
+    }
 }
 
 export class ODataControllerServiceRequests {
-    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple/$count',
-        ...options
-    }); }
+    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple/$count',
+            ...options
+        });
+    }
 }
 
 export class VVersionServiceRequests {
@@ -64,103 +76,129 @@ export class ApiServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceRequests {
-    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'HEAD',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'OPTIONS',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PATCH',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
-    
-    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/simple',
-        ...options
-    }); }
+    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'HEAD',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'OPTIONS',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PATCH',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
+    
+    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/simple',
+            ...options
+        });
+    }
     apiService = new ApiServiceRequests();
 }
 
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceRequests {
-    public deleteFoo<ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
-        ...options
-    }); }
-    
-    public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/{parameterPath}',
-        ...options
-    }); }
-    
-    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
-        ...options
-    }); }
-    
-    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/parameters',
-        ...options
-    }); }
-    
-    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters',
-        ...options
-    }); }
+    public deleteFoo<ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+            ...options
+        });
+    }
+    
+    public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/{parameterPath}',
+            ...options
+        });
+    }
+    
+    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+            ...options
+        });
+    }
+    
+    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/parameters',
+            ...options
+        });
+    }
+    
+    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceRequests {
-    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/descriptions',
-        ...options
-    }); }
+    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/descriptions',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
@@ -168,310 +206,406 @@ export class DeprecatedServiceRequests {
     /**
      * @deprecated
      */
-    public deprecatedCall<ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/parameters/deprecated',
-        ...options
-    }); }
+    public deprecatedCall<ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/parameters/deprecated',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class RequestBodyServiceRequests {
-    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/requestBody',
-        ...options
-    }); }
+    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/requestBody',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FormDataServiceRequests {
-    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/formData',
-        ...options
-    }); }
+    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/formData',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceRequests {
-    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
-    
-    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
-    
-    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/defaults',
-        ...options
-    }); }
+    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
+    
+    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
+    
+    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/defaults',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceRequests {
-    public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'DELETE',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
-    
-    public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/duplicate',
-        ...options
-    }); }
+    public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'DELETE',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
+    
+    public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/duplicate',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/no-content',
-        ...options
-    }); }
-    
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
-        ...options
-    }); }
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/no-content',
+            ...options
+        });
+    }
+    
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceRequests {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
-        ...options
-    }); }
-    
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
-    
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
-    
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/response',
-        ...options
-    }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+            ...options
+        });
+    }
+    
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
+    
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
+    
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/response',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/a',
-        ...options
-    }); }
-    
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/a',
+            ...options
+        });
+    }
+    
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/a',
-        ...options
-    }); }
-    
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/a',
+            ...options
+        });
+    }
+    
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceRequests {
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multiple-tags/b',
-        ...options
-    }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multiple-tags/b',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceRequests {
-    public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/collectionFormat',
-        ...options
-    }); }
+    public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/collectionFormat',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceRequests {
-    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/types',
-        ...options
-    }); }
+    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/types',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class UploadServiceRequests {
-    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/upload',
-        ...options
-    }); }
+    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/upload',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FileResponseServiceRequests {
-    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/file/{id}',
-        ...options
-    }); }
+    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/file/{id}',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceRequests {
-    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/complex',
-        ...options
-    }); }
-    
-    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/complex/{id}',
-        ...options
-    }); }
+    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/complex',
+            ...options
+        });
+    }
+    
+    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/complex/{id}',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipartServiceRequests {
-    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'GET',
-        url: '/api/v{api-version}/multipart',
-        ...options
-    }); }
-    
-    public multipartRequest<ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/multipart',
-        ...options
-    }); }
+    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'GET',
+            url: '/api/v{api-version}/multipart',
+            ...options
+        });
+    }
+    
+    public multipartRequest<ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/multipart',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceRequests {
-    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/header',
-        ...options
-    }); }
+    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/header',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceRequests {
-    public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/error',
-        ...options
-    }); }
+    public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/error',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'POST',
-        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
-        ...options
-    }); }
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'POST',
+            url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+            ...options
+        });
+    }
     
     /**
      * Login User
      */
-    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>): HttpRequest<unknown> { return (options?.client ?? client).requestOptions({
-        responseStyle: 'data',
-        method: 'PUT',
-        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
-        ...options
-    }); }
+    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>): HttpRequest<unknown> {
+        return (options?.client ?? client).requestOptions({
+            responseStyle: 'data',
+            method: 'PUT',
+            url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+            ...options
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceResources {
-    public export<ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).export(opts) : undefined; }); }
-    
-    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined; }); }
-    
-    public import<ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) { return httpResource<ImportResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).import(opts) : undefined; }); }
-    
-    public fooWow<ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined; }); }
-    
-    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) { return httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultServiceRequests).getApiVbyApiVersionSimpleOperation(opts) : undefined; }); }
+    public export<ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).export(opts) : undefined;
+        });
+    }
+    
+    public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).patchApiVbyApiVersionNoTag(opts) : undefined;
+        });
+    }
+    
+    public import<ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) {
+        return httpResource<ImportResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).import(opts) : undefined;
+        });
+    }
+    
+    public fooWow<ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).fooWow(opts) : undefined;
+        });
+    }
+    
+    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) {
+        return httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultServiceRequests).getApiVbyApiVersionSimpleOperation(opts) : undefined;
+        });
+    }
 }
 
 export class ODataControllerServiceResources {
-    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) { return httpResource<ApiVVersionODataControllerCountResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).apiService.vVersionService.oDataControllerService.apiVVersionODataControllerCount(opts) : undefined; }); }
+    public apiVVersionODataControllerCount<ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) {
+        return httpResource<ApiVVersionODataControllerCountResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).apiService.vVersionService.oDataControllerService.apiVVersionODataControllerCount(opts) : undefined;
+        });
+    }
 }
 
 export class VVersionServiceResources {
@@ -484,38 +618,103 @@ export class ApiServiceResources {
 
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceResources {
-    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined; }); }
-    
-    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined; }); }
+    public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).deleteCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).getCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).headCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).optionsCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).patchCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).postCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
+    
+    public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(SimpleServiceRequests).putCallWithoutParametersAndResponse(opts) : undefined;
+        });
+    }
     apiService = new ApiServiceResources();
 }
 
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceResources {
-    public deleteFoo<ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).deleteFoo(opts) : undefined; }); }
-    
-    public callWithParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined; }); }
-    
-    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined; }); }
-    
-    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).getCallWithOptionalParam(opts) : undefined; }); }
-    
-    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) { return httpResource<PostCallWithOptionalParamResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ParametersServiceRequests).postCallWithOptionalParam(opts) : undefined; }); }
+    public deleteFoo<ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).deleteFoo(opts) : undefined;
+        });
+    }
+    
+    public callWithParameters<ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).callWithParameters(opts) : undefined;
+        });
+    }
+    
+    public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).callWithWeirdParameterNames(opts) : undefined;
+        });
+    }
+    
+    public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).getCallWithOptionalParam(opts) : undefined;
+        });
+    }
+    
+    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) {
+        return httpResource<PostCallWithOptionalParamResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ParametersServiceRequests).postCallWithOptionalParam(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceResources {
-    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined; }); }
+    public callWithDescriptions<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DescriptionsServiceRequests).callWithDescriptions(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
@@ -523,126 +722,291 @@ export class DeprecatedServiceResources {
     /**
      * @deprecated
      */
-    public deprecatedCall<ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DeprecatedServiceRequests).deprecatedCall(opts) : undefined; }); }
+    public deprecatedCall<ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DeprecatedServiceRequests).deprecatedCall(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class RequestBodyServiceResources {
-    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(RequestBodyServiceRequests).postApiVbyApiVersionRequestBody(opts) : undefined; }); }
+    public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(RequestBodyServiceRequests).postApiVbyApiVersionRequestBody(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FormDataServiceResources {
-    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(FormDataServiceRequests).postApiVbyApiVersionFormData(opts) : undefined; }); }
+    public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(FormDataServiceRequests).postApiVbyApiVersionFormData(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceResources {
-    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined; }); }
+    public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callWithDefaultParameters(opts) : undefined;
+        });
+    }
     
-    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined; }); }
+    public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callWithDefaultOptionalParameters(opts) : undefined;
+        });
+    }
     
-    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined; }); }
+    public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DefaultsServiceRequests).callToTestOrderOfParams(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceResources {
-    public duplicateName<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined; }); }
-    
-    public duplicateName2<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined; }); }
-    
-    public duplicateName3<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined; }); }
-    
-    public duplicateName4<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined; }); }
+    public duplicateName<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName(opts) : undefined;
+        });
+    }
+    
+    public duplicateName2<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName2(opts) : undefined;
+        });
+    }
+    
+    public duplicateName3<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName3(opts) : undefined;
+        });
+    }
+    
+    public duplicateName4<ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(DuplicateServiceRequests).duplicateName4(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceResources {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined; }); }
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NoContentServiceRequests).callWithNoContentResponse(opts) : undefined;
+        });
+    }
     
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceResources {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined; }); }
-    
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) { return httpResource<CallWithResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined; }); }
-    
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) { return httpResource<CallWithDuplicateResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined; }); }
-    
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) { return httpResource<CallWithResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined; }); }
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponseAndNoContentResponse(opts) : undefined;
+        });
+    }
+    
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponse(opts) : undefined;
+        });
+    }
+    
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) {
+        return httpResource<CallWithDuplicateResponsesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithDuplicateResponses(opts) : undefined;
+        });
+    }
+    
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) {
+        return httpResource<CallWithResponsesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ResponseServiceRequests).callWithResponses(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceResources {
-    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) { return httpResource<DummyAResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) {
+        return httpResource<DummyAResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined;
+        });
+    }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<DummyBResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceResources {
-    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) { return httpResource<DummyAResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined; }); }
+    public dummyA<ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) {
+        return httpResource<DummyAResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyA(opts) : undefined;
+        });
+    }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<DummyBResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceResources {
-    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) { return httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined; }); }
+    public dummyB<ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) {
+        return httpResource<DummyBResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipleTags1ServiceRequests).dummyB(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceResources {
-    public collectionFormat<ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined; }); }
+    public collectionFormat<ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(CollectionFormatServiceRequests).collectionFormat(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceResources {
-    public types<ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) { return httpResource<TypesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(TypesServiceRequests).types(opts) : undefined; }); }
+    public types<ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) {
+        return httpResource<TypesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(TypesServiceRequests).types(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class UploadServiceResources {
-    public uploadFile<ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) { return httpResource<UploadFileResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(UploadServiceRequests).uploadFile(opts) : undefined; }); }
+    public uploadFile<ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) {
+        return httpResource<UploadFileResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(UploadServiceRequests).uploadFile(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class FileResponseServiceResources {
-    public fileResponse<ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) { return httpResource<FileResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(FileResponseServiceRequests).fileResponse(opts) : undefined; }); }
+    public fileResponse<ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) {
+        return httpResource<FileResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(FileResponseServiceRequests).fileResponse(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceResources {
-    public complexTypes<ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) { return httpResource<ComplexTypesResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined; }); }
+    public complexTypes<ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) {
+        return httpResource<ComplexTypesResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ComplexServiceRequests).complexTypes(opts) : undefined;
+        });
+    }
     
-    public complexParams<ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) { return httpResource<ComplexParamsResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(ComplexServiceRequests).complexParams(opts) : undefined; }); }
+    public complexParams<ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) {
+        return httpResource<ComplexParamsResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ComplexServiceRequests).complexParams(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class MultipartServiceResources {
-    public multipartResponse<ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) { return httpResource<MultipartResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipartServiceRequests).multipartResponse(opts) : undefined; }); }
+    public multipartResponse<ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) {
+        return httpResource<MultipartResponseResponse>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipartServiceRequests).multipartResponse(opts) : undefined;
+        });
+    }
     
-    public multipartRequest<ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(MultipartServiceRequests).multipartRequest(opts) : undefined; }); }
+    public multipartRequest<ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(MultipartServiceRequests).multipartRequest(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceResources {
-    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined; }); }
+    public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(HeaderServiceRequests).callWithResultFromHeader(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceResources {
-    public testErrorCode<ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined; }); }
+    public testErrorCode<ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(ErrorServiceRequests).testErrorCode(opts) : undefined;
+        });
+    }
 }
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceResources {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) { return httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => { const opts = options ? options() : undefined; return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined; }); }
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) {
+        return httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).nonAsciiæøåÆøÅöôêÊ字符串(opts) : undefined;
+        });
+    }
     
     /**
      * Login User
      */
-    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) { return httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).putWithFormUrlEncoded(opts) : undefined; }); }
+    public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) {
+        return httpResource<unknown>(() => {
+            const opts = options ? options() : undefined;
+            return opts ? inject(NonAsciiÆøåÆøÅöôêÊServiceRequests).putWithFormUrlEncoded(opts) : undefined;
+        });
+    }
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts
index 2aeb7aacc..474d7c8c6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/@angular/common.gen.ts
@@ -348,104 +348,248 @@ export const putWithFormUrlEncodedRequest = <ThrowOnError extends boolean = fals
     ...options
 });
 
-export const exportResource = <ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? exportRequest(opts) : undefined; });
+export const exportResource = <ThrowOnError extends boolean = false>(options?: () => Options<ExportData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? exportRequest(opts) : undefined;
+});
 
-export const patchApiVbyApiVersionNoTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined; });
+export const patchApiVbyApiVersionNoTagResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchApiVbyApiVersionNoTagData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? patchApiVbyApiVersionNoTagRequest(opts) : undefined;
+});
 
-export const importResource = <ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) => httpResource<ImportResponse>(() => { const opts = options ? options() : undefined; return opts ? importRequest(opts) : undefined; });
+export const importResource = <ThrowOnError extends boolean = false>(options: () => Options<ImportData, ThrowOnError> | undefined) => httpResource<ImportResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? importRequest(opts) : undefined;
+});
 
-export const fooWowResource = <ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? fooWowRequest(opts) : undefined; });
+export const fooWowResource = <ThrowOnError extends boolean = false>(options?: () => Options<FooWowData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? fooWowRequest(opts) : undefined;
+});
 
-export const apiVVersionODataControllerCountResource = <ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) => httpResource<ApiVVersionODataControllerCountResponse>(() => { const opts = options ? options() : undefined; return opts ? apiVVersionODataControllerCountRequest(opts) : undefined; });
+export const apiVVersionODataControllerCountResource = <ThrowOnError extends boolean = false>(options?: () => Options<ApiVVersionODataControllerCountData, ThrowOnError> | undefined) => httpResource<ApiVVersionODataControllerCountResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? apiVVersionODataControllerCountRequest(opts) : undefined;
+});
 
-export const getApiVbyApiVersionSimpleOperationResource = <ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) => httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => { const opts = options ? options() : undefined; return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined; });
+export const getApiVbyApiVersionSimpleOperationResource = <ThrowOnError extends boolean = false>(options: () => Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError> | undefined) => httpResource<GetApiVbyApiVersionSimpleOperationResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getApiVbyApiVersionSimpleOperationRequest(opts) : undefined;
+});
 
-export const deleteCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const deleteCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deleteCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const getCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const getCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<GetCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const headCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const headCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<HeadCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? headCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const optionsCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const optionsCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? optionsCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const patchCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const patchCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PatchCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? patchCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const postCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const postCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const putCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined; });
+export const putCallWithoutParametersAndResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<PutCallWithoutParametersAndResponseData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? putCallWithoutParametersAndResponseRequest(opts) : undefined;
+});
 
-export const deleteFooResource = <ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deleteFooRequest(opts) : undefined; });
+export const deleteFooResource = <ThrowOnError extends boolean = false>(options: () => Options<DeleteFooData3, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deleteFooRequest(opts) : undefined;
+});
 
-export const callWithDescriptionsResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDescriptionsRequest(opts) : undefined; });
+export const callWithDescriptionsResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDescriptionsData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDescriptionsRequest(opts) : undefined;
+});
 
 /**
  * @deprecated
  */
-export const deprecatedCallResource = <ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? deprecatedCallRequest(opts) : undefined; });
+export const deprecatedCallResource = <ThrowOnError extends boolean = false>(options: () => Options<DeprecatedCallData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? deprecatedCallRequest(opts) : undefined;
+});
 
-export const callWithParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithParametersRequest(opts) : undefined; });
+export const callWithParametersResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithParametersRequest(opts) : undefined;
+});
 
-export const callWithWeirdParameterNamesResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithWeirdParameterNamesRequest(opts) : undefined; });
+export const callWithWeirdParameterNamesResource = <ThrowOnError extends boolean = false>(options: () => Options<CallWithWeirdParameterNamesData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithWeirdParameterNamesRequest(opts) : undefined;
+});
 
-export const getCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? getCallWithOptionalParamRequest(opts) : undefined; });
+export const getCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<GetCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? getCallWithOptionalParamRequest(opts) : undefined;
+});
 
-export const postCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<PostCallWithOptionalParamResponse>(() => { const opts = options ? options() : undefined; return opts ? postCallWithOptionalParamRequest(opts) : undefined; });
+export const postCallWithOptionalParamResource = <ThrowOnError extends boolean = false>(options: () => Options<PostCallWithOptionalParamData, ThrowOnError> | undefined) => httpResource<PostCallWithOptionalParamResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postCallWithOptionalParamRequest(opts) : undefined;
+});
 
-export const postApiVbyApiVersionRequestBodyResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined; });
+export const postApiVbyApiVersionRequestBodyResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postApiVbyApiVersionRequestBodyRequest(opts) : undefined;
+});
 
-export const postApiVbyApiVersionFormDataResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined; });
+export const postApiVbyApiVersionFormDataResource = <ThrowOnError extends boolean = false>(options?: () => Options<PostApiVbyApiVersionFormDataData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? postApiVbyApiVersionFormDataRequest(opts) : undefined;
+});
 
-export const callWithDefaultParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDefaultParametersRequest(opts) : undefined; });
+export const callWithDefaultParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDefaultParametersRequest(opts) : undefined;
+});
 
-export const callWithDefaultOptionalParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined; });
+export const callWithDefaultOptionalParametersResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDefaultOptionalParametersData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDefaultOptionalParametersRequest(opts) : undefined;
+});
 
-export const callToTestOrderOfParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callToTestOrderOfParamsRequest(opts) : undefined; });
+export const callToTestOrderOfParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<CallToTestOrderOfParamsData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callToTestOrderOfParamsRequest(opts) : undefined;
+});
 
-export const duplicateNameResource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateNameRequest(opts) : undefined; });
+export const duplicateNameResource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateNameData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateNameRequest(opts) : undefined;
+});
 
-export const duplicateName2Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName2Request(opts) : undefined; });
+export const duplicateName2Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName2Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName2Request(opts) : undefined;
+});
 
-export const duplicateName3Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName3Request(opts) : undefined; });
+export const duplicateName3Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName3Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName3Request(opts) : undefined;
+});
 
-export const duplicateName4Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? duplicateName4Request(opts) : undefined; });
+export const duplicateName4Resource = <ThrowOnError extends boolean = false>(options?: () => Options<DuplicateName4Data, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? duplicateName4Request(opts) : undefined;
+});
 
-export const callWithNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithNoContentResponseRequest(opts) : undefined; });
+export const callWithNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithNoContentResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithNoContentResponseRequest(opts) : undefined;
+});
 
-export const callWithResponseAndNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseAndNoContentResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined; });
+export const callWithResponseAndNoContentResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseAndNoContentResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseAndNoContentResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponseAndNoContentResponseRequest(opts) : undefined;
+});
 
-export const dummyAResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) => httpResource<DummyAResponse>(() => { const opts = options ? options() : undefined; return opts ? dummyARequest(opts) : undefined; });
+export const dummyAResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyAData, ThrowOnError> | undefined) => httpResource<DummyAResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? dummyARequest(opts) : undefined;
+});
 
-export const dummyBResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) => httpResource<DummyBResponse>(() => { const opts = options ? options() : undefined; return opts ? dummyBRequest(opts) : undefined; });
+export const dummyBResource = <ThrowOnError extends boolean = false>(options?: () => Options<DummyBData, ThrowOnError> | undefined) => httpResource<DummyBResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? dummyBRequest(opts) : undefined;
+});
 
-export const callWithResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponseRequest(opts) : undefined; });
+export const callWithResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponseData, ThrowOnError> | undefined) => httpResource<CallWithResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponseRequest(opts) : undefined;
+});
 
-export const callWithDuplicateResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) => httpResource<CallWithDuplicateResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithDuplicateResponsesRequest(opts) : undefined; });
+export const callWithDuplicateResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithDuplicateResponsesData, ThrowOnError> | undefined) => httpResource<CallWithDuplicateResponsesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithDuplicateResponsesRequest(opts) : undefined;
+});
 
-export const callWithResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) => httpResource<CallWithResponsesResponse>(() => { const opts = options ? options() : undefined; return opts ? callWithResponsesRequest(opts) : undefined; });
+export const callWithResponsesResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResponsesData, ThrowOnError> | undefined) => httpResource<CallWithResponsesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResponsesRequest(opts) : undefined;
+});
 
-export const collectionFormatResource = <ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? collectionFormatRequest(opts) : undefined; });
+export const collectionFormatResource = <ThrowOnError extends boolean = false>(options: () => Options<CollectionFormatData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? collectionFormatRequest(opts) : undefined;
+});
 
-export const typesResource = <ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) => httpResource<TypesResponse>(() => { const opts = options ? options() : undefined; return opts ? typesRequest(opts) : undefined; });
+export const typesResource = <ThrowOnError extends boolean = false>(options: () => Options<TypesData, ThrowOnError> | undefined) => httpResource<TypesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? typesRequest(opts) : undefined;
+});
 
-export const uploadFileResource = <ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) => httpResource<UploadFileResponse>(() => { const opts = options ? options() : undefined; return opts ? uploadFileRequest(opts) : undefined; });
+export const uploadFileResource = <ThrowOnError extends boolean = false>(options: () => Options<UploadFileData, ThrowOnError> | undefined) => httpResource<UploadFileResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? uploadFileRequest(opts) : undefined;
+});
 
-export const fileResponseResource = <ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) => httpResource<FileResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? fileResponseRequest(opts) : undefined; });
+export const fileResponseResource = <ThrowOnError extends boolean = false>(options: () => Options<FileResponseData, ThrowOnError> | undefined) => httpResource<FileResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? fileResponseRequest(opts) : undefined;
+});
 
-export const complexTypesResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) => httpResource<ComplexTypesResponse>(() => { const opts = options ? options() : undefined; return opts ? complexTypesRequest(opts) : undefined; });
+export const complexTypesResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexTypesData, ThrowOnError> | undefined) => httpResource<ComplexTypesResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? complexTypesRequest(opts) : undefined;
+});
 
-export const multipartResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) => httpResource<MultipartResponseResponse>(() => { const opts = options ? options() : undefined; return opts ? multipartResponseRequest(opts) : undefined; });
+export const multipartResponseResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartResponseData, ThrowOnError> | undefined) => httpResource<MultipartResponseResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? multipartResponseRequest(opts) : undefined;
+});
 
-export const multipartRequestResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? multipartRequestRequest(opts) : undefined; });
+export const multipartRequestResource = <ThrowOnError extends boolean = false>(options?: () => Options<MultipartRequestData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? multipartRequestRequest(opts) : undefined;
+});
 
-export const complexParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) => httpResource<ComplexParamsResponse>(() => { const opts = options ? options() : undefined; return opts ? complexParamsRequest(opts) : undefined; });
+export const complexParamsResource = <ThrowOnError extends boolean = false>(options: () => Options<ComplexParamsData, ThrowOnError> | undefined) => httpResource<ComplexParamsResponse>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? complexParamsRequest(opts) : undefined;
+});
 
-export const callWithResultFromHeaderResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? callWithResultFromHeaderRequest(opts) : undefined; });
+export const callWithResultFromHeaderResource = <ThrowOnError extends boolean = false>(options?: () => Options<CallWithResultFromHeaderData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? callWithResultFromHeaderRequest(opts) : undefined;
+});
 
-export const testErrorCodeResource = <ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? testErrorCodeRequest(opts) : undefined; });
+export const testErrorCodeResource = <ThrowOnError extends boolean = false>(options: () => Options<TestErrorCodeData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? testErrorCodeRequest(opts) : undefined;
+});
 
-export const nonAsciiæøåÆøÅöôêÊ字符串Resource = <ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) => httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => { const opts = options ? options() : undefined; return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined; });
+export const nonAsciiæøåÆøÅöôêÊ字符串Resource = <ThrowOnError extends boolean = false>(options: () => Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError> | undefined) => httpResource<NonAsciiæøåÆøÅöôêÊ字符串Response>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? nonAsciiæøåÆøÅöôêÊ字符串Request(opts) : undefined;
+});
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedResource = <ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) => httpResource<unknown>(() => { const opts = options ? options() : undefined; return opts ? putWithFormUrlEncodedRequest(opts) : undefined; });
+export const putWithFormUrlEncodedResource = <ThrowOnError extends boolean = false>(options: () => Options<PutWithFormUrlEncodedData, ThrowOnError> | undefined) => httpResource<unknown>(() => {
+    const opts = options ? options() : undefined;
+    return opts ? putWithFormUrlEncodedRequest(opts) : undefined;
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
index 88a1b02c6..effd73175 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/sdk.gen.ts
@@ -23,13 +23,19 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class Domains extends HeyApiClient {
-    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) { return (options?.client ?? this.client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) { return (options?.client ?? this.client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
 }
 
 export class Providers extends HeyApiClient {
@@ -37,7 +43,9 @@ export class Providers extends HeyApiClient {
 }
 
 export class Business extends HeyApiClient {
-    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) { return (options?.client ?? this.client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options });
+    }
     
     providers = new Providers({ client: this.client });
 }
@@ -55,7 +63,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class NestedSdkWithInstance extends HeyApiClient {
@@ -64,11 +74,18 @@ export class NestedSdkWithInstance extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); NestedSdkWithInstance.__registry.set(this, args?.key); }
+    }) {
+        super(args);
+        NestedSdkWithInstance.__registry.set(this, args?.key);
+    }
     
-    public putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options }); }
+    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options });
+    }
     
     business = new Business({ client: this.client });
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
index bc2324ac0..8c055a5e4 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/sdk.gen.ts
@@ -19,11 +19,17 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class Domains {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) { return (options?.client ?? client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<BusinessProvidersDomainsGetResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public static post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) { return (options?.client ?? client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<BusinessProvidersDomainsPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<BusinessProvidersDomainsPostResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
     
-    public static putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) { return (options?.client ?? client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options }); }
+    public static putBusinessProvidersDomains<ThrowOnError extends boolean = false>(options?: Options<PutBusinessProvidersDomainsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutBusinessProvidersDomainsResponses, unknown, ThrowOnError>({ url: '/business/providers/domains', ...options });
+    }
 }
 
 export class Providers {
@@ -31,13 +37,17 @@ export class Providers {
 }
 
 export class Business {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) { return (options?.client ?? client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<BusinessGetData, ThrowOnError>) {
+        return (options?.client ?? client).get<BusinessGetResponses, unknown, ThrowOnError>({ url: '/locations/businesses', ...options });
+    }
     
     static providers = Providers;
 }
 
 export class Locations {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/locations', ...options });
+    }
     
     static business = Business;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
index 5196fa3c5..966bfdf87 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/sdk.gen.ts
@@ -23,19 +23,29 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class Bar extends HeyApiClient {
-    public post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? this.client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? this.client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class Foo extends HeyApiClient {
-    public post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? this.client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? this.client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     bar = new Bar({ client: this.client });
 }
@@ -53,7 +63,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class Sdk extends HeyApiClient {
@@ -62,11 +74,18 @@ export class Sdk extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); Sdk.__registry.set(this, args?.key); }
+    }) {
+        super(args);
+        Sdk.__registry.set(this, args?.key);
+    }
     
-    public getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? this.client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? this.client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     foo = new Foo({ client: this.client });
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
index 4d964f9a6..9c52054bc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/transformers.gen.ts
@@ -1,3 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const fooSchemaResponseTransformer = (data: any) => { data.foo = BigInt(data.foo.toString()); return data; };
+const fooSchemaResponseTransformer = (data: any) => {
+    data.foo = BigInt(data.foo.toString());
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
index 4d964f9a6..9c52054bc 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/transformers.gen.ts
@@ -1,3 +1,6 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const fooSchemaResponseTransformer = (data: any) => { data.foo = BigInt(data.foo.toString()); return data; };
+const fooSchemaResponseTransformer = (data: any) => {
+    data.foo = BigInt(data.foo.toString());
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
index 26abe5f67..3aeed5221 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/@pinia/colada.gen.ts
@@ -46,52 +46,70 @@ export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey(
 
 export const getFooQuery = defineQueryOptions((options?: Options<GetFooData>) => ({
     key: getFooQueryKey(options),
-    query: async (context) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, Options<FooPostData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.post({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, Options<FooPutData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.put({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarQuery = defineQueryOptions((options?: Options<GetFooBarData>) => ({
     key: getFooBarQueryKey(options),
-    query: async (context) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, Options<FooBarPostData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.barService.post({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, Options<FooBarPutData>, Error> => ({
-    mutation: async (vars) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await FooBazService.fooService.barService.put({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
index 1aef078ed..81651e8f9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/@pinia/colada.gen.ts
@@ -46,423 +46,561 @@ export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey(
 
 export const exportQuery = defineQueryOptions((options?: Options<ExportData>) => ({
     key: exportQueryKey(options),
-    query: async (context) => { const { data } = await export_({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await export_({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => ({
-    mutation: async (vars) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await patchApiVbyApiVersionNoTag({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, Options<ImportData>, Error> => ({
-    mutation: async (vars) => { const { data } = await import_({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await import_({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => ({
-    mutation: async (vars) => { const { data } = await fooWow({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await fooWow({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountQuery = defineQueryOptions((options?: Options<ApiVVersionODataControllerCountData>) => ({
     key: apiVVersionODataControllerCountQueryKey(options),
-    query: async (context) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationQuery = defineQueryOptions((options: Options<GetApiVbyApiVersionSimpleOperationData>) => ({
     key: getApiVbyApiVersionSimpleOperationQueryKey(options),
-    query: async (context) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deleteCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
     key: getCallWithoutParametersAndResponseQueryKey(options),
-    query: async (context) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await patchCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => ({
-    mutation: async (vars) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await putCallWithoutParametersAndResponse({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, Options<DeleteFooData3>, Error> => ({
-    mutation: async (vars) => { const { data } = await deleteFoo({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deleteFoo({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDescriptions({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, Options<DeprecatedCallData>, Error> => ({
-    mutation: async (vars) => { const { data } = await deprecatedCall({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await deprecatedCall({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithParameters({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithParameters({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithWeirdParameterNames({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamQuery = defineQueryOptions((options: Options<GetCallWithOptionalParamData>) => ({
     key: getCallWithOptionalParamQueryKey(options),
-    query: async (context) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, Options<PostCallWithOptionalParamData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postCallWithOptionalParam({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionRequestBodyData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postApiVbyApiVersionRequestBody({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionFormDataData>, Error> => ({
-    mutation: async (vars) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await postApiVbyApiVersionFormData({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersQuery = defineQueryOptions((options?: Options<CallWithDefaultParametersData>) => ({
     key: callWithDefaultParametersQueryKey(options),
-    query: async (context) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDefaultOptionalParameters({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callToTestOrderOfParams({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
     key: duplicateName2QueryKey(options),
-    query: async (context) => { const { data } = await duplicateName2({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName3({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName3({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await duplicateName4({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await duplicateName4({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
     key: callWithNoContentResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
     key: callWithResponseAndNoContentResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
     key: dummyAQueryKey(options),
-    query: async (context) => { const { data } = await dummyA({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await dummyA({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
     key: dummyBQueryKey(options),
-    query: async (context) => { const { data } = await dummyB({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await dummyB({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
     key: callWithResponseQueryKey(options),
-    query: async (context) => { const { data } = await callWithResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => ({
-    mutation: async (vars) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithDuplicateResponses({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => ({
-    mutation: async (vars) => { const { data } = await callWithResponses({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithResponses({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
     key: collectionFormatQueryKey(options),
-    query: async (context) => { const { data } = await collectionFormat({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
     key: typesQueryKey(options),
-    query: async (context) => { const { data } = await types({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await types({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, Options<UploadFileData>, Error> => ({
-    mutation: async (vars) => { const { data } = await uploadFile({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await uploadFile({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseQuery = defineQueryOptions((options: Options<FileResponseData>) => ({
     key: fileResponseQueryKey(options),
-    query: async (context) => { const { data } = await fileResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
     key: complexTypesQueryKey(options),
-    query: async (context) => { const { data } = await complexTypes({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseQuery = defineQueryOptions((options?: Options<MultipartResponseData>) => ({
     key: multipartResponseQueryKey(options),
-    query: async (context) => { const { data } = await multipartResponse({
-        ...options,
-        ...context,
-        throwOnError: true
-    }); return data; }
+    query: async (context) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+        return data;
+    }
 }));
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, Options<MultipartRequestData>, Error> => ({
-    mutation: async (vars) => { const { data } = await multipartRequest({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await multipartRequest({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, Options<ComplexParamsData>, Error> => ({
-    mutation: async (vars) => { const { data } = await complexParams({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await complexParams({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => ({
-    mutation: async (vars) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await callWithResultFromHeader({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => ({
-    mutation: async (vars) => { const { data } = await testErrorCode({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await testErrorCode({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => ({
-    mutation: async (vars) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
 
 /**
  * Login User
  */
 export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, Options<PutWithFormUrlEncodedData>, Error> => ({
-    mutation: async (vars) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...vars,
-        throwOnError: true
-    }); return data; }
+    mutation: async (vars) => {
+        const { data } = await putWithFormUrlEncoded({
+            ...options,
+            ...vars,
+            throwOnError: true
+        });
+        return data;
+    }
 });
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
index 058ef89f1..6f71bcc40 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/@tanstack/angular-query-experimental.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
index d577b3aff..5b07cde6a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/axios/@tanstack/angular-query-experimental.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
index 41213b036..6cc80fb17 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/@tanstack/angular-query-experimental.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
index 6d7c758df..b144ed7a2 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/@tanstack/angular-query-experimental.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
index 077353a6c..74f3f999f 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/@tanstack/react-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
index 8f9f18754..38403265b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/axios/@tanstack/react-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
index d5b97ba94..378082bd0 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/@tanstack/react-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
index 52077bd6b..43c90277c 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/@tanstack/react-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
index 3be7126b7..908344e1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/@tanstack/solid-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
index 4a5b4971c..203534a86 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/axios/@tanstack/solid-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
index 548d90159..358caac28 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/@tanstack/solid-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
index 6e56543cd..ba1febdda 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/@tanstack/solid-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
index 8a3f1dff8..4f7ad47a7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/@tanstack/svelte-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
index a66a84de1..9e78e66d2 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/axios/@tanstack/svelte-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
index 346c579b6..7e81c3731 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/@tanstack/svelte-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: MutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
index 9b44f31cf..6a831b5b3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/@tanstack/svelte-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
index 1d7442c84..767635c77 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/@tanstack/vue-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await FooBazService.getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await FooBazService.getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options)
 });
 
-export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarOptions = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await BarBazService.getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await BarBazService.getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarQueryKey(options)
 });
 
-export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.post({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.post({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await FooBazService.fooService.barService.put({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await FooBazService.fooService.barService.put({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
index 320f1fb34..8b221a746 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/sdk.gen.ts
@@ -19,27 +19,39 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class BarService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) { return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooBarPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooBarPostResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) { return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooBarPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooBarPutResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
 }
 
 export class FooService {
-    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) { return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static post<ThrowOnError extends boolean = false>(options?: Options<FooPostData, ThrowOnError>) {
+        return (options?.client ?? client).post<FooPostResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
-    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) { return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static put<ThrowOnError extends boolean = false>(options?: Options<FooPutData, ThrowOnError>) {
+        return (options?.client ?? client).put<FooPutResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static barService = BarService;
 }
 
 export class FooBazService {
-    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) { return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options }); }
+    public static getFoo<ThrowOnError extends boolean = false>(options?: Options<GetFooData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooResponses, unknown, ThrowOnError>({ url: '/foo', ...options });
+    }
     
     static fooService = FooService;
 }
 
 export class BarBazService {
-    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) { return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options }); }
+    public static getFooBar<ThrowOnError extends boolean = false>(options?: Options<GetFooBarData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetFooBarResponses, unknown, ThrowOnError>({ url: '/foo/bar', ...options });
+    }
     
     static fooService = FooService;
 }
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
index 0d2884d1b..f839621a3 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/axios/@tanstack/vue-query.gen.ts
@@ -43,159 +43,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, AxiosError<DefaultError>, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, AxiosError<DefaultError>, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, AxiosError<GetApiVbyApiVersionSimpleOperationError>, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -252,285 +339,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, AxiosError<DefaultError>, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, AxiosError<DefaultError>, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, AxiosError<DefaultError>, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, AxiosError<DefaultError>, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, AxiosError<DefaultError>, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, AxiosError<CallWithResponsesError>, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, AxiosError<DefaultError>, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, AxiosError<DefaultError>, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, AxiosError<DefaultError>, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, AxiosError<DefaultError>, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, AxiosError<DefaultError>, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, AxiosError<DefaultError>, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, AxiosError<DefaultError>, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
index b68fd8934..bbcab4d5a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/@tanstack/vue-query.gen.ts
@@ -42,159 +42,246 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
 
 export const exportOptions = (options?: Options<ExportData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof exportQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await export_({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await export_({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: exportQueryKey(options)
 });
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchApiVbyApiVersionNoTag({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => { const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await import_({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooWow({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
+    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
 
 export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => queryOptions<ApiVVersionODataControllerCountResponse, DefaultError, ApiVVersionODataControllerCountResponse, ReturnType<typeof apiVVersionODataControllerCountQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await apiVVersionODataControllerCount({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await apiVVersionODataControllerCount({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: apiVVersionODataControllerCountQueryKey(options)
 });
 
 export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
 
 export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => queryOptions<GetApiVbyApiVersionSimpleOperationResponse, GetApiVbyApiVersionSimpleOperationError, GetApiVbyApiVersionSimpleOperationResponse, ReturnType<typeof getApiVbyApiVersionSimpleOperationQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getApiVbyApiVersionSimpleOperation({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
 });
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
 
 export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithoutParametersAndResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithoutParametersAndResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithoutParametersAndResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithoutParametersAndResponseQueryKey(options)
 });
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await patchCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putCallWithoutParametersAndResponse({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deleteFoo({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDescriptions({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await deprecatedCall({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithWeirdParameterNames({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
 
 export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getCallWithOptionalParamQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getCallWithOptionalParam({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getCallWithOptionalParam({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getCallWithOptionalParamQueryKey(options)
 });
 
@@ -251,285 +338,423 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
     queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
 });
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => { const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postCallWithOptionalParam({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionRequestBody({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await postApiVbyApiVersionFormData({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
 
 export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof callWithDefaultParametersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithDefaultParameters({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithDefaultParameters({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithDefaultParametersQueryKey(options)
 });
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDefaultOptionalParameters({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callToTestOrderOfParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
 
 export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof duplicateName2QueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await duplicateName2({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await duplicateName2({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: duplicateName2QueryKey(options)
 });
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName3({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await duplicateName4({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
 
 export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => queryOptions<CallWithNoContentResponseResponse, DefaultError, CallWithNoContentResponseResponse, ReturnType<typeof callWithNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithNoContentResponseQueryKey(options)
 });
 
 export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
 
 export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => queryOptions<CallWithResponseAndNoContentResponseResponse, DefaultError, CallWithResponseAndNoContentResponseResponse, ReturnType<typeof callWithResponseAndNoContentResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponseAndNoContentResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponseAndNoContentResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseAndNoContentResponseQueryKey(options)
 });
 
 export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
 
 export const dummyAOptions = (options?: Options<DummyAData>) => queryOptions<DummyAResponse, DefaultError, DummyAResponse, ReturnType<typeof dummyAQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyA({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyA({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyAQueryKey(options)
 });
 
 export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
 
 export const dummyBOptions = (options?: Options<DummyBData>) => queryOptions<DummyBResponse, DefaultError, DummyBResponse, ReturnType<typeof dummyBQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await dummyB({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await dummyB({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: dummyBQueryKey(options)
 });
 
 export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
 
 export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => queryOptions<CallWithResponseResponse, DefaultError, CallWithResponseResponse, ReturnType<typeof callWithResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await callWithResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await callWithResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: callWithResponseQueryKey(options)
 });
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithDuplicateResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => { const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResponses({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
 
 export const collectionFormatOptions = (options: Options<CollectionFormatData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof collectionFormatQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await collectionFormat({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await collectionFormat({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: collectionFormatQueryKey(options)
 });
 
 export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
 
 export const typesOptions = (options: Options<TypesData>) => queryOptions<TypesResponse, DefaultError, TypesResponse, ReturnType<typeof typesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await types({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await types({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: typesQueryKey(options)
 });
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => { const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
 
 export const fileResponseOptions = (options: Options<FileResponseData>) => queryOptions<FileResponseResponse, DefaultError, FileResponseResponse, ReturnType<typeof fileResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await fileResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await fileResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: fileResponseQueryKey(options)
 });
 
 export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
 
 export const complexTypesOptions = (options: Options<ComplexTypesData>) => queryOptions<ComplexTypesResponse, DefaultError, ComplexTypesResponse, ReturnType<typeof complexTypesQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await complexTypes({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await complexTypes({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: complexTypesQueryKey(options)
 });
 
 export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
 
 export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => queryOptions<MultipartResponseResponse, DefaultError, MultipartResponseResponse, ReturnType<typeof multipartResponseQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await multipartResponse({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await multipartResponse({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: multipartResponseQueryKey(options)
 });
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await multipartRequest({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => { const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await complexParams({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await callWithResultFromHeader({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await testErrorCode({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
-
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => { const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
-    mutationFn: async (fnOptions) => { const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
+    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    const mutationOptions: UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => { const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await putWithFormUrlEncoded({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutWithFormUrlEncodedData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
index 6ed25f5f3..bfd35f1d6 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/@tanstack/vue-query.gen.ts
@@ -42,55 +42,85 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooD = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooE = (options?: Options<GetFooData>) => queryOptions<GetFooResponse, DefaultError, GetFooResponse, ReturnType<typeof getFooD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooD(options)
 });
 
-export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => { const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
+    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => { const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
+    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
 
 export const getFooBarE = (options?: Options<GetFooBarData>) => queryOptions<GetFooBarResponse, DefaultError, GetFooBarResponse, ReturnType<typeof getFooBarD>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFooBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFooBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooBarD(options)
 });
 
-export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => { const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPost({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPost({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
 
-export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => { const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
-    mutationFn: async (fnOptions) => { const { data } = await fooBarPut({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-    }); return data; }
-}; return mutationOptions; };
+export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
+    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await fooBarPut({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/transformers.gen.ts
index d535c1ec3..9c53d7569 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/transformers.gen.ts
@@ -1,7 +1,13 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-const quxSchemaResponseTransformer = (data: any) => { if (data.baz) {
-    data.baz = new Date(data.baz);
-} return data; };
+const quxSchemaResponseTransformer = (data: any) => {
+    if (data.baz) {
+        data.baz = new Date(data.baz);
+    }
+    return data;
+};
 
-const bazSchemaResponseTransformer = (data: any) => { data.bar = new Date(data.bar); return data; };
+const bazSchemaResponseTransformer = (data: any) => {
+    data.bar = new Date(data.bar);
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/transformers.gen.ts
index 7f1d0859a..281cc13b5 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/transformers.gen.ts
@@ -16,8 +16,11 @@ const fooSchemaResponseTransformer = (data: any) => {
     return data;
 };
 
-const nestedDateObjectSchemaResponseTransformer = (data: any) => { if (data.foo) {
-    if (data.foo.bar) {
-        data.foo.bar = new Date(data.foo.bar);
+const nestedDateObjectSchemaResponseTransformer = (data: any) => {
+    if (data.foo) {
+        if (data.foo.bar) {
+            data.foo.bar = new Date(data.foo.bar);
+        }
     }
-} return data; };
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/transformers.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/transformers.gen.ts
index 55875bf9f..fc50ee927 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/transformers.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/transformers.gen.ts
@@ -2,4 +2,10 @@
 
 import type { GetFooResponse } from './types.gen';
 
-export const getFooResponseTransformer = async (data: any): Promise<GetFooResponse> => { data.foo = data.foo.map((item: any) => { item.baz = new Date(item.baz); return item; }); return data; };
+export const getFooResponseTransformer = async (data: any): Promise<GetFooResponse> => {
+    data.foo = data.foo.map((item: any) => {
+        item.baz = new Date(item.baz);
+        return item;
+    });
+    return data;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts
index 5068e1622..a168141eb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/angular-query-experimental.gen.ts
@@ -42,12 +42,15 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options),
     meta: {
         id: 'getFoo',
@@ -59,12 +62,15 @@ export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unk
 export const getBarQueryKey = (options?: Options<GetBarData>) => createQueryKey('getBar', options);
 
 export const getBarOptions = (options?: Options<GetBarData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getBarQueryKey(options),
     meta: {
         id: 'getBar',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts
index 0d9548a97..5a6a25034 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/react-query.gen.ts
@@ -42,12 +42,15 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options),
     meta: {
         id: 'getFoo',
@@ -59,12 +62,15 @@ export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unk
 export const getBarQueryKey = (options?: Options<GetBarData>) => createQueryKey('getBar', options);
 
 export const getBarOptions = (options?: Options<GetBarData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getBarQueryKey(options),
     meta: {
         id: 'getBar',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts
index 4058551ff..8b6d32356 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/solid-query.gen.ts
@@ -42,12 +42,15 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options),
     meta: {
         id: 'getFoo',
@@ -59,12 +62,15 @@ export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unk
 export const getBarQueryKey = (options?: Options<GetBarData>) => createQueryKey('getBar', options);
 
 export const getBarOptions = (options?: Options<GetBarData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getBarQueryKey(options),
     meta: {
         id: 'getBar',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts
index 164a8f8e5..4c50bd620 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/svelte-query.gen.ts
@@ -42,12 +42,15 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options),
     meta: {
         id: 'getFoo',
@@ -59,12 +62,15 @@ export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unk
 export const getBarQueryKey = (options?: Options<GetBarData>) => createQueryKey('getBar', options);
 
 export const getBarOptions = (options?: Options<GetBarData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getBarQueryKey(options),
     meta: {
         id: 'getBar',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts
index f642547c0..4793f41da 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/@tanstack/vue-query.gen.ts
@@ -42,12 +42,15 @@ const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions
 export const getFooQueryKey = (options?: Options<GetFooData>) => createQueryKey('getFoo', options);
 
 export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getFooQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getFoo({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getFoo({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getFooQueryKey(options),
     meta: {
         id: 'getFoo',
@@ -59,12 +62,15 @@ export const getFooOptions = (options?: Options<GetFooData>) => queryOptions<unk
 export const getBarQueryKey = (options?: Options<GetBarData>) => createQueryKey('getBar', options);
 
 export const getBarOptions = (options?: Options<GetBarData>) => queryOptions<unknown, DefaultError, unknown, ReturnType<typeof getBarQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => { const { data } = await getBar({
-        ...options,
-        ...queryKey[0],
-        signal,
-        throwOnError: true
-    }); return data; },
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await getBar({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
     queryKey: getBarQueryKey(options),
     meta: {
         id: 'getBar',
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts
index 94fadaece..18c322e48 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/sdk.gen.ts
@@ -19,460 +19,682 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
 };
 
 export class AccountingCompanyMemberships {
-    public static putApiV1AccountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1AccountingCompanyMembershipsData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1AccountingCompanyMembershipsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/accounting-company-memberships',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1AccountingCompanyMembershipsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompanyMembershipsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1AccountingCompanyMembershipsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-company-memberships/{id}', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static putApiV1AccountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1AccountingCompanyMembershipsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1AccountingCompanyMembershipsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/accounting-company-memberships',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1AccountingCompanyMembershipsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompanyMembershipsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1AccountingCompanyMembershipsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-company-memberships/{id}', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class BankAccounts {
-    public static putApiV1BankAccounts<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BankAccountsData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1BankAccountsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/bank-accounts',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1BankAccountsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BankAccountsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1BankAccountsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/bank-accounts/{id}', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBankAccountsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static putApiV1BankAccounts<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BankAccountsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1BankAccountsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/bank-accounts',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1BankAccountsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BankAccountsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1BankAccountsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/bank-accounts/{id}', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBankAccountsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class BusinessAccountantAssignments {
-    public static putApiV1BusinessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessAccountantAssignmentsData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1BusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-accountant-assignments',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1BusinessAccountantAssignmentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessAccountantAssignmentsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1BusinessAccountantAssignmentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-accountant-assignments/{id}', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static putApiV1BusinessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessAccountantAssignmentsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1BusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-accountant-assignments',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1BusinessAccountantAssignmentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessAccountantAssignmentsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1BusinessAccountantAssignmentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-accountant-assignments/{id}', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class BusinessDocumentActivities {
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options }); }
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options });
+    }
 }
 
 export class BusinessDocuments {
-    public static getApiV1BusinessDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessDocumentsByIdRawData, ThrowOnError>) { return (options.client ?? client).get<GetApiV1BusinessDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/raw', ...options }); }
-    
-    public static postApiV1BusinessDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessDocumentsData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1BusinessDocumentsResponses, unknown, ThrowOnError>({
-        ...formDataBodySerializer,
-        url: '/api/v1/business-documents',
-        ...options,
-        headers: {
-            'Content-Type': null,
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessDocumentsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}', ...options }); }
-    
-    public static putApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessDocumentsByIdData, ThrowOnError>) { return (options.client ?? client).put<PutApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-documents/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1BusinessDocumentsByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdApproveData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/approve', ...options }); }
-    
-    public static postApiV1BusinessDocumentsByIdUnapprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdUnapproveData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdUnapproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/unapprove', ...options }); }
-    
-    public static postApiV1BusinessDocumentsByIdMoveToPersonal<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToPersonalData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options }); }
-    
-    public static postApiV1BusinessDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToBusinessData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-documents/{id}/move-to-business',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static getApiV1BusinessDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessDocumentsByIdRawData, ThrowOnError>) {
+        return (options.client ?? client).get<GetApiV1BusinessDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/raw', ...options });
+    }
+    
+    public static postApiV1BusinessDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessDocumentsData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1BusinessDocumentsResponses, unknown, ThrowOnError>({
+            ...formDataBodySerializer,
+            url: '/api/v1/business-documents',
+            ...options,
+            headers: {
+                'Content-Type': null,
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessDocumentsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}', ...options });
+    }
+    
+    public static putApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessDocumentsByIdData, ThrowOnError>) {
+        return (options.client ?? client).put<PutApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-documents/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1BusinessDocumentsByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdApproveData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/approve', ...options });
+    }
+    
+    public static postApiV1BusinessDocumentsByIdUnapprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdUnapproveData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdUnapproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/unapprove', ...options });
+    }
+    
+    public static postApiV1BusinessDocumentsByIdMoveToPersonal<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToPersonalData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options });
+    }
+    
+    public static postApiV1BusinessDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToBusinessData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-documents/{id}/move-to-business',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class BusinessDocumentsSummaries {
     /**
      * @deprecated
      */
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options }); }
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options });
+    }
     
-    public static get api() { return Api; }
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Businesses {
-    public static getApiV1BusinessesByIdDocumentTypesSummary<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessesByIdDocumentTypesSummaryData, ThrowOnError>) { return (options.client ?? client).get<GetApiV1BusinessesByIdDocumentTypesSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/document-types-summary', ...options }); }
-    
-    public static postApiV1Businesses<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessesData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1BusinessesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/businesses',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessesByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1BusinessesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}', ...options }); }
-    
-    public static putApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdData, ThrowOnError>) { return (options.client ?? client).put<PutApiV1BusinessesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/businesses/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static putApiV1BusinessesByIdContact<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdContactData, ThrowOnError>) { return (options.client ?? client).put<PutApiV1BusinessesByIdContactResponses, unknown, ThrowOnError>({
-        url: '/api/v1/businesses/{id}/contact',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1BusinessesByIdDisconnect<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessesByIdDisconnectData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1BusinessesByIdDisconnectResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/disconnect', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/$count', ...options }); }
-    
-    public static key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKey2Data, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/{key}', ...options }); }
-    
-    public static get api() { return Api; }
+    public static getApiV1BusinessesByIdDocumentTypesSummary<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessesByIdDocumentTypesSummaryData, ThrowOnError>) {
+        return (options.client ?? client).get<GetApiV1BusinessesByIdDocumentTypesSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/document-types-summary', ...options });
+    }
+    
+    public static postApiV1Businesses<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessesData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1BusinessesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/businesses',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessesByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1BusinessesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}', ...options });
+    }
+    
+    public static putApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdData, ThrowOnError>) {
+        return (options.client ?? client).put<PutApiV1BusinessesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/businesses/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static putApiV1BusinessesByIdContact<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdContactData, ThrowOnError>) {
+        return (options.client ?? client).put<PutApiV1BusinessesByIdContactResponses, unknown, ThrowOnError>({
+            url: '/api/v1/businesses/{id}/contact',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1BusinessesByIdDisconnect<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessesByIdDisconnectData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1BusinessesByIdDisconnectResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/disconnect', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/$count', ...options });
+    }
+    
+    public static key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKey2Data, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/{key}', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class BusinessSummaries {
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries/$count', ...options }); }
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries/$count', ...options });
+    }
     
-    public static get api() { return Api; }
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Counterparties {
-    public static postApiV1Counterparties<ThrowOnError extends boolean = false>(options?: Options<PostApiV1CounterpartiesData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1CounterpartiesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/counterparties',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1CounterpartiesByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/counterparties/{id}', ...options }); }
-    
-    public static patchApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1CounterpartiesByIdData, ThrowOnError>) { return (options.client ?? client).patch<PatchApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/counterparties/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataCounterpartiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static postApiV1Counterparties<ThrowOnError extends boolean = false>(options?: Options<PostApiV1CounterpartiesData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1CounterpartiesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/counterparties',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1CounterpartiesByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/counterparties/{id}', ...options });
+    }
+    
+    public static patchApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1CounterpartiesByIdData, ThrowOnError>) {
+        return (options.client ?? client).patch<PatchApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/counterparties/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataCounterpartiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class DataBoxCredentials {
-    public static putApiV1DataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<PutApiV1DataBoxCredentialsData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1DataBoxCredentialsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/data-box-credentials',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1DataBoxCredentialsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1DataBoxCredentialsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1DataBoxCredentialsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/data-box-credentials/{id}', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static putApiV1DataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<PutApiV1DataBoxCredentialsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1DataBoxCredentialsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/data-box-credentials',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1DataBoxCredentialsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1DataBoxCredentialsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1DataBoxCredentialsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/data-box-credentials/{id}', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class DocumentTypes {
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataDocumentTypesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes/$count', ...options }); }
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataDocumentTypesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes/$count', ...options });
+    }
     
-    public static get api() { return Api; }
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Invitations {
-    public static postApiV1Invitations<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvitationsData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1InvitationsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invitations',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static postApiV1InvitationsByIdAccept<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdAcceptData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1InvitationsByIdAcceptResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invitations/{id}/accept',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1InvitationsByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdRejectData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1InvitationsByIdRejectResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}/reject', ...options }); }
-    
-    public static deleteApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvitationsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1InvitationsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}', ...options }); }
-    
-    public static patchApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvitationsByIdData, ThrowOnError>) { return (options.client ?? client).patch<PatchApiV1InvitationsByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invitations/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvitationsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static postApiV1Invitations<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvitationsData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1InvitationsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invitations',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static postApiV1InvitationsByIdAccept<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdAcceptData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1InvitationsByIdAcceptResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invitations/{id}/accept',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1InvitationsByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdRejectData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1InvitationsByIdRejectResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}/reject', ...options });
+    }
+    
+    public static deleteApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvitationsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1InvitationsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}', ...options });
+    }
+    
+    public static patchApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvitationsByIdData, ThrowOnError>) {
+        return (options.client ?? client).patch<PatchApiV1InvitationsByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invitations/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvitationsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Invoices {
-    public static postApiV1Invoices<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvoicesData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1InvoicesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoices',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvoicesByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1InvoicesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}', ...options }); }
-    
-    public static patchApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvoicesByIdData, ThrowOnError>) { return (options.client ?? client).patch<PatchApiV1InvoicesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoices/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static getApiV1InvoicesByIdPreview<ThrowOnError extends boolean = false>(options: Options<GetApiV1InvoicesByIdPreviewData, ThrowOnError>) { return (options.client ?? client).get<GetApiV1InvoicesByIdPreviewResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/preview', ...options }); }
-    
-    public static postApiV1InvoicesByIdSend<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSendData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1InvoicesByIdSendResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoices/{id}/send',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1InvoicesByIdSnapshot<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSnapshotData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1InvoicesByIdSnapshotResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/snapshot', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoicesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static postApiV1Invoices<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvoicesData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1InvoicesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoices',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvoicesByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1InvoicesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}', ...options });
+    }
+    
+    public static patchApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvoicesByIdData, ThrowOnError>) {
+        return (options.client ?? client).patch<PatchApiV1InvoicesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoices/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static getApiV1InvoicesByIdPreview<ThrowOnError extends boolean = false>(options: Options<GetApiV1InvoicesByIdPreviewData, ThrowOnError>) {
+        return (options.client ?? client).get<GetApiV1InvoicesByIdPreviewResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/preview', ...options });
+    }
+    
+    public static postApiV1InvoicesByIdSend<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSendData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1InvoicesByIdSendResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoices/{id}/send',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1InvoicesByIdSnapshot<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSnapshotData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1InvoicesByIdSnapshotResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/snapshot', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoicesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class InvoiceSettings {
-    public static putApiV1InvoiceSettings<ThrowOnError extends boolean = false>(options?: Options<PutApiV1InvoiceSettingsData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1InvoiceSettingsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoice-settings',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static putApiV1InvoiceSettings<ThrowOnError extends boolean = false>(options?: Options<PutApiV1InvoiceSettingsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1InvoiceSettingsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoice-settings',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Licenses {
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataLicensesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses/$count', ...options }); }
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataLicensesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses/$count', ...options });
+    }
     
-    public static get api() { return Api; }
+    public static get api() {
+        return Api;
+    }
 }
 
 export class PersonalDocuments {
-    public static getApiV1PersonalDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1PersonalDocumentsByIdRawData, ThrowOnError>) { return (options.client ?? client).get<GetApiV1PersonalDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}/raw', ...options }); }
-    
-    public static postApiV1PersonalDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1PersonalDocumentsData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1PersonalDocumentsResponses, unknown, ThrowOnError>({
-        ...formDataBodySerializer,
-        url: '/api/v1/personal-documents',
-        ...options,
-        headers: {
-            'Content-Type': null,
-            ...options?.headers
-        }
-    }); }
-    
-    public static postApiV1PersonalDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1PersonalDocumentsByIdMoveToBusinessData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
-        url: '/api/v1/personal-documents/{id}/move-to-business',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static deleteApiV1PersonalDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1PersonalDocumentsByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1PersonalDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}', ...options }); }
-    
-    public static getApiV1PersonalDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1PersonalDocumentsSummaryData, ThrowOnError>) { return (options?.client ?? client).get<GetApiV1PersonalDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/summary', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static getApiV1PersonalDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1PersonalDocumentsByIdRawData, ThrowOnError>) {
+        return (options.client ?? client).get<GetApiV1PersonalDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}/raw', ...options });
+    }
+    
+    public static postApiV1PersonalDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1PersonalDocumentsData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1PersonalDocumentsResponses, unknown, ThrowOnError>({
+            ...formDataBodySerializer,
+            url: '/api/v1/personal-documents',
+            ...options,
+            headers: {
+                'Content-Type': null,
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static postApiV1PersonalDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1PersonalDocumentsByIdMoveToBusinessData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
+            url: '/api/v1/personal-documents/{id}/move-to-business',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1PersonalDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1PersonalDocumentsByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1PersonalDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}', ...options });
+    }
+    
+    public static getApiV1PersonalDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1PersonalDocumentsSummaryData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiV1PersonalDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/summary', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class RecurringTasks {
-    public static postApiV1RecurringTasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1RecurringTasksData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1RecurringTasksResponses, unknown, ThrowOnError>({
-        url: '/api/v1/recurring-tasks',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1RecurringTasksByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/recurring-tasks/{id}', ...options }); }
-    
-    public static patchApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1RecurringTasksByIdData, ThrowOnError>) { return (options.client ?? client).patch<PatchApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/recurring-tasks/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataRecurringTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks/$count', ...options }); }
-    
-    public static get api() { return Api; }
+    public static postApiV1RecurringTasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1RecurringTasksData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1RecurringTasksResponses, unknown, ThrowOnError>({
+            url: '/api/v1/recurring-tasks',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1RecurringTasksByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/recurring-tasks/{id}', ...options });
+    }
+    
+    public static patchApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1RecurringTasksByIdData, ThrowOnError>) {
+        return (options.client ?? client).patch<PatchApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/recurring-tasks/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataRecurringTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks/$count', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Tasks {
-    public static postApiV1Tasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1TasksData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1TasksResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static putApiV1TasksById<ThrowOnError extends boolean = false>(options: Options<PutApiV1TasksByIdData, ThrowOnError>) { return (options.client ?? client).put<PutApiV1TasksByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1TasksByIdSubmit<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdSubmitData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1TasksByIdSubmitResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks/{id}/submit',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1TasksByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdApproveData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1TasksByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/approve', ...options }); }
-    
-    public static postApiV1TasksByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdRejectData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1TasksByIdRejectResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks/{id}/reject',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static getApiV1TasksByIdComments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdCommentsData, ThrowOnError>) { return (options.client ?? client).get<GetApiV1TasksByIdCommentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/comments', ...options }); }
-    
-    public static getApiV1TasksByIdDocuments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdDocumentsData, ThrowOnError>) { return (options.client ?? client).get<GetApiV1TasksByIdDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/documents', ...options }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/$count', ...options }); }
-    
-    public static key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKey2Data, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/{key}', ...options }); }
-    
-    public static get api() { return Api; }
+    public static postApiV1Tasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1TasksData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1TasksResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static putApiV1TasksById<ThrowOnError extends boolean = false>(options: Options<PutApiV1TasksByIdData, ThrowOnError>) {
+        return (options.client ?? client).put<PutApiV1TasksByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1TasksByIdSubmit<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdSubmitData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1TasksByIdSubmitResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks/{id}/submit',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1TasksByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdApproveData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1TasksByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/approve', ...options });
+    }
+    
+    public static postApiV1TasksByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdRejectData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1TasksByIdRejectResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks/{id}/reject',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static getApiV1TasksByIdComments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdCommentsData, ThrowOnError>) {
+        return (options.client ?? client).get<GetApiV1TasksByIdCommentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/comments', ...options });
+    }
+    
+    public static getApiV1TasksByIdDocuments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdDocumentsData, ThrowOnError>) {
+        return (options.client ?? client).get<GetApiV1TasksByIdDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/documents', ...options });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/$count', ...options });
+    }
+    
+    public static key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKey2Data, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/{key}', ...options });
+    }
+    
+    public static get api() {
+        return Api;
+    }
 }
 
 export class Odata {
-    public static accountingCompanies<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompaniesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies', ...options }); }
+    public static accountingCompanies<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompaniesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies', ...options });
+    }
     
-    public static accountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options }); }
+    public static accountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options });
+    }
     
-    public static bankAccounts<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBankAccountsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts', ...options }); }
+    public static bankAccounts<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBankAccountsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts', ...options });
+    }
     
-    public static businessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options }); }
+    public static businessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options });
+    }
     
-    public static businessDocumentActivities<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities', ...options }); }
+    public static businessDocumentActivities<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities', ...options });
+    }
     
-    public static businessDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments', ...options }); }
+    public static businessDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments', ...options });
+    }
     
     /**
      * @deprecated
      */
-    public static businessDocumentsSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options }); }
+    public static businessDocumentsSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options });
+    }
     
-    public static businesses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses', ...options }); }
+    public static businesses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses', ...options });
+    }
     
-    public static businessesKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKeyData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses({key})', ...options }); }
+    public static businessesKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKeyData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessesKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses({key})', ...options });
+    }
     
-    public static businessSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries', ...options }); }
+    public static businessSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataBusinessSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries', ...options });
+    }
     
-    public static counterparties<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataCounterpartiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties', ...options }); }
+    public static counterparties<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataCounterpartiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties', ...options });
+    }
     
-    public static dataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataDataBoxCredentialsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials', ...options }); }
+    public static dataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataDataBoxCredentialsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials', ...options });
+    }
     
-    public static documentTypes<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataDocumentTypesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes', ...options }); }
+    public static documentTypes<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataDocumentTypesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes', ...options });
+    }
     
-    public static invitations<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvitationsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations', ...options }); }
+    public static invitations<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvitationsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations', ...options });
+    }
     
-    public static invoices<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoicesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices', ...options }); }
+    public static invoices<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoicesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices', ...options });
+    }
     
-    public static invoiceSettings<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoiceSettingsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings', ...options }); }
+    public static invoiceSettings<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataInvoiceSettingsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings', ...options });
+    }
     
-    public static licenses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataLicensesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses', ...options }); }
+    public static licenses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataLicensesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses', ...options });
+    }
     
-    public static personalDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataPersonalDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments', ...options }); }
+    public static personalDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataPersonalDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments', ...options });
+    }
     
-    public static recurringTasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks', ...options }); }
+    public static recurringTasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks', ...options });
+    }
     
-    public static tasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks', ...options }); }
+    public static tasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks', ...options });
+    }
     
-    public static tasksKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKeyData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks({key})', ...options }); }
+    public static tasksKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKeyData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataTasksKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks({key})', ...options });
+    }
     
-    public static get accountingCompanies2() { return AccountingCompanies; }
+    public static get accountingCompanies2() {
+        return AccountingCompanies;
+    }
     
     static accountingCompanyMemberships2 = AccountingCompanyMemberships;
     
@@ -512,101 +734,129 @@ export class Odata {
 }
 
 export class MapIdentityApi {
-    public static get api() { return Api; }
+    public static get api() {
+        return Api;
+    }
 }
 
 export class User {
-    public static postApiV1UserRegister<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRegisterData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserRegisterResponses, PostApiV1UserRegisterErrors, ThrowOnError>({
-        url: '/api/v1/user/register',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1UserLogin<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserLoginData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserLoginResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/login',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1UserRefresh<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRefreshData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserRefreshResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/refresh',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static confirmEmail<ThrowOnError extends boolean = false>(options: Options<MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, ThrowOnError>) { return (options.client ?? client).get<MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/v1/user/confirmEmail', ...options }); }
-    
-    public static postApiV1UserResendConfirmationEmail<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResendConfirmationEmailData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserResendConfirmationEmailResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/resendConfirmationEmail',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1UserForgotPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserForgotPasswordData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserForgotPasswordResponses, PostApiV1UserForgotPasswordErrors, ThrowOnError>({
-        url: '/api/v1/user/forgotPassword',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1UserResetPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResetPasswordData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserResetPasswordResponses, PostApiV1UserResetPasswordErrors, ThrowOnError>({
-        url: '/api/v1/user/resetPassword',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1UserManage2Fa<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManage2FaData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserManage2FaResponses, PostApiV1UserManage2FaErrors, ThrowOnError>({
-        url: '/api/v1/user/manage/2fa',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static getApiV1UserManageInfo<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserManageInfoData, ThrowOnError>) { return (options?.client ?? client).get<GetApiV1UserManageInfoResponses, GetApiV1UserManageInfoErrors, ThrowOnError>({ url: '/api/v1/user/manage/info', ...options }); }
-    
-    public static postApiV1UserManageInfo<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManageInfoData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1UserManageInfoResponses, PostApiV1UserManageInfoErrors, ThrowOnError>({
-        url: '/api/v1/user/manage/info',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public static postApiV1UserLogout<ThrowOnError extends boolean = false>(options?: Options<PostApiV1UserLogoutData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1UserLogoutResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/logout',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public static postApiV1UserRegister<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRegisterData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserRegisterResponses, PostApiV1UserRegisterErrors, ThrowOnError>({
+            url: '/api/v1/user/register',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1UserLogin<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserLoginData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserLoginResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/login',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1UserRefresh<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRefreshData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserRefreshResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/refresh',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static confirmEmail<ThrowOnError extends boolean = false>(options: Options<MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, ThrowOnError>) {
+        return (options.client ?? client).get<MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/v1/user/confirmEmail', ...options });
+    }
+    
+    public static postApiV1UserResendConfirmationEmail<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResendConfirmationEmailData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserResendConfirmationEmailResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/resendConfirmationEmail',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1UserForgotPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserForgotPasswordData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserForgotPasswordResponses, PostApiV1UserForgotPasswordErrors, ThrowOnError>({
+            url: '/api/v1/user/forgotPassword',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1UserResetPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResetPasswordData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserResetPasswordResponses, PostApiV1UserResetPasswordErrors, ThrowOnError>({
+            url: '/api/v1/user/resetPassword',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1UserManage2Fa<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManage2FaData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserManage2FaResponses, PostApiV1UserManage2FaErrors, ThrowOnError>({
+            url: '/api/v1/user/manage/2fa',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static getApiV1UserManageInfo<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserManageInfoData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiV1UserManageInfoResponses, GetApiV1UserManageInfoErrors, ThrowOnError>({ url: '/api/v1/user/manage/info', ...options });
+    }
+    
+    public static postApiV1UserManageInfo<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManageInfoData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1UserManageInfoResponses, PostApiV1UserManageInfoErrors, ThrowOnError>({
+            url: '/api/v1/user/manage/info',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static postApiV1UserLogout<ThrowOnError extends boolean = false>(options?: Options<PostApiV1UserLogoutData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1UserLogoutResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/logout',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
     /**
      * @deprecated
      */
-    public static getApiV1UserDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserDocumentsSummaryData, ThrowOnError>) { return (options?.client ?? client).get<GetApiV1UserDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/user/documents-summary', ...options }); }
+    public static getApiV1UserDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserDocumentsSummaryData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiV1UserDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/user/documents-summary', ...options });
+    }
     
-    public static deleteApiV1User<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1UserData, ThrowOnError>) { return (options?.client ?? client).delete<DeleteApiV1UserResponses, unknown, ThrowOnError>({ url: '/api/v1/user', ...options }); }
+    public static deleteApiV1User<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1UserData, ThrowOnError>) {
+        return (options?.client ?? client).delete<DeleteApiV1UserResponses, unknown, ThrowOnError>({ url: '/api/v1/user', ...options });
+    }
     
     static mapIdentityApi = MapIdentityApi;
 }
@@ -622,125 +872,175 @@ export class Api {
 }
 
 export class AccountingCompanies {
-    public static postApiV1AccountingCompanies<ThrowOnError extends boolean = false>(options?: Options<PostApiV1AccountingCompaniesData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1AccountingCompaniesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/accounting-companies',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static deleteApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompaniesByIdData, ThrowOnError>) { return (options.client ?? client).delete<DeleteApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-companies/{id}', ...options }); }
-    
-    public static postApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<PostApiV1AccountingCompaniesByIdData, ThrowOnError>) { return (options.client ?? client).post<PostApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/accounting-companies/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesCountData, ThrowOnError>) { return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies/$count', ...options }); }
+    public static postApiV1AccountingCompanies<ThrowOnError extends boolean = false>(options?: Options<PostApiV1AccountingCompaniesData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1AccountingCompaniesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/accounting-companies',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static deleteApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompaniesByIdData, ThrowOnError>) {
+        return (options.client ?? client).delete<DeleteApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-companies/{id}', ...options });
+    }
+    
+    public static postApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<PostApiV1AccountingCompaniesByIdData, ThrowOnError>) {
+        return (options.client ?? client).post<PostApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/accounting-companies/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public static count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesCountData, ThrowOnError>) {
+        return (options?.client ?? client).get<ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies/$count', ...options });
+    }
     
     static api = Api;
 }
 
 export class BusinessesMemberships {
-    public static putApiV1BusinessMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessMembershipsData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1BusinessMembershipsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-memberships',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public static putApiV1BusinessMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessMembershipsData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1BusinessMembershipsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-memberships',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
 }
 
 export class Dev {
-    public static getApiDev<ThrowOnError extends boolean = false>(options?: Options<GetApiDevData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevResponses, unknown, ThrowOnError>({ url: '/api/dev', ...options }); }
+    public static getApiDev<ThrowOnError extends boolean = false>(options?: Options<GetApiDevData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevResponses, unknown, ThrowOnError>({ url: '/api/dev', ...options });
+    }
     
-    public static getApiDevReseedDb<ThrowOnError extends boolean = false>(options?: Options<GetApiDevReseedDbData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevReseedDbResponses, unknown, ThrowOnError>({ url: '/api/dev/reseed-db', ...options }); }
+    public static getApiDevReseedDb<ThrowOnError extends boolean = false>(options?: Options<GetApiDevReseedDbData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevReseedDbResponses, unknown, ThrowOnError>({ url: '/api/dev/reseed-db', ...options });
+    }
     
-    public static getApiDevDbReset<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbResetData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevDbResetResponses, unknown, ThrowOnError>({ url: '/api/dev/db-reset', ...options }); }
+    public static getApiDevDbReset<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbResetData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevDbResetResponses, unknown, ThrowOnError>({ url: '/api/dev/db-reset', ...options });
+    }
     
-    public static getApiDevDbReset2<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbReset2Data, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevDbReset2Responses, unknown, ThrowOnError>({ url: '/api/dev/db/reset', ...options }); }
+    public static getApiDevDbReset2<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbReset2Data, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevDbReset2Responses, unknown, ThrowOnError>({ url: '/api/dev/db/reset', ...options });
+    }
     
-    public static getApiDevDbCreate<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbCreateData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevDbCreateResponses, unknown, ThrowOnError>({ url: '/api/dev/db/create', ...options }); }
+    public static getApiDevDbCreate<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbCreateData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevDbCreateResponses, unknown, ThrowOnError>({ url: '/api/dev/db/create', ...options });
+    }
     
-    public static getApiDevDbTouch<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbTouchData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevDbTouchResponses, unknown, ThrowOnError>({ url: '/api/dev/db/touch', ...options }); }
+    public static getApiDevDbTouch<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbTouchData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevDbTouchResponses, unknown, ThrowOnError>({ url: '/api/dev/db/touch', ...options });
+    }
     
-    public static getApiDevSeed<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevSeedResponses, unknown, ThrowOnError>({ url: '/api/dev/seed', ...options }); }
+    public static getApiDevSeed<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevSeedResponses, unknown, ThrowOnError>({ url: '/api/dev/seed', ...options });
+    }
     
-    public static getApiDevSeedAll<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedAllData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevSeedAllResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-all', ...options }); }
+    public static getApiDevSeedAll<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedAllData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevSeedAllResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-all', ...options });
+    }
     
-    public static getApiDevSeedProd<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedProdData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevSeedProdResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-prod', ...options }); }
+    public static getApiDevSeedProd<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedProdData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevSeedProdResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-prod', ...options });
+    }
     
-    public static getApiDevJobProcessRecurringTasks<ThrowOnError extends boolean = false>(options?: Options<GetApiDevJobProcessRecurringTasksData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevJobProcessRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/dev/job/process-recurring-tasks', ...options }); }
+    public static getApiDevJobProcessRecurringTasks<ThrowOnError extends boolean = false>(options?: Options<GetApiDevJobProcessRecurringTasksData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevJobProcessRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/dev/job/process-recurring-tasks', ...options });
+    }
     
-    public static getApiDevNotificationsSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevNotificationsSendTestData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevNotificationsSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/notifications/send-test', ...options }); }
+    public static getApiDevNotificationsSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevNotificationsSendTestData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevNotificationsSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/notifications/send-test', ...options });
+    }
     
-    public static getApiDevConfirmEmail<ThrowOnError extends boolean = false>(options?: Options<GetApiDevConfirmEmailData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/dev/confirm-email', ...options }); }
+    public static getApiDevConfirmEmail<ThrowOnError extends boolean = false>(options?: Options<GetApiDevConfirmEmailData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/dev/confirm-email', ...options });
+    }
     
-    public static getApiDevEmailSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevEmailSendTestData, ThrowOnError>) { return (options?.client ?? client).get<GetApiDevEmailSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/email/send-test', ...options }); }
+    public static getApiDevEmailSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevEmailSendTestData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiDevEmailSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/email/send-test', ...options });
+    }
 }
 
 export class DeviceTokens {
-    public static deleteApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1NotificationsDeviceTokensData, ThrowOnError>) { return (options?.client ?? client).delete<DeleteApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/device-tokens',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public static putApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<PutApiV1NotificationsDeviceTokensData, ThrowOnError>) { return (options?.client ?? client).put<PutApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/device-tokens',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public static deleteApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1NotificationsDeviceTokensData, ThrowOnError>) {
+        return (options?.client ?? client).delete<DeleteApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
+            url: '/api/v1/notifications/device-tokens',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public static putApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<PutApiV1NotificationsDeviceTokensData, ThrowOnError>) {
+        return (options?.client ?? client).put<PutApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
+            url: '/api/v1/notifications/device-tokens',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
 }
 
 export class Feedback {
-    public static postApiV1Feedback<ThrowOnError extends boolean = false>(options?: Options<PostApiV1FeedbackData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1FeedbackResponses, unknown, ThrowOnError>({
-        url: '/api/v1/feedback',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public static postApiV1Feedback<ThrowOnError extends boolean = false>(options?: Options<PostApiV1FeedbackData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1FeedbackResponses, unknown, ThrowOnError>({
+            url: '/api/v1/feedback',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
 }
 
 export class Notifications {
-    public static postApiV1NotificationsTest<ThrowOnError extends boolean = false>(options?: Options<PostApiV1NotificationsTestData, ThrowOnError>) { return (options?.client ?? client).post<PostApiV1NotificationsTestResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/test',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public static postApiV1NotificationsTest<ThrowOnError extends boolean = false>(options?: Options<PostApiV1NotificationsTestData, ThrowOnError>) {
+        return (options?.client ?? client).post<PostApiV1NotificationsTestResponses, unknown, ThrowOnError>({
+            url: '/api/v1/notifications/test',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
 }
 
 export class Root {
-    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/', ...options }); }
+    public static get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetResponses, unknown, ThrowOnError>({ url: '/', ...options });
+    }
 }
 
 export class Users {
-    public static getApiV1UsersMe<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UsersMeData, ThrowOnError>) { return (options?.client ?? client).get<GetApiV1UsersMeResponses, unknown, ThrowOnError>({ url: '/api/v1/users/me', ...options }); }
-    
-    public static patchApiV1UsersById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1UsersByIdData, ThrowOnError>) { return (options.client ?? client).patch<PatchApiV1UsersByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/users/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public static getApiV1UsersMe<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UsersMeData, ThrowOnError>) {
+        return (options?.client ?? client).get<GetApiV1UsersMeResponses, unknown, ThrowOnError>({ url: '/api/v1/users/me', ...options });
+    }
+    
+    public static patchApiV1UsersById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1UsersByIdData, ThrowOnError>) {
+        return (options.client ?? client).patch<PatchApiV1UsersByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/users/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
 }
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts
index 27d3debd2..914b48e0c 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/sdk.gen.ts
@@ -23,137 +23,223 @@ class HeyApiClient {
     
     constructor(args?: {
         client?: Client;
-    }) { this.client = args?.client ?? client; }
+    }) {
+        this.client = args?.client ?? client;
+    }
 }
 
 export class AccountingCompanies extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompaniesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies/$count', ...options });
+    }
 }
 
 export class AccountingCompanyMemberships extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships/$count', ...options });
+    }
 }
 
 export class BankAccounts extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBankAccountsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBankAccountsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts/$count', ...options });
+    }
 }
 
 export class BusinessAccountantAssignments extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments/$count', ...options });
+    }
 }
 
 export class BusinessDocumentActivities extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities/$count', ...options });
+    }
 }
 
 export class BusinessDocuments extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments/$count', ...options });
+    }
 }
 
 export class BusinessDocumentsSummaries extends HeyApiClient {
     /**
      * @deprecated
      */
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries/$count', ...options });
+    }
 }
 
 export class Businesses extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/$count', ...options });
+    }
     
-    public key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKey2Data, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/{key}', ...options }); }
+    public key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKey2Data, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses/{key}', ...options });
+    }
 }
 
 export class BusinessSummaries extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessSummariesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries/$count', ...options });
+    }
 }
 
 export class Counterparties extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataCounterpartiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataCounterpartiesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties/$count', ...options });
+    }
 }
 
 export class DataBoxCredentials extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDataBoxCredentialsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials/$count', ...options });
+    }
 }
 
 export class DocumentTypes extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDocumentTypesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDocumentTypesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes/$count', ...options });
+    }
 }
 
 export class Invitations extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvitationsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvitationsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations/$count', ...options });
+    }
 }
 
 export class Invoices extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoicesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoicesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices/$count', ...options });
+    }
 }
 
 export class InvoiceSettings extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoiceSettingsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings/$count', ...options });
+    }
 }
 
 export class Licenses extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataLicensesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataLicensesCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses/$count', ...options });
+    }
 }
 
 export class PersonalDocuments extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataPersonalDocumentsCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments/$count', ...options });
+    }
 }
 
 export class RecurringTasks extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataRecurringTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataRecurringTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks/$count', ...options });
+    }
 }
 
 export class Tasks extends HeyApiClient {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksCountData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/$count', ...options }); }
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksCountData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksCountResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/$count', ...options });
+    }
     
-    public key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKey2Data, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/{key}', ...options }); }
+    public key<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKey2Data, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksKey2Responses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks/{key}', ...options });
+    }
 }
 
 export class Odata extends HeyApiClient {
-    public accountingCompanies<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompaniesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies', ...options }); }
+    public accountingCompanies<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompaniesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompaniesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanies', ...options });
+    }
     
-    public accountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options }); }
+    public accountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataAccountingCompanyMembershipsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataAccountingCompanyMembershipsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/AccountingCompanyMemberships', ...options });
+    }
     
-    public bankAccounts<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBankAccountsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts', ...options }); }
+    public bankAccounts<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBankAccountsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBankAccountsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BankAccounts', ...options });
+    }
     
-    public businessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options }); }
+    public businessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessAccountantAssignments', ...options });
+    }
     
-    public businessDocumentActivities<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities', ...options }); }
+    public businessDocumentActivities<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentActivitiesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentActivitiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentActivities', ...options });
+    }
     
-    public businessDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments', ...options }); }
+    public businessDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocuments', ...options });
+    }
     
     /**
      * @deprecated
      */
-    public businessDocumentsSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options }); }
+    public businessDocumentsSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessDocumentsSummariesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessDocumentsSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessDocumentsSummaries', ...options });
+    }
     
-    public businesses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses', ...options }); }
+    public businesses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses', ...options });
+    }
     
-    public businessesKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKeyData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses({key})', ...options }); }
+    public businessesKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessesKeyData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessesKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Businesses({key})', ...options });
+    }
     
-    public businessSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries', ...options }); }
+    public businessSummaries<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataBusinessSummariesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataBusinessSummariesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/BusinessSummaries', ...options });
+    }
     
-    public counterparties<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataCounterpartiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties', ...options }); }
+    public counterparties<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataCounterpartiesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataCounterpartiesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Counterparties', ...options });
+    }
     
-    public dataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDataBoxCredentialsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials', ...options }); }
+    public dataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDataBoxCredentialsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDataBoxCredentialsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DataBoxCredentials', ...options });
+    }
     
-    public documentTypes<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDocumentTypesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes', ...options }); }
+    public documentTypes<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataDocumentTypesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataDocumentTypesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/DocumentTypes', ...options });
+    }
     
-    public invitations<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvitationsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations', ...options }); }
+    public invitations<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvitationsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvitationsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invitations', ...options });
+    }
     
-    public invoices<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoicesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices', ...options }); }
+    public invoices<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoicesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoicesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Invoices', ...options });
+    }
     
-    public invoiceSettings<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoiceSettingsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings', ...options }); }
+    public invoiceSettings<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataInvoiceSettingsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataInvoiceSettingsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/InvoiceSettings', ...options });
+    }
     
-    public licenses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataLicensesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses', ...options }); }
+    public licenses<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataLicensesData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataLicensesResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Licenses', ...options });
+    }
     
-    public personalDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataPersonalDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments', ...options }); }
+    public personalDocuments<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataPersonalDocumentsData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataPersonalDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/PersonalDocuments', ...options });
+    }
     
-    public recurringTasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks', ...options }); }
+    public recurringTasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataRecurringTasksData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/RecurringTasks', ...options });
+    }
     
-    public tasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks', ...options }); }
+    public tasks<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks', ...options });
+    }
     
-    public tasksKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKeyData, ThrowOnError>) { return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks({key})', ...options }); }
+    public tasksKey<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionApiVersionOdataTasksKeyData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<ApiVVersionApiVersionOdataTasksKeyResponses, unknown, ThrowOnError>({ url: '/api/v1/odata/Tasks({key})', ...options });
+    }
     
     accountingCompanies2 = new AccountingCompanies({ client: this.client });
     
@@ -195,7 +281,9 @@ export class Odata extends HeyApiClient {
 }
 
 export class User extends HeyApiClient {
-    public confirmEmail<ThrowOnError extends boolean = false>(options: Options<MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, ThrowOnError>) { return (options.client ?? this.client).get<MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/v1/user/confirmEmail', ...options }); }
+    public confirmEmail<ThrowOnError extends boolean = false>(options: Options<MapIdentityApiApiVVersionApiVersionUserConfirmEmailData, ThrowOnError>) {
+        return (options.client ?? this.client).get<MapIdentityApiApiVVersionApiVersionUserConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/v1/user/confirmEmail', ...options });
+    }
 }
 
 export class VVersionApiVersion extends HeyApiClient {
@@ -225,7 +313,9 @@ class HeyApiRegistry<T> {
         return instance;
     }
     
-    set(value: T, key?: string): void { this.instances.set(key ?? this.defaultKey, value); }
+    set(value: T, key?: string): void {
+        this.instances.set(key ?? this.defaultKey, value);
+    }
 }
 
 export class Sdk extends HeyApiClient {
@@ -234,496 +324,675 @@ export class Sdk extends HeyApiClient {
     constructor(args?: {
         client?: Client;
         key?: string;
-    }) { super(args); Sdk.__registry.set(this, args?.key); }
-    
-    public postApiV1AccountingCompanies<ThrowOnError extends boolean = false>(options?: Options<PostApiV1AccountingCompaniesData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1AccountingCompaniesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/accounting-companies',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    }) {
+        super(args);
+        Sdk.__registry.set(this, args?.key);
+    }
     
-    public deleteApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompaniesByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-companies/{id}', ...options }); }
+    public postApiV1AccountingCompanies<ThrowOnError extends boolean = false>(options?: Options<PostApiV1AccountingCompaniesData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1AccountingCompaniesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/accounting-companies',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<PostApiV1AccountingCompaniesByIdData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/accounting-companies/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public putApiV1AccountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1AccountingCompanyMembershipsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1AccountingCompanyMembershipsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/accounting-company-memberships',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public deleteApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompaniesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-companies/{id}', ...options });
+    }
     
-    public deleteApiV1AccountingCompanyMembershipsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompanyMembershipsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1AccountingCompanyMembershipsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-company-memberships/{id}', ...options }); }
+    public postApiV1AccountingCompaniesById<ThrowOnError extends boolean = false>(options: Options<PostApiV1AccountingCompaniesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1AccountingCompaniesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/accounting-companies/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public putApiV1BankAccounts<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BankAccountsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1BankAccountsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/bank-accounts',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public putApiV1AccountingCompanyMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1AccountingCompanyMembershipsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1AccountingCompanyMembershipsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/accounting-company-memberships',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public deleteApiV1BankAccountsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BankAccountsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1BankAccountsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/bank-accounts/{id}', ...options }); }
+    public deleteApiV1AccountingCompanyMembershipsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1AccountingCompanyMembershipsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1AccountingCompanyMembershipsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/accounting-company-memberships/{id}', ...options });
+    }
     
-    public putApiV1BusinessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessAccountantAssignmentsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1BusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-accountant-assignments',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public putApiV1BankAccounts<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BankAccountsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1BankAccountsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/bank-accounts',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public deleteApiV1BusinessAccountantAssignmentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessAccountantAssignmentsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1BusinessAccountantAssignmentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-accountant-assignments/{id}', ...options }); }
+    public deleteApiV1BankAccountsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BankAccountsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1BankAccountsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/bank-accounts/{id}', ...options });
+    }
     
-    public getApiV1BusinessDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessDocumentsByIdRawData, ThrowOnError>) { return (options.client ?? this.client).get<GetApiV1BusinessDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/raw', ...options }); }
+    public putApiV1BusinessAccountantAssignments<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessAccountantAssignmentsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1BusinessAccountantAssignmentsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-accountant-assignments',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1BusinessDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessDocumentsData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1BusinessDocumentsResponses, unknown, ThrowOnError>({
-        ...formDataBodySerializer,
-        url: '/api/v1/business-documents',
-        ...options,
-        headers: {
-            'Content-Type': null,
-            ...options?.headers
-        }
-    }); }
+    public deleteApiV1BusinessAccountantAssignmentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessAccountantAssignmentsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1BusinessAccountantAssignmentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-accountant-assignments/{id}', ...options });
+    }
     
-    public deleteApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessDocumentsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}', ...options }); }
+    public getApiV1BusinessDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessDocumentsByIdRawData, ThrowOnError>) {
+        return (options.client ?? this.client).get<GetApiV1BusinessDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/raw', ...options });
+    }
     
-    public putApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessDocumentsByIdData, ThrowOnError>) { return (options.client ?? this.client).put<PutApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-documents/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public postApiV1BusinessDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessDocumentsData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1BusinessDocumentsResponses, unknown, ThrowOnError>({
+            ...formDataBodySerializer,
+            url: '/api/v1/business-documents',
+            ...options,
+            headers: {
+                'Content-Type': null,
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1BusinessDocumentsByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdApproveData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/approve', ...options }); }
+    public deleteApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessDocumentsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}', ...options });
+    }
     
-    public postApiV1BusinessDocumentsByIdUnapprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdUnapproveData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdUnapproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/unapprove', ...options }); }
+    public putApiV1BusinessDocumentsById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessDocumentsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).put<PutApiV1BusinessDocumentsByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-documents/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public postApiV1BusinessDocumentsByIdMoveToPersonal<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToPersonalData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options }); }
+    public postApiV1BusinessDocumentsByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdApproveData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/approve', ...options });
+    }
     
-    public postApiV1BusinessDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToBusinessData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-documents/{id}/move-to-business',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public postApiV1BusinessDocumentsByIdUnapprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdUnapproveData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdUnapproveResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/unapprove', ...options });
+    }
     
-    public getApiV1BusinessesByIdDocumentTypesSummary<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessesByIdDocumentTypesSummaryData, ThrowOnError>) { return (options.client ?? this.client).get<GetApiV1BusinessesByIdDocumentTypesSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/document-types-summary', ...options }); }
+    public postApiV1BusinessDocumentsByIdMoveToPersonal<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToPersonalData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdMoveToPersonalResponses, unknown, ThrowOnError>({ url: '/api/v1/business-documents/{id}/move-to-personal', ...options });
+    }
     
-    public postApiV1Businesses<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessesData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1BusinessesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/businesses',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public postApiV1BusinessDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessDocumentsByIdMoveToBusinessData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1BusinessDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-documents/{id}/move-to-business',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public deleteApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessesByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1BusinessesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}', ...options }); }
+    public getApiV1BusinessesByIdDocumentTypesSummary<ThrowOnError extends boolean = false>(options: Options<GetApiV1BusinessesByIdDocumentTypesSummaryData, ThrowOnError>) {
+        return (options.client ?? this.client).get<GetApiV1BusinessesByIdDocumentTypesSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/document-types-summary', ...options });
+    }
     
-    public putApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdData, ThrowOnError>) { return (options.client ?? this.client).put<PutApiV1BusinessesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/businesses/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public putApiV1BusinessesByIdContact<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdContactData, ThrowOnError>) { return (options.client ?? this.client).put<PutApiV1BusinessesByIdContactResponses, unknown, ThrowOnError>({
-        url: '/api/v1/businesses/{id}/contact',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public postApiV1Businesses<ThrowOnError extends boolean = false>(options?: Options<PostApiV1BusinessesData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1BusinessesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/businesses',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1BusinessesByIdDisconnect<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessesByIdDisconnectData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1BusinessesByIdDisconnectResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/disconnect', ...options }); }
+    public deleteApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1BusinessesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1BusinessesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}', ...options });
+    }
     
-    public putApiV1BusinessMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessMembershipsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1BusinessMembershipsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/business-memberships',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public postApiV1Counterparties<ThrowOnError extends boolean = false>(options?: Options<PostApiV1CounterpartiesData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1CounterpartiesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/counterparties',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public putApiV1BusinessesById<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).put<PutApiV1BusinessesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/businesses/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public deleteApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1CounterpartiesByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/counterparties/{id}', ...options }); }
+    public putApiV1BusinessesByIdContact<ThrowOnError extends boolean = false>(options: Options<PutApiV1BusinessesByIdContactData, ThrowOnError>) {
+        return (options.client ?? this.client).put<PutApiV1BusinessesByIdContactResponses, unknown, ThrowOnError>({
+            url: '/api/v1/businesses/{id}/contact',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public patchApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1CounterpartiesByIdData, ThrowOnError>) { return (options.client ?? this.client).patch<PatchApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/counterparties/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public putApiV1DataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<PutApiV1DataBoxCredentialsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1DataBoxCredentialsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/data-box-credentials',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public postApiV1BusinessesByIdDisconnect<ThrowOnError extends boolean = false>(options: Options<PostApiV1BusinessesByIdDisconnectData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1BusinessesByIdDisconnectResponses, unknown, ThrowOnError>({ url: '/api/v1/businesses/{id}/disconnect', ...options });
+    }
     
-    public deleteApiV1DataBoxCredentialsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1DataBoxCredentialsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1DataBoxCredentialsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/data-box-credentials/{id}', ...options }); }
+    public putApiV1BusinessMemberships<ThrowOnError extends boolean = false>(options?: Options<PutApiV1BusinessMembershipsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1BusinessMembershipsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/business-memberships',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public getApiDev<ThrowOnError extends boolean = false>(options?: Options<GetApiDevData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevResponses, unknown, ThrowOnError>({ url: '/api/dev', ...options }); }
+    public postApiV1Counterparties<ThrowOnError extends boolean = false>(options?: Options<PostApiV1CounterpartiesData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1CounterpartiesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/counterparties',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public getApiDevReseedDb<ThrowOnError extends boolean = false>(options?: Options<GetApiDevReseedDbData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevReseedDbResponses, unknown, ThrowOnError>({ url: '/api/dev/reseed-db', ...options }); }
+    public deleteApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1CounterpartiesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/counterparties/{id}', ...options });
+    }
     
-    public getApiDevDbReset<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbResetData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevDbResetResponses, unknown, ThrowOnError>({ url: '/api/dev/db-reset', ...options }); }
+    public patchApiV1CounterpartiesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1CounterpartiesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).patch<PatchApiV1CounterpartiesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/counterparties/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public getApiDevDbReset2<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbReset2Data, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevDbReset2Responses, unknown, ThrowOnError>({ url: '/api/dev/db/reset', ...options }); }
+    public putApiV1DataBoxCredentials<ThrowOnError extends boolean = false>(options?: Options<PutApiV1DataBoxCredentialsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1DataBoxCredentialsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/data-box-credentials',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public getApiDevDbCreate<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbCreateData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevDbCreateResponses, unknown, ThrowOnError>({ url: '/api/dev/db/create', ...options }); }
+    public deleteApiV1DataBoxCredentialsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1DataBoxCredentialsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1DataBoxCredentialsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/data-box-credentials/{id}', ...options });
+    }
     
-    public getApiDevDbTouch<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbTouchData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevDbTouchResponses, unknown, ThrowOnError>({ url: '/api/dev/db/touch', ...options }); }
+    public getApiDev<ThrowOnError extends boolean = false>(options?: Options<GetApiDevData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevResponses, unknown, ThrowOnError>({ url: '/api/dev', ...options });
+    }
     
-    public getApiDevSeed<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevSeedResponses, unknown, ThrowOnError>({ url: '/api/dev/seed', ...options }); }
+    public getApiDevReseedDb<ThrowOnError extends boolean = false>(options?: Options<GetApiDevReseedDbData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevReseedDbResponses, unknown, ThrowOnError>({ url: '/api/dev/reseed-db', ...options });
+    }
     
-    public getApiDevSeedAll<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedAllData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevSeedAllResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-all', ...options }); }
+    public getApiDevDbReset<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbResetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevDbResetResponses, unknown, ThrowOnError>({ url: '/api/dev/db-reset', ...options });
+    }
     
-    public getApiDevSeedProd<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedProdData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevSeedProdResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-prod', ...options }); }
+    public getApiDevDbReset2<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbReset2Data, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevDbReset2Responses, unknown, ThrowOnError>({ url: '/api/dev/db/reset', ...options });
+    }
     
-    public getApiDevJobProcessRecurringTasks<ThrowOnError extends boolean = false>(options?: Options<GetApiDevJobProcessRecurringTasksData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevJobProcessRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/dev/job/process-recurring-tasks', ...options }); }
+    public getApiDevDbCreate<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbCreateData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevDbCreateResponses, unknown, ThrowOnError>({ url: '/api/dev/db/create', ...options });
+    }
     
-    public getApiDevNotificationsSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevNotificationsSendTestData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevNotificationsSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/notifications/send-test', ...options }); }
+    public getApiDevDbTouch<ThrowOnError extends boolean = false>(options?: Options<GetApiDevDbTouchData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevDbTouchResponses, unknown, ThrowOnError>({ url: '/api/dev/db/touch', ...options });
+    }
     
-    public getApiDevConfirmEmail<ThrowOnError extends boolean = false>(options?: Options<GetApiDevConfirmEmailData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/dev/confirm-email', ...options }); }
+    public getApiDevSeed<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevSeedResponses, unknown, ThrowOnError>({ url: '/api/dev/seed', ...options });
+    }
     
-    public getApiDevEmailSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevEmailSendTestData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiDevEmailSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/email/send-test', ...options }); }
+    public getApiDevSeedAll<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedAllData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevSeedAllResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-all', ...options });
+    }
     
-    public deleteApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1NotificationsDeviceTokensData, ThrowOnError>) { return (options?.client ?? this.client).delete<DeleteApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/device-tokens',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public putApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<PutApiV1NotificationsDeviceTokensData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/device-tokens',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public postApiV1Feedback<ThrowOnError extends boolean = false>(options?: Options<PostApiV1FeedbackData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1FeedbackResponses, unknown, ThrowOnError>({
-        url: '/api/v1/feedback',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public postApiV1Invitations<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvitationsData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1InvitationsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invitations',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public postApiV1InvitationsByIdAccept<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdAcceptData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1InvitationsByIdAcceptResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invitations/{id}/accept',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public getApiDevSeedProd<ThrowOnError extends boolean = false>(options?: Options<GetApiDevSeedProdData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevSeedProdResponses, unknown, ThrowOnError>({ url: '/api/dev/seed-prod', ...options });
+    }
     
-    public postApiV1InvitationsByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdRejectData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1InvitationsByIdRejectResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}/reject', ...options }); }
+    public getApiDevJobProcessRecurringTasks<ThrowOnError extends boolean = false>(options?: Options<GetApiDevJobProcessRecurringTasksData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevJobProcessRecurringTasksResponses, unknown, ThrowOnError>({ url: '/api/dev/job/process-recurring-tasks', ...options });
+    }
     
-    public deleteApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvitationsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1InvitationsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}', ...options }); }
+    public getApiDevNotificationsSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevNotificationsSendTestData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevNotificationsSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/notifications/send-test', ...options });
+    }
     
-    public patchApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvitationsByIdData, ThrowOnError>) { return (options.client ?? this.client).patch<PatchApiV1InvitationsByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invitations/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1Invoices<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvoicesData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1InvoicesResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoices',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public getApiDevConfirmEmail<ThrowOnError extends boolean = false>(options?: Options<GetApiDevConfirmEmailData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevConfirmEmailResponses, unknown, ThrowOnError>({ url: '/api/dev/confirm-email', ...options });
+    }
     
-    public deleteApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvoicesByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1InvoicesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}', ...options }); }
+    public getApiDevEmailSendTest<ThrowOnError extends boolean = false>(options?: Options<GetApiDevEmailSendTestData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiDevEmailSendTestResponses, unknown, ThrowOnError>({ url: '/api/dev/email/send-test', ...options });
+    }
     
-    public patchApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvoicesByIdData, ThrowOnError>) { return (options.client ?? this.client).patch<PatchApiV1InvoicesByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoices/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public deleteApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1NotificationsDeviceTokensData, ThrowOnError>) {
+        return (options?.client ?? this.client).delete<DeleteApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
+            url: '/api/v1/notifications/device-tokens',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public getApiV1InvoicesByIdPreview<ThrowOnError extends boolean = false>(options: Options<GetApiV1InvoicesByIdPreviewData, ThrowOnError>) { return (options.client ?? this.client).get<GetApiV1InvoicesByIdPreviewResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/preview', ...options }); }
+    public putApiV1NotificationsDeviceTokens<ThrowOnError extends boolean = false>(options?: Options<PutApiV1NotificationsDeviceTokensData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1NotificationsDeviceTokensResponses, unknown, ThrowOnError>({
+            url: '/api/v1/notifications/device-tokens',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1InvoicesByIdSend<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSendData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1InvoicesByIdSendResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoices/{id}/send',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public postApiV1Feedback<ThrowOnError extends boolean = false>(options?: Options<PostApiV1FeedbackData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1FeedbackResponses, unknown, ThrowOnError>({
+            url: '/api/v1/feedback',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1InvoicesByIdSnapshot<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSnapshotData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1InvoicesByIdSnapshotResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/snapshot', ...options }); }
+    public postApiV1Invitations<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvitationsData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1InvitationsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invitations',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public putApiV1InvoiceSettings<ThrowOnError extends boolean = false>(options?: Options<PutApiV1InvoiceSettingsData, ThrowOnError>) { return (options?.client ?? this.client).put<PutApiV1InvoiceSettingsResponses, unknown, ThrowOnError>({
-        url: '/api/v1/invoice-settings',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public postApiV1NotificationsTest<ThrowOnError extends boolean = false>(options?: Options<PostApiV1NotificationsTestData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1NotificationsTestResponses, unknown, ThrowOnError>({
-        url: '/api/v1/notifications/test',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public postApiV1InvitationsByIdAccept<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdAcceptData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1InvitationsByIdAcceptResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invitations/{id}/accept',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public getApiV1PersonalDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1PersonalDocumentsByIdRawData, ThrowOnError>) { return (options.client ?? this.client).get<GetApiV1PersonalDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}/raw', ...options }); }
+    public postApiV1InvitationsByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvitationsByIdRejectData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1InvitationsByIdRejectResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}/reject', ...options });
+    }
     
-    public postApiV1PersonalDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1PersonalDocumentsData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1PersonalDocumentsResponses, unknown, ThrowOnError>({
-        ...formDataBodySerializer,
-        url: '/api/v1/personal-documents',
-        ...options,
-        headers: {
-            'Content-Type': null,
-            ...options?.headers
-        }
-    }); }
-    
-    public postApiV1PersonalDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1PersonalDocumentsByIdMoveToBusinessData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
-        url: '/api/v1/personal-documents/{id}/move-to-business',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public deleteApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvitationsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1InvitationsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invitations/{id}', ...options });
+    }
     
-    public deleteApiV1PersonalDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1PersonalDocumentsByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1PersonalDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}', ...options }); }
+    public patchApiV1InvitationsById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvitationsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).patch<PatchApiV1InvitationsByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invitations/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public getApiV1PersonalDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1PersonalDocumentsSummaryData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiV1PersonalDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/summary', ...options }); }
+    public postApiV1Invoices<ThrowOnError extends boolean = false>(options?: Options<PostApiV1InvoicesData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1InvoicesResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoices',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1RecurringTasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1RecurringTasksData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1RecurringTasksResponses, unknown, ThrowOnError>({
-        url: '/api/v1/recurring-tasks',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public deleteApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1InvoicesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1InvoicesByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}', ...options });
+    }
     
-    public deleteApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1RecurringTasksByIdData, ThrowOnError>) { return (options.client ?? this.client).delete<DeleteApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/recurring-tasks/{id}', ...options }); }
+    public patchApiV1InvoicesById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1InvoicesByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).patch<PatchApiV1InvoicesByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoices/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public patchApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1RecurringTasksByIdData, ThrowOnError>) { return (options.client ?? this.client).patch<PatchApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/recurring-tasks/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public getApiV1InvoicesByIdPreview<ThrowOnError extends boolean = false>(options: Options<GetApiV1InvoicesByIdPreviewData, ThrowOnError>) {
+        return (options.client ?? this.client).get<GetApiV1InvoicesByIdPreviewResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/preview', ...options });
+    }
     
-    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) { return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/', ...options }); }
+    public postApiV1InvoicesByIdSend<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSendData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1InvoicesByIdSendResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoices/{id}/send',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public postApiV1Tasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1TasksData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1TasksResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
-    
-    public putApiV1TasksById<ThrowOnError extends boolean = false>(options: Options<PutApiV1TasksByIdData, ThrowOnError>) { return (options.client ?? this.client).put<PutApiV1TasksByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1TasksByIdSubmit<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdSubmitData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1TasksByIdSubmitResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks/{id}/submit',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public postApiV1InvoicesByIdSnapshot<ThrowOnError extends boolean = false>(options: Options<PostApiV1InvoicesByIdSnapshotData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1InvoicesByIdSnapshotResponses, unknown, ThrowOnError>({ url: '/api/v1/invoices/{id}/snapshot', ...options });
+    }
     
-    public postApiV1TasksByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdApproveData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1TasksByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/approve', ...options }); }
+    public putApiV1InvoiceSettings<ThrowOnError extends boolean = false>(options?: Options<PutApiV1InvoiceSettingsData, ThrowOnError>) {
+        return (options?.client ?? this.client).put<PutApiV1InvoiceSettingsResponses, unknown, ThrowOnError>({
+            url: '/api/v1/invoice-settings',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1TasksByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdRejectData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1TasksByIdRejectResponses, unknown, ThrowOnError>({
-        url: '/api/v1/tasks/{id}/reject',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public postApiV1NotificationsTest<ThrowOnError extends boolean = false>(options?: Options<PostApiV1NotificationsTestData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1NotificationsTestResponses, unknown, ThrowOnError>({
+            url: '/api/v1/notifications/test',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
-    public getApiV1TasksByIdComments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdCommentsData, ThrowOnError>) { return (options.client ?? this.client).get<GetApiV1TasksByIdCommentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/comments', ...options }); }
+    public getApiV1PersonalDocumentsByIdRaw<ThrowOnError extends boolean = false>(options: Options<GetApiV1PersonalDocumentsByIdRawData, ThrowOnError>) {
+        return (options.client ?? this.client).get<GetApiV1PersonalDocumentsByIdRawResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}/raw', ...options });
+    }
     
-    public getApiV1TasksByIdDocuments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdDocumentsData, ThrowOnError>) { return (options.client ?? this.client).get<GetApiV1TasksByIdDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/documents', ...options }); }
+    public postApiV1PersonalDocuments<ThrowOnError extends boolean = false>(options?: Options<PostApiV1PersonalDocumentsData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1PersonalDocumentsResponses, unknown, ThrowOnError>({
+            ...formDataBodySerializer,
+            url: '/api/v1/personal-documents',
+            ...options,
+            headers: {
+                'Content-Type': null,
+                ...options?.headers
+            }
+        });
+    }
     
-    public postApiV1UserRegister<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRegisterData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserRegisterResponses, PostApiV1UserRegisterErrors, ThrowOnError>({
-        url: '/api/v1/user/register',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserLogin<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserLoginData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserLoginResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/login',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserRefresh<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRefreshData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserRefreshResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/refresh',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserResendConfirmationEmail<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResendConfirmationEmailData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserResendConfirmationEmailResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/resendConfirmationEmail',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserForgotPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserForgotPasswordData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserForgotPasswordResponses, PostApiV1UserForgotPasswordErrors, ThrowOnError>({
-        url: '/api/v1/user/forgotPassword',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserResetPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResetPasswordData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserResetPasswordResponses, PostApiV1UserResetPasswordErrors, ThrowOnError>({
-        url: '/api/v1/user/resetPassword',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserManage2Fa<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManage2FaData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserManage2FaResponses, PostApiV1UserManage2FaErrors, ThrowOnError>({
-        url: '/api/v1/user/manage/2fa',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
+    public postApiV1PersonalDocumentsByIdMoveToBusiness<ThrowOnError extends boolean = false>(options: Options<PostApiV1PersonalDocumentsByIdMoveToBusinessData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1PersonalDocumentsByIdMoveToBusinessResponses, unknown, ThrowOnError>({
+            url: '/api/v1/personal-documents/{id}/move-to-business',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
-    public getApiV1UserManageInfo<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserManageInfoData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiV1UserManageInfoResponses, GetApiV1UserManageInfoErrors, ThrowOnError>({ url: '/api/v1/user/manage/info', ...options }); }
+    public deleteApiV1PersonalDocumentsById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1PersonalDocumentsByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1PersonalDocumentsByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/{id}', ...options });
+    }
     
-    public postApiV1UserManageInfo<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManageInfoData, ThrowOnError>) { return (options.client ?? this.client).post<PostApiV1UserManageInfoResponses, PostApiV1UserManageInfoErrors, ThrowOnError>({
-        url: '/api/v1/user/manage/info',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json',
-            ...options.headers
-        }
-    }); }
-    
-    public postApiV1UserLogout<ThrowOnError extends boolean = false>(options?: Options<PostApiV1UserLogoutData, ThrowOnError>) { return (options?.client ?? this.client).post<PostApiV1UserLogoutResponses, unknown, ThrowOnError>({
-        url: '/api/v1/user/logout',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options?.headers
-        }
-    }); }
+    public getApiV1PersonalDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1PersonalDocumentsSummaryData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiV1PersonalDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/personal-documents/summary', ...options });
+    }
+    
+    public postApiV1RecurringTasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1RecurringTasksData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1RecurringTasksResponses, unknown, ThrowOnError>({
+            url: '/api/v1/recurring-tasks',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public deleteApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<DeleteApiV1RecurringTasksByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).delete<DeleteApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({ url: '/api/v1/recurring-tasks/{id}', ...options });
+    }
+    
+    public patchApiV1RecurringTasksById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1RecurringTasksByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).patch<PatchApiV1RecurringTasksByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/recurring-tasks/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public get<ThrowOnError extends boolean = false>(options?: Options<GetData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetResponses, unknown, ThrowOnError>({ url: '/', ...options });
+    }
+    
+    public postApiV1Tasks<ThrowOnError extends boolean = false>(options?: Options<PostApiV1TasksData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1TasksResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
+    
+    public putApiV1TasksById<ThrowOnError extends boolean = false>(options: Options<PutApiV1TasksByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).put<PutApiV1TasksByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1TasksByIdSubmit<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdSubmitData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1TasksByIdSubmitResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks/{id}/submit',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1TasksByIdApprove<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdApproveData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1TasksByIdApproveResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/approve', ...options });
+    }
+    
+    public postApiV1TasksByIdReject<ThrowOnError extends boolean = false>(options: Options<PostApiV1TasksByIdRejectData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1TasksByIdRejectResponses, unknown, ThrowOnError>({
+            url: '/api/v1/tasks/{id}/reject',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
+    
+    public getApiV1TasksByIdComments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdCommentsData, ThrowOnError>) {
+        return (options.client ?? this.client).get<GetApiV1TasksByIdCommentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/comments', ...options });
+    }
+    
+    public getApiV1TasksByIdDocuments<ThrowOnError extends boolean = false>(options: Options<GetApiV1TasksByIdDocumentsData, ThrowOnError>) {
+        return (options.client ?? this.client).get<GetApiV1TasksByIdDocumentsResponses, unknown, ThrowOnError>({ url: '/api/v1/tasks/{id}/documents', ...options });
+    }
+    
+    public postApiV1UserRegister<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRegisterData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserRegisterResponses, PostApiV1UserRegisterErrors, ThrowOnError>({
+            url: '/api/v1/user/register',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserLogin<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserLoginData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserLoginResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/login',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserRefresh<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserRefreshData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserRefreshResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/refresh',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserResendConfirmationEmail<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResendConfirmationEmailData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserResendConfirmationEmailResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/resendConfirmationEmail',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserForgotPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserForgotPasswordData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserForgotPasswordResponses, PostApiV1UserForgotPasswordErrors, ThrowOnError>({
+            url: '/api/v1/user/forgotPassword',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserResetPassword<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserResetPasswordData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserResetPasswordResponses, PostApiV1UserResetPasswordErrors, ThrowOnError>({
+            url: '/api/v1/user/resetPassword',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserManage2Fa<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManage2FaData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserManage2FaResponses, PostApiV1UserManage2FaErrors, ThrowOnError>({
+            url: '/api/v1/user/manage/2fa',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public getApiV1UserManageInfo<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserManageInfoData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiV1UserManageInfoResponses, GetApiV1UserManageInfoErrors, ThrowOnError>({ url: '/api/v1/user/manage/info', ...options });
+    }
+    
+    public postApiV1UserManageInfo<ThrowOnError extends boolean = false>(options: Options<PostApiV1UserManageInfoData, ThrowOnError>) {
+        return (options.client ?? this.client).post<PostApiV1UserManageInfoResponses, PostApiV1UserManageInfoErrors, ThrowOnError>({
+            url: '/api/v1/user/manage/info',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json',
+                ...options.headers
+            }
+        });
+    }
+    
+    public postApiV1UserLogout<ThrowOnError extends boolean = false>(options?: Options<PostApiV1UserLogoutData, ThrowOnError>) {
+        return (options?.client ?? this.client).post<PostApiV1UserLogoutResponses, unknown, ThrowOnError>({
+            url: '/api/v1/user/logout',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options?.headers
+            }
+        });
+    }
     
     /**
      * @deprecated
      */
-    public getApiV1UserDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserDocumentsSummaryData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiV1UserDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/user/documents-summary', ...options }); }
+    public getApiV1UserDocumentsSummary<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UserDocumentsSummaryData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiV1UserDocumentsSummaryResponses, unknown, ThrowOnError>({ url: '/api/v1/user/documents-summary', ...options });
+    }
     
-    public deleteApiV1User<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1UserData, ThrowOnError>) { return (options?.client ?? this.client).delete<DeleteApiV1UserResponses, unknown, ThrowOnError>({ url: '/api/v1/user', ...options }); }
+    public deleteApiV1User<ThrowOnError extends boolean = false>(options?: Options<DeleteApiV1UserData, ThrowOnError>) {
+        return (options?.client ?? this.client).delete<DeleteApiV1UserResponses, unknown, ThrowOnError>({ url: '/api/v1/user', ...options });
+    }
     
-    public getApiV1UsersMe<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UsersMeData, ThrowOnError>) { return (options?.client ?? this.client).get<GetApiV1UsersMeResponses, unknown, ThrowOnError>({ url: '/api/v1/users/me', ...options }); }
+    public getApiV1UsersMe<ThrowOnError extends boolean = false>(options?: Options<GetApiV1UsersMeData, ThrowOnError>) {
+        return (options?.client ?? this.client).get<GetApiV1UsersMeResponses, unknown, ThrowOnError>({ url: '/api/v1/users/me', ...options });
+    }
     
-    public patchApiV1UsersById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1UsersByIdData, ThrowOnError>) { return (options.client ?? this.client).patch<PatchApiV1UsersByIdResponses, unknown, ThrowOnError>({
-        url: '/api/v1/users/{id}',
-        ...options,
-        headers: {
-            'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
-            ...options.headers
-        }
-    }); }
+    public patchApiV1UsersById<ThrowOnError extends boolean = false>(options: Options<PatchApiV1UsersByIdData, ThrowOnError>) {
+        return (options.client ?? this.client).patch<PatchApiV1UsersByIdResponses, unknown, ThrowOnError>({
+            url: '/api/v1/users/{id}',
+            ...options,
+            headers: {
+                'Content-Type': 'application/json;odata.metadata=minimal;odata.streaming=true',
+                ...options.headers
+            }
+        });
+    }
     
     api = new Api({ client: this.client });
     
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts
index eee19f81a..56ce2c581 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/sdk.gen.ts
@@ -49,38 +49,47 @@ export const sessionList = <ThrowOnError extends boolean = false>(options?: Opti
 export const sessionCreate = <ThrowOnError extends boolean = false>(parameters?: {
     parentID?: string;
     title?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'parentID' }, { in: 'body', key: 'title' }] }]); return (options?.client ?? client).post<SessionCreateResponses, SessionCreateErrors, ThrowOnError>({
-    url: '/session',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'parentID' }, { in: 'body', key: 'title' }] }]);
+    return (options?.client ?? client).post<SessionCreateResponses, SessionCreateErrors, ThrowOnError>({
+        url: '/session',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Delete a session and all its data
  */
 export const sessionDelete = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).delete<SessionDeleteResponses, unknown, ThrowOnError>({
-    url: '/session/{id}',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).delete<SessionDeleteResponses, unknown, ThrowOnError>({
+        url: '/session/{id}',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Get session
  */
 export const sessionGet = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).get<SessionGetResponses, unknown, ThrowOnError>({
-    url: '/session/{id}',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).get<SessionGetResponses, unknown, ThrowOnError>({
+        url: '/session/{id}',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Update session properties
@@ -88,27 +97,33 @@ export const sessionGet = <ThrowOnError extends boolean = false>(parameters: {
 export const sessionUpdate = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
     title?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { in: 'body', key: 'title' }] }]); return (options?.client ?? client).patch<SessionUpdateResponses, unknown, ThrowOnError>({
-    url: '/session/{id}',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { in: 'body', key: 'title' }] }]);
+    return (options?.client ?? client).patch<SessionUpdateResponses, unknown, ThrowOnError>({
+        url: '/session/{id}',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Get a session's children
  */
 export const sessionChildren = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).get<SessionChildrenResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/children',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).get<SessionChildrenResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/children',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Analyze the app and create an AGENTS.md file
@@ -118,54 +133,66 @@ export const sessionInit = <ThrowOnError extends boolean = false>(parameters: {
     messageID?: string;
     providerID?: string;
     modelID?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'path', key: 'id' },
-            { in: 'body', key: 'messageID' },
-            { in: 'body', key: 'providerID' },
-            { in: 'body', key: 'modelID' }
-        ] }]); return (options?.client ?? client).post<SessionInitResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/init',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'messageID' },
+                { in: 'body', key: 'providerID' },
+                { in: 'body', key: 'modelID' }
+            ] }]);
+    return (options?.client ?? client).post<SessionInitResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/init',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Abort a session
  */
 export const sessionAbort = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).post<SessionAbortResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/abort',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).post<SessionAbortResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/abort',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Unshare the session
  */
 export const sessionUnshare = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).delete<SessionUnshareResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/share',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).delete<SessionUnshareResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/share',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Share a session
  */
 export const sessionShare = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).post<SessionShareResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/share',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).post<SessionShareResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/share',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Summarize the session
@@ -174,31 +201,37 @@ export const sessionSummarize = <ThrowOnError extends boolean = false>(parameter
     id: string;
     providerID?: string;
     modelID?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'path', key: 'id' },
-            { in: 'body', key: 'providerID' },
-            { in: 'body', key: 'modelID' }
-        ] }]); return (options?.client ?? client).post<SessionSummarizeResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/summarize',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'providerID' },
+                { in: 'body', key: 'modelID' }
+            ] }]);
+    return (options?.client ?? client).post<SessionSummarizeResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/summarize',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * List messages for a session
  */
 export const sessionMessages = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).get<SessionMessagesResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/message',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).get<SessionMessagesResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/message',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Create and send a new message to a session
@@ -220,25 +253,28 @@ export const sessionChat = <ThrowOnError extends boolean = false>(parameters: {
     } & FilePartInput) | ({
         type: 'agent';
     } & AgentPartInput)>;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'path', key: 'id' },
-            { in: 'body', key: 'messageID' },
-            { in: 'body', key: 'providerID' },
-            { in: 'body', key: 'modelID' },
-            { in: 'body', key: 'agent' },
-            { in: 'body', key: 'system' },
-            { in: 'body', key: 'tools' },
-            { in: 'body', key: 'parts' }
-        ] }]); return (options?.client ?? client).post<SessionChatResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/message',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'messageID' },
+                { in: 'body', key: 'providerID' },
+                { in: 'body', key: 'modelID' },
+                { in: 'body', key: 'agent' },
+                { in: 'body', key: 'system' },
+                { in: 'body', key: 'tools' },
+                { in: 'body', key: 'parts' }
+            ] }]);
+    return (options?.client ?? client).post<SessionChatResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/message',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Get a message from a session
@@ -246,11 +282,14 @@ export const sessionChat = <ThrowOnError extends boolean = false>(parameters: {
 export const sessionMessage = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
     messageID: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { in: 'path', key: 'messageID' }] }]); return (options?.client ?? client).get<SessionMessageResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/message/{messageID}',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { in: 'path', key: 'messageID' }] }]);
+    return (options?.client ?? client).get<SessionMessageResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/message/{messageID}',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Run a shell command
@@ -259,20 +298,23 @@ export const sessionShell = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
     agent?: string;
     command?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'path', key: 'id' },
-            { in: 'body', key: 'agent' },
-            { in: 'body', key: 'command' }
-        ] }]); return (options?.client ?? client).post<SessionShellResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/shell',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'agent' },
+                { in: 'body', key: 'command' }
+            ] }]);
+    return (options?.client ?? client).post<SessionShellResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/shell',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Revert a message
@@ -281,31 +323,37 @@ export const sessionRevert = <ThrowOnError extends boolean = false>(parameters:
     id: string;
     messageID?: string;
     partID?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'path', key: 'id' },
-            { in: 'body', key: 'messageID' },
-            { in: 'body', key: 'partID' }
-        ] }]); return (options?.client ?? client).post<SessionRevertResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/revert',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'body', key: 'messageID' },
+                { in: 'body', key: 'partID' }
+            ] }]);
+    return (options?.client ?? client).post<SessionRevertResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/revert',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Restore all reverted messages
  */
 export const sessionUnrevert = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]); return (options?.client ?? client).post<SessionUnrevertResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/unrevert',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }] }]);
+    return (options?.client ?? client).post<SessionUnrevertResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/unrevert',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Respond to a permission request
@@ -314,20 +362,23 @@ export const postSessionByIdPermissionsByPermissionId = <ThrowOnError extends bo
     id: string;
     permissionID: string;
     response?: 'once' | 'always' | 'reject';
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'path', key: 'id' },
-            { in: 'path', key: 'permissionID' },
-            { in: 'body', key: 'response' }
-        ] }]); return (options?.client ?? client).post<PostSessionByIdPermissionsByPermissionIdResponses, unknown, ThrowOnError>({
-    url: '/session/{id}/permissions/{permissionID}',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'path', key: 'id' },
+                { in: 'path', key: 'permissionID' },
+                { in: 'body', key: 'response' }
+            ] }]);
+    return (options?.client ?? client).post<PostSessionByIdPermissionsByPermissionIdResponses, unknown, ThrowOnError>({
+        url: '/session/{id}/permissions/{permissionID}',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * List all providers
@@ -339,44 +390,56 @@ export const configProviders = <ThrowOnError extends boolean = false>(options?:
  */
 export const findText = <ThrowOnError extends boolean = false>(parameters: {
     pattern: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'pattern' }] }]); return (options?.client ?? client).get<FindTextResponses, unknown, ThrowOnError>({
-    url: '/find',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'pattern' }] }]);
+    return (options?.client ?? client).get<FindTextResponses, unknown, ThrowOnError>({
+        url: '/find',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Find files
  */
 export const findFiles = <ThrowOnError extends boolean = false>(parameters: {
     query: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'query' }] }]); return (options?.client ?? client).get<FindFilesResponses, unknown, ThrowOnError>({
-    url: '/find/file',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'query' }] }]);
+    return (options?.client ?? client).get<FindFilesResponses, unknown, ThrowOnError>({
+        url: '/find/file',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Find workspace symbols
  */
 export const findSymbols = <ThrowOnError extends boolean = false>(parameters: {
     query: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'query' }] }]); return (options?.client ?? client).get<FindSymbolsResponses, unknown, ThrowOnError>({
-    url: '/find/symbol',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'query' }] }]);
+    return (options?.client ?? client).get<FindSymbolsResponses, unknown, ThrowOnError>({
+        url: '/find/symbol',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Read a file
  */
 export const fileRead = <ThrowOnError extends boolean = false>(parameters: {
     path: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'path' }] }]); return (options?.client ?? client).get<FileReadResponses, unknown, ThrowOnError>({
-    url: '/file',
-    ...options,
-    ...params
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'query', key: 'path' }] }]);
+    return (options?.client ?? client).get<FileReadResponses, unknown, ThrowOnError>({
+        url: '/file',
+        ...options,
+        ...params
+    });
+};
 
 /**
  * Get file status
@@ -393,21 +456,24 @@ export const appLog = <ThrowOnError extends boolean = false>(parameters?: {
     extra?: {
         [key: string]: unknown;
     };
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'body', key: 'service' },
-            { in: 'body', key: 'level' },
-            { in: 'body', key: 'message' },
-            { in: 'body', key: 'extra' }
-        ] }]); return (options?.client ?? client).post<AppLogResponses, unknown, ThrowOnError>({
-    url: '/log',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'body', key: 'service' },
+                { in: 'body', key: 'level' },
+                { in: 'body', key: 'message' },
+                { in: 'body', key: 'extra' }
+            ] }]);
+    return (options?.client ?? client).post<AppLogResponses, unknown, ThrowOnError>({
+        url: '/log',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * List all agents
@@ -419,16 +485,19 @@ export const appAgents = <ThrowOnError extends boolean = false>(options?: Option
  */
 export const tuiAppendPrompt = <ThrowOnError extends boolean = false>(parameters?: {
     text?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'text' }] }]); return (options?.client ?? client).post<TuiAppendPromptResponses, unknown, ThrowOnError>({
-    url: '/tui/append-prompt',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'text' }] }]);
+    return (options?.client ?? client).post<TuiAppendPromptResponses, unknown, ThrowOnError>({
+        url: '/tui/append-prompt',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Open the help dialog
@@ -465,16 +534,19 @@ export const tuiClearPrompt = <ThrowOnError extends boolean = false>(options?: O
  */
 export const tuiExecuteCommand = <ThrowOnError extends boolean = false>(parameters?: {
     command?: string;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'command' }] }]); return (options?.client ?? client).post<TuiExecuteCommandResponses, unknown, ThrowOnError>({
-    url: '/tui/execute-command',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'body', key: 'command' }] }]);
+    return (options?.client ?? client).post<TuiExecuteCommandResponses, unknown, ThrowOnError>({
+        url: '/tui/execute-command',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Show a toast notification in the TUI
@@ -483,20 +555,23 @@ export const tuiShowToast = <ThrowOnError extends boolean = false>(parameters?:
     title?: string;
     message?: string;
     variant?: 'info' | 'success' | 'warning' | 'error';
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [
-            { in: 'body', key: 'title' },
-            { in: 'body', key: 'message' },
-            { in: 'body', key: 'variant' }
-        ] }]); return (options?.client ?? client).post<TuiShowToastResponses, unknown, ThrowOnError>({
-    url: '/tui/show-toast',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [
+                { in: 'body', key: 'title' },
+                { in: 'body', key: 'message' },
+                { in: 'body', key: 'variant' }
+            ] }]);
+    return (options?.client ?? client).post<TuiShowToastResponses, unknown, ThrowOnError>({
+        url: '/tui/show-toast',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
 
 /**
  * Set authentication credentials
@@ -504,13 +579,16 @@ export const tuiShowToast = <ThrowOnError extends boolean = false>(parameters?:
 export const authSet = <ThrowOnError extends boolean = false>(parameters: {
     id: string;
     auth?: Auth;
-}, options?: Options<never, ThrowOnError>) => { const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { key: 'auth', map: 'body' }] }]); return (options?.client ?? client).put<AuthSetResponses, AuthSetErrors, ThrowOnError>({
-    url: '/auth/{id}',
-    ...options,
-    ...params,
-    headers: {
-        'Content-Type': 'application/json',
-        ...options?.headers,
-        ...params.headers
-    }
-}); };
+}, options?: Options<never, ThrowOnError>) => {
+    const params = buildClientParams([parameters], [{ args: [{ in: 'path', key: 'id' }, { key: 'auth', map: 'body' }] }]);
+    return (options?.client ?? client).put<AuthSetResponses, AuthSetErrors, ThrowOnError>({
+        url: '/auth/{id}',
+        ...options,
+        ...params,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers,
+            ...params.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/mini/default/zod.gen.ts
index f6a63bdfb..e44daf15b 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/mini/default/zod.gen.ts
@@ -293,7 +293,9 @@ export const zModelWithDictionary = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v4/default/zod.gen.ts
index e34794d23..bc91971e3 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/2.0.x/v4/default/zod.gen.ts
@@ -293,7 +293,9 @@ export const zModelWithDictionary = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/circular/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/circular/zod.gen.ts
index aadb23437..1563aa737 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/circular/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/circular/zod.gen.ts
@@ -3,16 +3,24 @@
 import * as z from 'zod/v4-mini';
 
 export const zFoo = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.lazy((): any => zBar)); },
-    get baz() { return z.optional(z.lazy((): any => zBaz)); }
+    get bar() {
+        return z.optional(z.lazy((): any => zBar));
+    },
+    get baz() {
+        return z.optional(z.lazy((): any => zBaz));
+    }
 });
 
 export const zBaz = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zQux = z.union([
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts
index 72313099e..b6370f67c 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/default/zod.gen.ts
@@ -391,7 +391,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/validators/zod.gen.ts
index 9644b01c7..cfa348c12 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/mini/validators/zod.gen.ts
@@ -7,8 +7,12 @@ export const zBaz = z._default(z.readonly(z.string().check(z.regex(/foo\nbar/)))
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/circular/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/circular/zod.gen.ts
index 0dc77975f..3b9c62d9d 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/circular/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/circular/zod.gen.ts
@@ -3,16 +3,24 @@
 import { z } from 'zod/v4';
 
 export const zFoo = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.lazy((): any => zBar)); },
-    get baz() { return z.optional(z.lazy((): any => zBaz)); }
+    get bar() {
+        return z.optional(z.lazy((): any => zBar));
+    },
+    get baz() {
+        return z.optional(z.lazy((): any => zBaz));
+    }
 });
 
 export const zBaz = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zQux = z.union([
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts
index f2fa36f97..3f328c90d 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/default/zod.gen.ts
@@ -391,7 +391,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/validators/zod.gen.ts
index 6bdc62661..0daf7a0a6 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.0.x/v4/validators/zod.gen.ts
@@ -7,8 +7,12 @@ export const zBaz = z.string().regex(/foo\nbar/).readonly().default('baz');
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts
index 4e4c40e30..7ca3c6f97 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/default/zod.gen.ts
@@ -394,7 +394,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts
index ee92d9cc8..dda5d4694 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts
@@ -3,7 +3,9 @@
 import * as z from 'zod/v4-mini';
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.array(z.lazy((): any => zBar))); }
+    get bar() {
+        return z.optional(z.array(z.lazy((): any => zBar)));
+    }
 });
 
 export const zFoo = z.object({
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts
index d95cd6972..8ecedac9a 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts
index daeeaf964..789eb6d8a 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts
@@ -16,10 +16,14 @@ export const zFoo = z._default(z.union([
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/)).register(z.globalRegistry, {
             description: 'This is foo property.'
         })),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
-            description: 'This is baz property.'
-        })); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
+                description: 'This is baz property.'
+            }));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0)).register(z.globalRegistry, {
             description: 'This is qux property.'
         })), 0)
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts
index ddfe89ba5..a8353e832 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts
@@ -18,8 +18,12 @@ export type QuxZodType = z.infer<typeof zQux>;
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators/zod.gen.ts
index 667648417..304d89bb5 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/mini/validators/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts
index e1b593189..445c9f103 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/default/zod.gen.ts
@@ -394,7 +394,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts
index c46324e4c..7bd218fcb 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts
@@ -3,7 +3,9 @@
 import { z } from 'zod/v4';
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.array(z.lazy((): any => zBar))); }
+    get bar() {
+        return z.optional(z.array(z.lazy((): any => zBar)));
+    }
 });
 
 export const zFoo = z.object({
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts
index 694d2be0f..5781d917f 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts
index 6ddadeae6..c3c88f810 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts
@@ -16,10 +16,14 @@ export const zFoo = z.union([
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/).register(z.globalRegistry, {
             description: 'This is foo property.'
         })),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
-            description: 'This is baz property.'
-        })); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
+                description: 'This is baz property.'
+            }));
+        },
         qux: z.optional(z.int().gt(0).register(z.globalRegistry, {
             description: 'This is qux property.'
         })).default(0)
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts
index ef33309b4..b2d4ca717 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts
@@ -18,8 +18,12 @@ export type QuxZodType = z.infer<typeof zQux>;
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators/zod.gen.ts
index 063713a58..15238b2a7 100644
--- a/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v3/__snapshots__/3.1.x/v4/validators/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/default/zod.gen.ts
index b2d142120..e00616a4b 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/mini/default/zod.gen.ts
@@ -293,7 +293,9 @@ export const zModelWithDictionary = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/default/zod.gen.ts
index f5bab7f05..f2848ba82 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/2.0.x/v4/default/zod.gen.ts
@@ -293,7 +293,9 @@ export const zModelWithDictionary = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/circular/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/circular/zod.gen.ts
index 1e156472c..7cced9697 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/circular/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/circular/zod.gen.ts
@@ -3,16 +3,24 @@
 import * as z from 'zod/mini';
 
 export const zFoo = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.lazy((): any => zBar)); },
-    get baz() { return z.optional(z.lazy((): any => zBaz)); }
+    get bar() {
+        return z.optional(z.lazy((): any => zBar));
+    },
+    get baz() {
+        return z.optional(z.lazy((): any => zBaz));
+    }
 });
 
 export const zBaz = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zQux = z.union([
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts
index e69859e42..9734ab8f1 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/default/zod.gen.ts
@@ -391,7 +391,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/validators/zod.gen.ts
index c71c7449e..7a5c78486 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/mini/validators/zod.gen.ts
@@ -7,8 +7,12 @@ export const zBaz = z._default(z.readonly(z.string().check(z.regex(/foo\nbar/)))
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/circular/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/circular/zod.gen.ts
index 160ab1e1e..8da477654 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/circular/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/circular/zod.gen.ts
@@ -3,16 +3,24 @@
 import { z } from 'zod';
 
 export const zFoo = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.lazy((): any => zBar)); },
-    get baz() { return z.optional(z.lazy((): any => zBaz)); }
+    get bar() {
+        return z.optional(z.lazy((): any => zBar));
+    },
+    get baz() {
+        return z.optional(z.lazy((): any => zBaz));
+    }
 });
 
 export const zBaz = z.object({
-    get quux() { return z.optional(z.lazy((): any => zQuux)); }
+    get quux() {
+        return z.optional(z.lazy((): any => zQuux));
+    }
 });
 
 export const zQux = z.union([
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts
index dba143ae4..925cc7bf2 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/default/zod.gen.ts
@@ -391,7 +391,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/validators/zod.gen.ts
index 3a803fda8..944f96e47 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.0.x/v4/validators/zod.gen.ts
@@ -7,8 +7,12 @@ export const zBaz = z.string().regex(/foo\nbar/).readonly().default('baz');
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts
index 69ab0decd..45ebeaf53 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/default/zod.gen.ts
@@ -394,7 +394,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts
index 3d850cb99..ee8b0c76e 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-circular-ref/zod.gen.ts
@@ -3,7 +3,9 @@
 import * as z from 'zod/mini';
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.array(z.lazy((): any => zBar))); }
+    get bar() {
+        return z.optional(z.array(z.lazy((): any => zBar)));
+    }
 });
 
 export const zFoo = z.object({
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts
index 781fa9b97..9ac32990c 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-dates/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts
index c58e0e748..e263d218e 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-metadata/zod.gen.ts
@@ -16,10 +16,14 @@ export const zFoo = z._default(z.union([
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/)).register(z.globalRegistry, {
             description: 'This is foo property.'
         })),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
-            description: 'This is baz property.'
-        })); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
+                description: 'This is baz property.'
+            }));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0)).register(z.globalRegistry, {
             description: 'This is qux property.'
         })), 0)
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts
index 543de1610..669174c0a 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators-types/zod.gen.ts
@@ -18,8 +18,12 @@ export type QuxZodType = z.infer<typeof zQux>;
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators/zod.gen.ts
index dcff7fd86..b786abd75 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/mini/validators/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z._default(z.union([
     z.object({
         foo: z.optional(z.string().check(z.regex(/^\d{3}-\d{2}-\d{4}$/))),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z._default(z.optional(z.int().check(z.gt(0))), 0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts
index b8cbda150..d490dd142 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/default/zod.gen.ts
@@ -394,7 +394,9 @@ export const zDeprecatedModel = z.object({
  * This is a model with one property containing a circular reference
  */
 export const zModelWithCircularReference = z.object({
-    get prop() { return z.optional(z.lazy((): any => zModelWithCircularReference)); }
+    get prop() {
+        return z.optional(z.lazy((): any => zModelWithCircularReference));
+    }
 });
 
 /**
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts
index cac0d9b3e..b62812954 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-circular-ref/zod.gen.ts
@@ -3,7 +3,9 @@
 import { z } from 'zod';
 
 export const zBar = z.object({
-    get bar() { return z.optional(z.array(z.lazy((): any => zBar))); }
+    get bar() {
+        return z.optional(z.array(z.lazy((): any => zBar)));
+    }
 });
 
 export const zFoo = z.object({
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts
index ca8abb2a0..515d9ad8b 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-dates/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts
index 834510109..995ccdb8a 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-metadata/zod.gen.ts
@@ -16,10 +16,14 @@ export const zFoo = z.union([
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/).register(z.globalRegistry, {
             description: 'This is foo property.'
         })),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
-            description: 'This is baz property.'
-        })); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)).register(z.globalRegistry, {
+                description: 'This is baz property.'
+            }));
+        },
         qux: z.optional(z.int().gt(0).register(z.globalRegistry, {
             description: 'This is qux property.'
         })).default(0)
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts
index 7d7a5eabd..033e85ced 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators-types/zod.gen.ts
@@ -18,8 +18,12 @@ export type QuxZodType = z.infer<typeof zQux>;
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators/zod.gen.ts b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators/zod.gen.ts
index c3b743103..f73a35bac 100644
--- a/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators/zod.gen.ts
+++ b/packages/openapi-ts-tests/zod/v4/__snapshots__/3.1.x/v4/validators/zod.gen.ts
@@ -14,8 +14,12 @@ export const zQux = z.record(z.string(), z.object({
 export const zFoo = z.union([
     z.object({
         foo: z.optional(z.string().regex(/^\d{3}-\d{2}-\d{4}$/)),
-        get bar() { return z.optional(z.lazy((): any => zBar)); },
-        get baz() { return z.optional(z.array(z.lazy((): any => zFoo))); },
+        get bar() {
+            return z.optional(z.lazy((): any => zBar));
+        },
+        get baz() {
+            return z.optional(z.array(z.lazy((): any => zFoo)));
+        },
         qux: z.optional(z.int().gt(0)).default(0)
     }),
     z.null()
diff --git a/packages/openapi-ts/src/ts-dsl/decl/func.ts b/packages/openapi-ts/src/ts-dsl/decl/func.ts
index c3e23e2b1..25a3e3a8a 100644
--- a/packages/openapi-ts/src/ts-dsl/decl/func.ts
+++ b/packages/openapi-ts/src/ts-dsl/decl/func.ts
@@ -118,7 +118,7 @@ class ImplFuncTsDsl<M extends FuncMode = 'arrow'> extends Mixed {
     : M extends 'expr'
       ? ts.FunctionExpression
       : ts.ArrowFunction {
-    const body = this.$node(new BlockTsDsl(...this._do));
+    const body = this.$node(new BlockTsDsl(...this._do).pretty());
 
     if (this.mode === 'decl') {
       if (!this.name) throw new Error('Function declaration requires a name');
diff --git a/packages/openapi-ts/src/ts-dsl/decl/getter.ts b/packages/openapi-ts/src/ts-dsl/decl/getter.ts
index 04deca2dc..a79f03c6c 100644
--- a/packages/openapi-ts/src/ts-dsl/decl/getter.ts
+++ b/packages/openapi-ts/src/ts-dsl/decl/getter.ts
@@ -62,7 +62,7 @@ export class GetterTsDsl extends Mixed {
       this.name,
       this.$params(),
       undefined,
-      this.$node(new BlockTsDsl(...this._do)),
+      this.$node(new BlockTsDsl(...this._do).pretty()),
     );
     return this.$docs(node);
   }
diff --git a/packages/openapi-ts/src/ts-dsl/decl/init.ts b/packages/openapi-ts/src/ts-dsl/decl/init.ts
index 71ec9b2c2..41df7fd65 100644
--- a/packages/openapi-ts/src/ts-dsl/decl/init.ts
+++ b/packages/openapi-ts/src/ts-dsl/decl/init.ts
@@ -42,7 +42,7 @@ export class InitTsDsl extends Mixed {
     const node = ts.factory.createConstructorDeclaration(
       [...this.$decorators(), ...this.modifiers],
       this.$params(),
-      this.$node(new BlockTsDsl(...this._do)),
+      this.$node(new BlockTsDsl(...this._do).pretty()),
     );
     return this.$docs(node);
   }
diff --git a/packages/openapi-ts/src/ts-dsl/decl/method.ts b/packages/openapi-ts/src/ts-dsl/decl/method.ts
index 3def22f61..0cdc987c8 100644
--- a/packages/openapi-ts/src/ts-dsl/decl/method.ts
+++ b/packages/openapi-ts/src/ts-dsl/decl/method.ts
@@ -79,7 +79,7 @@ export class MethodTsDsl extends Mixed {
       this.$generics(),
       this.$params(),
       this.$type(this._returns),
-      this.$node(new BlockTsDsl(...this._do)),
+      this.$node(new BlockTsDsl(...this._do).pretty()),
     );
     return this.$docs(node);
   }
diff --git a/packages/openapi-ts/src/ts-dsl/decl/setter.ts b/packages/openapi-ts/src/ts-dsl/decl/setter.ts
index 19c7538dc..3b8845b90 100644
--- a/packages/openapi-ts/src/ts-dsl/decl/setter.ts
+++ b/packages/openapi-ts/src/ts-dsl/decl/setter.ts
@@ -61,7 +61,7 @@ export class SetterTsDsl extends Mixed {
       [...this.$decorators(), ...this.modifiers],
       this.name,
       this.$params(),
-      this.$node(new BlockTsDsl(...this._do)),
+      this.$node(new BlockTsDsl(...this._do).pretty()),
     );
     return this.$docs(node);
   }
diff --git a/packages/openapi-ts/src/ts-dsl/expr/typeof.ts b/packages/openapi-ts/src/ts-dsl/expr/typeof.ts
index 6be175036..d5dbce0d6 100644
--- a/packages/openapi-ts/src/ts-dsl/expr/typeof.ts
+++ b/packages/openapi-ts/src/ts-dsl/expr/typeof.ts
@@ -4,7 +4,7 @@ import ts from 'typescript';
 import type { MaybeTsDsl } from '../base';
 import { TsDsl } from '../base';
 import { OperatorMixin } from '../mixins/operator';
-import { registerLazyAccessTypeOfExprFactory } from '../mixins/type-expr';
+import { setTypeOfExprFactory } from '../mixins/type-expr';
 
 const Mixed = OperatorMixin(TsDsl<ts.TypeOfExpression>);
 
@@ -28,4 +28,4 @@ export class TypeOfExprTsDsl extends Mixed {
   }
 }
 
-registerLazyAccessTypeOfExprFactory((...args) => new TypeOfExprTsDsl(...args));
+setTypeOfExprFactory((...args) => new TypeOfExprTsDsl(...args));
diff --git a/packages/openapi-ts/src/ts-dsl/mixins/layout.ts b/packages/openapi-ts/src/ts-dsl/mixins/layout.ts
index 8da34667a..d9c97fa03 100644
--- a/packages/openapi-ts/src/ts-dsl/mixins/layout.ts
+++ b/packages/openapi-ts/src/ts-dsl/mixins/layout.ts
@@ -44,6 +44,7 @@ export function LayoutMixin<T extends ts.Node, TBase extends BaseCtor<T>>(
       if (this.layout === undefined) {
         this.layout = Layout.DEFAULT_THRESHOLD;
       }
+      if (count === 0) return false;
       return typeof this.layout === 'number'
         ? count >= this.layout
         : this.layout;
diff --git a/packages/openapi-ts/src/ts-dsl/mixins/type-expr.ts b/packages/openapi-ts/src/ts-dsl/mixins/type-expr.ts
index 92b6c7579..5823b5ceb 100644
--- a/packages/openapi-ts/src/ts-dsl/mixins/type-expr.ts
+++ b/packages/openapi-ts/src/ts-dsl/mixins/type-expr.ts
@@ -14,10 +14,8 @@ type TypeExprFactory = (
   fn?: (t: TypeExprTsDsl) => void,
 ) => TypeExprTsDsl;
 let typeExprFactory: TypeExprFactory | undefined;
-/** Registers the TypeExpr DSL factory after its module has finished evaluating. */
-export function registerLazyAccessTypeExprFactory(
-  factory: TypeExprFactory,
-): void {
+/** Lazy register the factory to avoid circular imports. */
+export function setTypeExprFactory(factory: TypeExprFactory): void {
   typeExprFactory = factory;
 }
 
@@ -26,10 +24,8 @@ type TypeIdxFactory = (
   index: string | number | MaybeTsDsl<ts.TypeNode>,
 ) => TypeIdxTsDsl;
 let typeIdxFactory: TypeIdxFactory | undefined;
-/** Registers the TypeIdxTsDsl DSL factory after its module has finished evaluating. */
-export function registerLazyAccessTypeIdxFactory(
-  factory: TypeIdxFactory,
-): void {
+/** Lazy register the factory to avoid circular imports. */
+export function setTypeIdxFactory(factory: TypeIdxFactory): void {
   typeIdxFactory = factory;
 }
 
@@ -37,19 +33,15 @@ type TypeOfExprFactory = (
   expr: string | MaybeTsDsl<ts.Expression>,
 ) => TypeOfExprTsDsl;
 let typeOfExprFactory: TypeOfExprFactory | undefined;
-/** Registers the TypeOfExpr DSL factory after its module has finished evaluating. */
-export function registerLazyAccessTypeOfExprFactory(
-  factory: TypeOfExprFactory,
-): void {
+/** Lazy register the factory to avoid circular imports. */
+export function setTypeOfExprFactory(factory: TypeOfExprFactory): void {
   typeOfExprFactory = factory;
 }
 
 type TypeOperatorFactory = () => TypeOperatorTsDsl;
 let typeOperatorFactory: TypeOperatorFactory | undefined;
-/** Registers the TypeOperatorTsDsl DSL factory after its module has finished evaluating. */
-export function registerLazyAccessTypeOperatorFactory(
-  factory: TypeOperatorFactory,
-): void {
+/** Lazy register the factory to avoid circular imports. */
+export function setTypeOperatorFactory(factory: TypeOperatorFactory): void {
   typeOperatorFactory = factory;
 }
 
@@ -57,10 +49,8 @@ type TypeQueryFactory = (
   expr: string | MaybeTsDsl<TypeTsDsl | ts.Expression>,
 ) => TypeQueryTsDsl;
 let typeQueryFactory: TypeQueryFactory | undefined;
-/** Registers the TypeQuery DSL factory after its module has finished evaluating. */
-export function registerLazyAccessTypeQueryFactory(
-  factory: TypeQueryFactory,
-): void {
+/** Lazy register the factory to avoid circular imports. */
+export function setTypeQueryFactory(factory: TypeQueryFactory): void {
   typeQueryFactory = factory;
 }
 
diff --git a/packages/openapi-ts/src/ts-dsl/stmt/if.ts b/packages/openapi-ts/src/ts-dsl/stmt/if.ts
index d23c2d4db..37b521853 100644
--- a/packages/openapi-ts/src/ts-dsl/stmt/if.ts
+++ b/packages/openapi-ts/src/ts-dsl/stmt/if.ts
@@ -53,8 +53,10 @@ export class IfTsDsl extends Mixed {
 
     return ts.factory.createIfStatement(
       this.$node(this._condition),
-      this.$node(new BlockTsDsl(...this._do)),
-      this._else ? this.$node(new BlockTsDsl(this._else)) : undefined,
+      this.$node(new BlockTsDsl(...this._do).pretty()),
+      this._else
+        ? this.$node(new BlockTsDsl(...this._else).pretty())
+        : undefined,
     );
   }
 }
diff --git a/packages/openapi-ts/src/ts-dsl/stmt/try.ts b/packages/openapi-ts/src/ts-dsl/stmt/try.ts
index 0563ab71a..e053351ac 100644
--- a/packages/openapi-ts/src/ts-dsl/stmt/try.ts
+++ b/packages/openapi-ts/src/ts-dsl/stmt/try.ts
@@ -84,14 +84,16 @@ export class TryTsDsl extends Mixed {
       : undefined;
 
     return ts.factory.createTryStatement(
-      this.$node(new BlockTsDsl(...this._try)),
+      this.$node(new BlockTsDsl(...this._try).pretty()),
       ts.factory.createCatchClause(
         catchParam
           ? ts.factory.createVariableDeclaration(catchParam)
           : undefined,
-        this.$node(new BlockTsDsl(...(this._catch ?? []))),
+        this.$node(new BlockTsDsl(...(this._catch ?? [])).pretty()),
       ),
-      this._finally ? this.$node(new BlockTsDsl(...this._finally)) : undefined,
+      this._finally
+        ? this.$node(new BlockTsDsl(...this._finally).pretty())
+        : undefined,
     );
   }
 }
diff --git a/packages/openapi-ts/src/ts-dsl/type/expr.ts b/packages/openapi-ts/src/ts-dsl/type/expr.ts
index af3035673..ddb804a08 100644
--- a/packages/openapi-ts/src/ts-dsl/type/expr.ts
+++ b/packages/openapi-ts/src/ts-dsl/type/expr.ts
@@ -4,10 +4,7 @@ import ts from 'typescript';
 
 import { TypeTsDsl } from '../base';
 import { TypeArgsMixin } from '../mixins/type-args';
-import {
-  registerLazyAccessTypeExprFactory,
-  TypeExprMixin,
-} from '../mixins/type-expr';
+import { setTypeExprFactory, TypeExprMixin } from '../mixins/type-expr';
 import { TypeAttrTsDsl } from './attr';
 
 export type TypeExprName = Symbol | string;
@@ -60,7 +57,7 @@ export class TypeExprTsDsl extends Mixed {
   }
 }
 
-registerLazyAccessTypeExprFactory(
+setTypeExprFactory(
   (...args) =>
     new TypeExprTsDsl(...(args as ConstructorParameters<typeof TypeExprTsDsl>)),
 );
diff --git a/packages/openapi-ts/src/ts-dsl/type/idx.ts b/packages/openapi-ts/src/ts-dsl/type/idx.ts
index 55f1dea02..84905cfb7 100644
--- a/packages/openapi-ts/src/ts-dsl/type/idx.ts
+++ b/packages/openapi-ts/src/ts-dsl/type/idx.ts
@@ -3,10 +3,7 @@ import ts from 'typescript';
 
 import type { MaybeTsDsl } from '../base';
 import { TypeTsDsl } from '../base';
-import {
-  registerLazyAccessTypeIdxFactory,
-  TypeExprMixin,
-} from '../mixins/type-expr';
+import { setTypeIdxFactory, TypeExprMixin } from '../mixins/type-expr';
 
 type Base = string | MaybeTsDsl<ts.TypeNode>;
 type Index = string | number | MaybeTsDsl<ts.TypeNode>;
@@ -49,4 +46,4 @@ export class TypeIdxTsDsl extends Mixed {
   }
 }
 
-registerLazyAccessTypeIdxFactory((...args) => new TypeIdxTsDsl(...args));
+setTypeIdxFactory((...args) => new TypeIdxTsDsl(...args));
diff --git a/packages/openapi-ts/src/ts-dsl/type/operator.ts b/packages/openapi-ts/src/ts-dsl/type/operator.ts
index 07c1cc54f..4090383f3 100644
--- a/packages/openapi-ts/src/ts-dsl/type/operator.ts
+++ b/packages/openapi-ts/src/ts-dsl/type/operator.ts
@@ -3,7 +3,7 @@ import ts from 'typescript';
 
 import type { MaybeTsDsl } from '../base';
 import { TypeTsDsl } from '../base';
-import { registerLazyAccessTypeOperatorFactory } from '../mixins/type-expr';
+import { setTypeOperatorFactory } from '../mixins/type-expr';
 
 type Op =
   | ts.SyntaxKind.KeyOfKeyword
@@ -92,6 +92,4 @@ export class TypeOperatorTsDsl extends Mixed {
   }
 }
 
-registerLazyAccessTypeOperatorFactory(
-  (...args) => new TypeOperatorTsDsl(...args),
-);
+setTypeOperatorFactory((...args) => new TypeOperatorTsDsl(...args));
diff --git a/packages/openapi-ts/src/ts-dsl/type/query.ts b/packages/openapi-ts/src/ts-dsl/type/query.ts
index ff4d27be1..c5251b519 100644
--- a/packages/openapi-ts/src/ts-dsl/type/query.ts
+++ b/packages/openapi-ts/src/ts-dsl/type/query.ts
@@ -3,10 +3,7 @@ import ts from 'typescript';
 
 import type { MaybeTsDsl } from '../base';
 import { TypeTsDsl } from '../base';
-import {
-  registerLazyAccessTypeQueryFactory,
-  TypeExprMixin,
-} from '../mixins/type-expr';
+import { setTypeQueryFactory, TypeExprMixin } from '../mixins/type-expr';
 
 const Mixed = TypeExprMixin(TypeTsDsl<ts.TypeQueryNode>);
 
@@ -31,4 +28,4 @@ export class TypeQueryTsDsl extends Mixed {
   }
 }
 
-registerLazyAccessTypeQueryFactory((...args) => new TypeQueryTsDsl(...args));
+setTypeQueryFactory((...args) => new TypeQueryTsDsl(...args));