From 85a701c79ebae08355710b5309411b65845a2830 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 16:22:10 +0300
Subject: [PATCH 01/13] feat: added 'response' as option for
 Config.responseStyle

---
 .../src/plugins/@hey-api/client-angular/bundle/types.ts       | 2 +-
 .../src/plugins/@hey-api/client-fetch/bundle/types.ts         | 2 +-
 .../src/plugins/@hey-api/client-ofetch/bundle/types.ts        | 2 +-
 packages/openapi-ts/src/plugins/@hey-api/sdk/types.d.ts       | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/types.ts b/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/types.ts
index 781c8832d..a632fd774 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/types.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/types.ts
@@ -18,7 +18,7 @@ import type {
 } from '../../client-core/bundle/types';
 import type { Middleware } from './utils';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/types.ts b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/types.ts
index 0a8d15009..abde2cc0a 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/types.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-fetch/bundle/types.ts
@@ -9,7 +9,7 @@ import type {
 } from '../../client-core/bundle/types';
 import type { Middleware } from './utils';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/types.ts b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/types.ts
index 0c45a80a3..a595444ee 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/types.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-ofetch/bundle/types.ts
@@ -15,7 +15,7 @@ import type {
 } from '../../client-core/bundle/types';
 import type { Middleware } from './utils';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts/src/plugins/@hey-api/sdk/types.d.ts b/packages/openapi-ts/src/plugins/@hey-api/sdk/types.d.ts
index 56e88f67f..cd0567d93 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/sdk/types.d.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/sdk/types.d.ts
@@ -103,7 +103,7 @@ export type UserConfig = Plugin.Name<'@hey-api/sdk'> &
      *
      * @default 'fields'
      */
-    responseStyle?: 'data' | 'fields';
+    responseStyle?: 'data' | 'fields' | 'response';
     /**
      * Transform response data before returning. This is useful if you want to
      * convert for example ISO strings into Date objects. However, transformation
@@ -282,7 +282,7 @@ export type Config = Plugin.Name<'@hey-api/sdk'> &
      *
      * @default 'fields'
      */
-    responseStyle: 'data' | 'fields';
+    responseStyle: 'data' | 'fields' | 'response';
     /**
      * Transform response data before returning. This is useful if you want to
      * convert for example ISO strings into Date objects. However, transformation

From 455cf4b1dcc5b8d78f0d19fc7d4a8ca87dc0c8ad Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 16:26:16 +0300
Subject: [PATCH 02/13] feat: direct return awaitSdkExpression when
 responseStyle === 'response' (@pina)

---
 .../openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts     | 2 +-
 packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
index 9b56c749f..547d8cc53 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
@@ -63,7 +63,7 @@ export const createMutationOptions = ({
 
   const statements: Array<ts.Statement> = [];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data') {
+  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
index 1cc2a0829..8d3a3b36a 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
@@ -114,7 +114,7 @@ export const createQueryOptions = ({
   });
 
   const statements: Array<ts.Statement> = [];
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data') {
+  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,

From 08d1172a9855d12ecc5458d0ccf7d505bd18a81d Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 16:26:25 +0300
Subject: [PATCH 03/13] feat: direct return awaitSdkExpression when
 responseStyle === 'response' (@tanstack)

---
 .../query-core/infiniteQueryOptions.ts        |  2 +-
 .../@tanstack/query-core/mutationOptions.ts   |  2 +-
 .../@tanstack/query-core/queryOptions.ts      | 34 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
index d83b5b34b..05579318a 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
@@ -407,7 +407,7 @@ export const createInfiniteQueryOptions = ({
     }),
   ];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data') {
+  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
index ac9d22277..42744aa65 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
@@ -56,7 +56,7 @@ export const createMutationOptions = ({
 
   const statements: Array<ts.Statement> = [];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data') {
+  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
index 3b979cc07..574704e0c 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
@@ -1,35 +1,35 @@
 import type ts from 'typescript';
 
-import type { IR } from '~/ir/types';
-import { buildName } from '~/openApi/shared/utils/name';
+import type {IR} from '~/ir/types';
+import {buildName} from '~/openApi/shared/utils/name';
 import {
   createOperationComment,
   hasOperationSse,
   isOperationOptionsRequired,
 } from '~/plugins/shared/utils/operation';
-import { tsc } from '~/tsc';
+import {tsc} from '~/tsc';
 
-import { handleMeta } from './meta';
+import {handleMeta} from './meta';
 import {
   createQueryKeyFunction,
   createQueryKeyType,
   queryKeyStatement,
 } from './queryKey';
-import type { PluginInstance } from './types';
-import { useTypeData } from './useType';
+import type {PluginInstance} from './types';
+import {useTypeData} from './useType';
 
 const optionsParamName = 'options';
 
 export const createQueryOptions = ({
-  operation,
-  plugin,
-  queryFn,
-}: {
+                                     operation,
+                                     plugin,
+                                     queryFn,
+                                   }: {
   operation: IR.OperationObject;
   plugin: PluginInstance;
   queryFn: string;
 }): void => {
-  if (hasOperationSse({ operation })) {
+  if (hasOperationSse({operation})) {
     return;
   }
 
@@ -45,8 +45,8 @@ export const createQueryOptions = ({
       tool: plugin.name,
     })
   ) {
-    createQueryKeyType({ plugin });
-    createQueryKeyFunction({ plugin });
+    createQueryKeyType({plugin});
+    createQueryKeyFunction({plugin});
   }
 
   const symbolQueryOptions = plugin.referenceSymbol({
@@ -69,7 +69,7 @@ export const createQueryOptions = ({
   });
   plugin.setSymbolValue(symbolQueryKey, node);
 
-  const typeData = useTypeData({ operation, plugin });
+  const typeData = useTypeData({operation, plugin});
 
   const awaitSdkExpression = tsc.awaitExpression({
     expression: tsc.callExpression({
@@ -103,7 +103,7 @@ export const createQueryOptions = ({
 
   const statements: Array<ts.Statement> = [];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data') {
+  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
@@ -177,7 +177,7 @@ export const createQueryOptions = ({
   });
   const statement = tsc.constVariable({
     comment: plugin.config.comments
-      ? createOperationComment({ operation })
+      ? createOperationComment({operation})
       : undefined,
     exportConst: symbolQueryOptionsFn.exported,
     expression: tsc.arrowFunction({
@@ -190,7 +190,7 @@ export const createQueryOptions = ({
       ],
       statements: [
         tsc.returnFunctionCall({
-          args: [tsc.objectExpression({ obj: queryOptionsObj })],
+          args: [tsc.objectExpression({obj: queryOptionsObj})],
           name: symbolQueryOptions.placeholder,
         }),
       ],

From a75cb7d3f2d3f58a8a8418ac0fc9c44a504e5180 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 16:41:18 +0300
Subject: [PATCH 04/13] Add changeset for openapi-ts response support

Add a changeset for WIP support of 'response' return in openapi-ts plugins.
---
 .changeset/silly-yaks-juggle.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/silly-yaks-juggle.md

diff --git a/.changeset/silly-yaks-juggle.md b/.changeset/silly-yaks-juggle.md
new file mode 100644
index 000000000..a09f89685
--- /dev/null
+++ b/.changeset/silly-yaks-juggle.md
@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+WIP: Support 'response' return for openapi-ts plugins

From af9c79887c31e21507154ce90000fc30f3fba9d9 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 16:56:48 +0300
Subject: [PATCH 05/13] chore: lint fixes

---
 .../plugins/@pinia/colada/mutationOptions.ts  |  5 ++-
 .../src/plugins/@pinia/colada/queryOptions.ts |  5 ++-
 .../query-core/infiniteQueryOptions.ts        |  5 ++-
 .../@tanstack/query-core/mutationOptions.ts   |  5 ++-
 .../@tanstack/query-core/queryOptions.ts      | 37 ++++++++++---------
 5 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
index 547d8cc53..ea6f8c45b 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
@@ -63,7 +63,10 @@ export const createMutationOptions = ({
 
   const statements: Array<ts.Statement> = [];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
+  if (
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' ||
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response'
+  ) {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
index 8d3a3b36a..273309a8c 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/queryOptions.ts
@@ -114,7 +114,10 @@ export const createQueryOptions = ({
   });
 
   const statements: Array<ts.Statement> = [];
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
+  if (
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' ||
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response'
+  ) {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
index 05579318a..68839dce6 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/infiniteQueryOptions.ts
@@ -407,7 +407,10 @@ export const createInfiniteQueryOptions = ({
     }),
   ];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
+  if (
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' ||
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response'
+  ) {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
index 42744aa65..cd13be537 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
@@ -56,7 +56,10 @@ export const createMutationOptions = ({
 
   const statements: Array<ts.Statement> = [];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
+  if (
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' ||
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response'
+  ) {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
index 574704e0c..383f159fa 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/queryOptions.ts
@@ -1,35 +1,35 @@
 import type ts from 'typescript';
 
-import type {IR} from '~/ir/types';
-import {buildName} from '~/openApi/shared/utils/name';
+import type { IR } from '~/ir/types';
+import { buildName } from '~/openApi/shared/utils/name';
 import {
   createOperationComment,
   hasOperationSse,
   isOperationOptionsRequired,
 } from '~/plugins/shared/utils/operation';
-import {tsc} from '~/tsc';
+import { tsc } from '~/tsc';
 
-import {handleMeta} from './meta';
+import { handleMeta } from './meta';
 import {
   createQueryKeyFunction,
   createQueryKeyType,
   queryKeyStatement,
 } from './queryKey';
-import type {PluginInstance} from './types';
-import {useTypeData} from './useType';
+import type { PluginInstance } from './types';
+import { useTypeData } from './useType';
 
 const optionsParamName = 'options';
 
 export const createQueryOptions = ({
-                                     operation,
-                                     plugin,
-                                     queryFn,
-                                   }: {
+  operation,
+  plugin,
+  queryFn,
+}: {
   operation: IR.OperationObject;
   plugin: PluginInstance;
   queryFn: string;
 }): void => {
-  if (hasOperationSse({operation})) {
+  if (hasOperationSse({ operation })) {
     return;
   }
 
@@ -45,8 +45,8 @@ export const createQueryOptions = ({
       tool: plugin.name,
     })
   ) {
-    createQueryKeyType({plugin});
-    createQueryKeyFunction({plugin});
+    createQueryKeyType({ plugin });
+    createQueryKeyFunction({ plugin });
   }
 
   const symbolQueryOptions = plugin.referenceSymbol({
@@ -69,7 +69,7 @@ export const createQueryOptions = ({
   });
   plugin.setSymbolValue(symbolQueryKey, node);
 
-  const typeData = useTypeData({operation, plugin});
+  const typeData = useTypeData({ operation, plugin });
 
   const awaitSdkExpression = tsc.awaitExpression({
     expression: tsc.callExpression({
@@ -103,7 +103,10 @@ export const createQueryOptions = ({
 
   const statements: Array<ts.Statement> = [];
 
-  if (plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' || plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response') {
+  if (
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'data' ||
+    plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response'
+  ) {
     statements.push(
       tsc.returnVariable({
         expression: awaitSdkExpression,
@@ -177,7 +180,7 @@ export const createQueryOptions = ({
   });
   const statement = tsc.constVariable({
     comment: plugin.config.comments
-      ? createOperationComment({operation})
+      ? createOperationComment({ operation })
       : undefined,
     exportConst: symbolQueryOptionsFn.exported,
     expression: tsc.arrowFunction({
@@ -190,7 +193,7 @@ export const createQueryOptions = ({
       ],
       statements: [
         tsc.returnFunctionCall({
-          args: [tsc.objectExpression({obj: queryOptionsObj})],
+          args: [tsc.objectExpression({ obj: queryOptionsObj })],
           name: symbolQueryOptions.placeholder,
         }),
       ],

From 1ae72f1c23deda27a1430e6207e4e46736c7de8b Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 17:10:27 +0300
Subject: [PATCH 06/13] chore: re-generated examples

---
 .../openapi-ts-angular-common/src/client/client/types.gen.ts    | 2 +-
 examples/openapi-ts-angular/src/client/client/types.gen.ts      | 2 +-
 examples/openapi-ts-fastify/src/client/client/types.gen.ts      | 2 +-
 examples/openapi-ts-fetch/src/client/client/types.gen.ts        | 2 +-
 examples/openapi-ts-ofetch/src/client/client/types.gen.ts       | 2 +-
 examples/openapi-ts-openai/src/client/client/types.gen.ts       | 2 +-
 examples/openapi-ts-pinia-colada/src/client/client/types.gen.ts | 2 +-
 .../src/client/client/types.gen.ts                              | 2 +-
 .../src/client/client/types.gen.ts                              | 2 +-
 .../src/client/client/types.gen.ts                              | 2 +-
 .../src/client/client/types.gen.ts                              | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/examples/openapi-ts-angular-common/src/client/client/types.gen.ts b/examples/openapi-ts-angular-common/src/client/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/examples/openapi-ts-angular-common/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-angular-common/src/client/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-angular/src/client/client/types.gen.ts b/examples/openapi-ts-angular/src/client/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/examples/openapi-ts-angular/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-angular/src/client/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-fastify/src/client/client/types.gen.ts b/examples/openapi-ts-fastify/src/client/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/examples/openapi-ts-fastify/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-fastify/src/client/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-fetch/src/client/client/types.gen.ts b/examples/openapi-ts-fetch/src/client/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/examples/openapi-ts-fetch/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-fetch/src/client/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-ofetch/src/client/client/types.gen.ts b/examples/openapi-ts-ofetch/src/client/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/examples/openapi-ts-ofetch/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-ofetch/src/client/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-openai/src/client/client/types.gen.ts b/examples/openapi-ts-openai/src/client/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/examples/openapi-ts-openai/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-openai/src/client/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-pinia-colada/src/client/client/types.gen.ts b/examples/openapi-ts-pinia-colada/src/client/client/types.gen.ts
index 7ebb04c8c..fd021348a 100644
--- a/examples/openapi-ts-pinia-colada/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-pinia-colada/src/client/client/types.gen.ts
@@ -5,7 +5,7 @@ import type { ServerSentEventsOptions, ServerSentEventsResult } from '../core/se
 import type { Client as CoreClient, Config as CoreConfig } from '../core/types.gen'
 import type { Middleware } from './utils.gen'
 
-export type ResponseStyle = 'data' | 'fields'
+export type ResponseStyle = 'data' | 'fields' | 'response'
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/types.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-tanstack-react-query/src/client/client/types.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/examples/openapi-ts-tanstack-react-query/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-tanstack-react-query/src/client/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/client/types.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/examples/openapi-ts-tanstack-svelte-query/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-tanstack-svelte-query/src/client/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/client/types.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/client/types.gen.ts
index 7ebb04c8c..fd021348a 100644
--- a/examples/openapi-ts-tanstack-vue-query/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-tanstack-vue-query/src/client/client/types.gen.ts
@@ -5,7 +5,7 @@ import type { ServerSentEventsOptions, ServerSentEventsResult } from '../core/se
 import type { Client as CoreClient, Config as CoreConfig } from '../core/types.gen'
 import type { Middleware } from './utils.gen'
 
-export type ResponseStyle = 'data' | 'fields'
+export type ResponseStyle = 'data' | 'fields' | 'response'
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,

From 0b42464976ba29af76c20704657d9764fb11ea30 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 17:38:10 +0300
Subject: [PATCH 07/13] fix: mutationFn type to include Request and Response

---
 .../angular-query-experimental.gen.ts         |  76 ++++--
 .../openapi-ts.config.ts                      |   2 +-
 .../src/client/@tanstack/react-query.gen.ts   | 224 +++++++++---------
 .../src/client/@tanstack/svelte-query.gen.ts  |  76 ++++--
 .../src/client/@tanstack/vue-query.gen.ts     | 104 ++++++--
 .../@tanstack/query-core/mutationOptions.ts   |   2 +-
 6 files changed, 299 insertions(+), 185 deletions(-)

diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts
index 4952a1ddf..b192327c9 100644
--- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts
+++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts
@@ -65,9 +65,13 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>,
-): MutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => {
+): MutationOptions<
+  { data: AddPetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<AddPetData>
+> => {
   const mutationOptions: MutationOptions<
-    AddPetResponse,
+    { data: AddPetResponse; request: Request; response: Response },
     DefaultError,
     Options<AddPetData>
   > = {
@@ -90,9 +94,13 @@ export const addPetMutation = (
  */
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>,
-): MutationOptions<UpdatePetResponse, DefaultError, Options<UpdatePetData>> => {
+): MutationOptions<
+  { data: UpdatePetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<UpdatePetData>
+> => {
   const mutationOptions: MutationOptions<
-    UpdatePetResponse,
+    { data: UpdatePetResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetData>
   > = {
@@ -202,9 +210,13 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>,
-): MutationOptions<unknown, DefaultError, Options<DeletePetData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeletePetData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeletePetData>
   > = {
@@ -250,12 +262,12 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>,
 ): MutationOptions<
-  UpdatePetWithFormResponse,
+  { data: UpdatePetWithFormResponse; request: Request; response: Response },
   DefaultError,
   Options<UpdatePetWithFormData>
 > => {
   const mutationOptions: MutationOptions<
-    UpdatePetWithFormResponse,
+    { data: UpdatePetWithFormResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetWithFormData>
   > = {
@@ -279,12 +291,12 @@ export const updatePetWithFormMutation = (
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>,
 ): MutationOptions<
-  UploadFileResponse,
+  { data: UploadFileResponse; request: Request; response: Response },
   DefaultError,
   Options<UploadFileData>
 > => {
   const mutationOptions: MutationOptions<
-    UploadFileResponse,
+    { data: UploadFileResponse; request: Request; response: Response },
     DefaultError,
     Options<UploadFileData>
   > = {
@@ -330,12 +342,12 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>,
 ): MutationOptions<
-  PlaceOrderResponse,
+  { data: PlaceOrderResponse; request: Request; response: Response },
   DefaultError,
   Options<PlaceOrderData>
 > => {
   const mutationOptions: MutationOptions<
-    PlaceOrderResponse,
+    { data: PlaceOrderResponse; request: Request; response: Response },
     DefaultError,
     Options<PlaceOrderData>
   > = {
@@ -358,9 +370,13 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>,
-): MutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteOrderData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeleteOrderData>
   > = {
@@ -406,12 +422,12 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>,
 ): MutationOptions<
-  CreateUserResponse,
+  { data: CreateUserResponse; request: Request; response: Response },
   DefaultError,
   Options<CreateUserData>
 > => {
   const mutationOptions: MutationOptions<
-    CreateUserResponse,
+    { data: CreateUserResponse; request: Request; response: Response },
     DefaultError,
     Options<CreateUserData>
   > = {
@@ -435,12 +451,20 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>,
 ): MutationOptions<
-  CreateUsersWithListInputResponse,
+  {
+    data: CreateUsersWithListInputResponse;
+    request: Request;
+    response: Response;
+  },
   DefaultError,
   Options<CreateUsersWithListInputData>
 > => {
   const mutationOptions: MutationOptions<
-    CreateUsersWithListInputResponse,
+    {
+      data: CreateUsersWithListInputResponse;
+      request: Request;
+      response: Response;
+    },
     DefaultError,
     Options<CreateUsersWithListInputData>
   > = {
@@ -507,9 +531,13 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>,
-): MutationOptions<unknown, DefaultError, Options<DeleteUserData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteUserData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeleteUserData>
   > = {
@@ -554,9 +582,13 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>,
-): MutationOptions<unknown, DefaultError, Options<UpdateUserData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<UpdateUserData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<UpdateUserData>
   > = {
diff --git a/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts b/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts
index 0fc4b15c1..01350acf3 100644
--- a/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts
+++ b/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
   plugins: [
     '@hey-api/client-fetch',
     '@hey-api/schemas',
-    '@hey-api/sdk',
+    { name: '@hey-api/sdk', responseStyle: 'response' },
     {
       enums: 'javascript',
       name: '@hey-api/typescript',
diff --git a/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts
index c461fceff..f67100b9c 100644
--- a/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts
+++ b/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts
@@ -65,20 +65,22 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>,
-): UseMutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => {
+): UseMutationOptions<
+  { data: AddPetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<AddPetData>
+> => {
   const mutationOptions: UseMutationOptions<
-    AddPetResponse,
+    { data: AddPetResponse; request: Request; response: Response },
     DefaultError,
     Options<AddPetData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await addPet({
+    mutationFn: async (fnOptions) =>
+      await addPet({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -91,23 +93,21 @@ export const addPetMutation = (
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>,
 ): UseMutationOptions<
-  UpdatePetResponse,
+  { data: UpdatePetResponse; request: Request; response: Response },
   DefaultError,
   Options<UpdatePetData>
 > => {
   const mutationOptions: UseMutationOptions<
-    UpdatePetResponse,
+    { data: UpdatePetResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePet({
+    mutationFn: async (fnOptions) =>
+      await updatePet({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -165,15 +165,13 @@ export const findPetsByStatusOptions = (
   options: Options<FindPetsByStatusData>,
 ) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await findPetsByStatus({
+    queryFn: async ({ queryKey, signal }) =>
+      await findPetsByStatus({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: findPetsByStatusQueryKey(options),
   });
 
@@ -187,15 +185,13 @@ export const findPetsByTagsQueryKey = (options: Options<FindPetsByTagsData>) =>
  */
 export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await findPetsByTags({
+    queryFn: async ({ queryKey, signal }) =>
+      await findPetsByTags({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: findPetsByTagsQueryKey(options),
   });
 
@@ -206,20 +202,22 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>,
-): UseMutationOptions<unknown, DefaultError, Options<DeletePetData>> => {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeletePetData>
+> => {
   const mutationOptions: UseMutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeletePetData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deletePet({
+    mutationFn: async (fnOptions) =>
+      await deletePet({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -234,15 +232,13 @@ export const getPetByIdQueryKey = (options: Options<GetPetByIdData>) =>
  */
 export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await getPetById({
+    queryFn: async ({ queryKey, signal }) =>
+      await getPetById({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: getPetByIdQueryKey(options),
   });
 
@@ -254,23 +250,21 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>,
 ): UseMutationOptions<
-  UpdatePetWithFormResponse,
+  { data: UpdatePetWithFormResponse; request: Request; response: Response },
   DefaultError,
   Options<UpdatePetWithFormData>
 > => {
   const mutationOptions: UseMutationOptions<
-    UpdatePetWithFormResponse,
+    { data: UpdatePetWithFormResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetWithFormData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePetWithForm({
+    mutationFn: async (fnOptions) =>
+      await updatePetWithForm({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -283,23 +277,21 @@ export const updatePetWithFormMutation = (
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>,
 ): UseMutationOptions<
-  UploadFileResponse,
+  { data: UploadFileResponse; request: Request; response: Response },
   DefaultError,
   Options<UploadFileData>
 > => {
   const mutationOptions: UseMutationOptions<
-    UploadFileResponse,
+    { data: UploadFileResponse; request: Request; response: Response },
     DefaultError,
     Options<UploadFileData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await uploadFile({
+    mutationFn: async (fnOptions) =>
+      await uploadFile({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -314,15 +306,13 @@ export const getInventoryQueryKey = (options?: Options<GetInventoryData>) =>
  */
 export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await getInventory({
+    queryFn: async ({ queryKey, signal }) =>
+      await getInventory({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: getInventoryQueryKey(options),
   });
 
@@ -334,23 +324,21 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>,
 ): UseMutationOptions<
-  PlaceOrderResponse,
+  { data: PlaceOrderResponse; request: Request; response: Response },
   DefaultError,
   Options<PlaceOrderData>
 > => {
   const mutationOptions: UseMutationOptions<
-    PlaceOrderResponse,
+    { data: PlaceOrderResponse; request: Request; response: Response },
     DefaultError,
     Options<PlaceOrderData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await placeOrder({
+    mutationFn: async (fnOptions) =>
+      await placeOrder({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -362,20 +350,22 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>,
-): UseMutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteOrderData>
+> => {
   const mutationOptions: UseMutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeleteOrderData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteOrder({
+    mutationFn: async (fnOptions) =>
+      await deleteOrder({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -390,15 +380,13 @@ export const getOrderByIdQueryKey = (options: Options<GetOrderByIdData>) =>
  */
 export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await getOrderById({
+    queryFn: async ({ queryKey, signal }) =>
+      await getOrderById({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: getOrderByIdQueryKey(options),
   });
 
@@ -410,23 +398,21 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>,
 ): UseMutationOptions<
-  CreateUserResponse,
+  { data: CreateUserResponse; request: Request; response: Response },
   DefaultError,
   Options<CreateUserData>
 > => {
   const mutationOptions: UseMutationOptions<
-    CreateUserResponse,
+    { data: CreateUserResponse; request: Request; response: Response },
     DefaultError,
     Options<CreateUserData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUser({
+    mutationFn: async (fnOptions) =>
+      await createUser({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -439,23 +425,29 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>,
 ): UseMutationOptions<
-  CreateUsersWithListInputResponse,
+  {
+    data: CreateUsersWithListInputResponse;
+    request: Request;
+    response: Response;
+  },
   DefaultError,
   Options<CreateUsersWithListInputData>
 > => {
   const mutationOptions: UseMutationOptions<
-    CreateUsersWithListInputResponse,
+    {
+      data: CreateUsersWithListInputResponse;
+      request: Request;
+      response: Response;
+    },
     DefaultError,
     Options<CreateUsersWithListInputData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUsersWithListInput({
+    mutationFn: async (fnOptions) =>
+      await createUsersWithListInput({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -470,15 +462,13 @@ export const loginUserQueryKey = (options?: Options<LoginUserData>) =>
  */
 export const loginUserOptions = (options?: Options<LoginUserData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await loginUser({
+    queryFn: async ({ queryKey, signal }) =>
+      await loginUser({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: loginUserQueryKey(options),
   });
 
@@ -492,15 +482,13 @@ export const logoutUserQueryKey = (options?: Options<LogoutUserData>) =>
  */
 export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await logoutUser({
+    queryFn: async ({ queryKey, signal }) =>
+      await logoutUser({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: logoutUserQueryKey(options),
   });
 
@@ -511,20 +499,22 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>,
-): UseMutationOptions<unknown, DefaultError, Options<DeleteUserData>> => {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteUserData>
+> => {
   const mutationOptions: UseMutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeleteUserData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteUser({
+    mutationFn: async (fnOptions) =>
+      await deleteUser({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
@@ -539,15 +529,13 @@ export const getUserByNameQueryKey = (options: Options<GetUserByNameData>) =>
  */
 export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) => {
-      const { data } = await getUserByName({
+    queryFn: async ({ queryKey, signal }) =>
+      await getUserByName({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
     queryKey: getUserByNameQueryKey(options),
   });
 
@@ -558,20 +546,22 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>,
-): UseMutationOptions<unknown, DefaultError, Options<UpdateUserData>> => {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<UpdateUserData>
+> => {
   const mutationOptions: UseMutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<UpdateUserData>
   > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updateUser({
+    mutationFn: async (fnOptions) =>
+      await updateUser({
         ...options,
         ...fnOptions,
         throwOnError: true,
-      });
-      return data;
-    },
+      }),
   };
   return mutationOptions;
 };
diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts
index e9fe1844e..db1d08924 100644
--- a/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts
+++ b/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts
@@ -65,9 +65,13 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>,
-): MutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => {
+): MutationOptions<
+  { data: AddPetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<AddPetData>
+> => {
   const mutationOptions: MutationOptions<
-    AddPetResponse,
+    { data: AddPetResponse; request: Request; response: Response },
     DefaultError,
     Options<AddPetData>
   > = {
@@ -90,9 +94,13 @@ export const addPetMutation = (
  */
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>,
-): MutationOptions<UpdatePetResponse, DefaultError, Options<UpdatePetData>> => {
+): MutationOptions<
+  { data: UpdatePetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<UpdatePetData>
+> => {
   const mutationOptions: MutationOptions<
-    UpdatePetResponse,
+    { data: UpdatePetResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetData>
   > = {
@@ -202,9 +210,13 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>,
-): MutationOptions<unknown, DefaultError, Options<DeletePetData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeletePetData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeletePetData>
   > = {
@@ -250,12 +262,12 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>,
 ): MutationOptions<
-  UpdatePetWithFormResponse,
+  { data: UpdatePetWithFormResponse; request: Request; response: Response },
   DefaultError,
   Options<UpdatePetWithFormData>
 > => {
   const mutationOptions: MutationOptions<
-    UpdatePetWithFormResponse,
+    { data: UpdatePetWithFormResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetWithFormData>
   > = {
@@ -279,12 +291,12 @@ export const updatePetWithFormMutation = (
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>,
 ): MutationOptions<
-  UploadFileResponse,
+  { data: UploadFileResponse; request: Request; response: Response },
   DefaultError,
   Options<UploadFileData>
 > => {
   const mutationOptions: MutationOptions<
-    UploadFileResponse,
+    { data: UploadFileResponse; request: Request; response: Response },
     DefaultError,
     Options<UploadFileData>
   > = {
@@ -330,12 +342,12 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>,
 ): MutationOptions<
-  PlaceOrderResponse,
+  { data: PlaceOrderResponse; request: Request; response: Response },
   DefaultError,
   Options<PlaceOrderData>
 > => {
   const mutationOptions: MutationOptions<
-    PlaceOrderResponse,
+    { data: PlaceOrderResponse; request: Request; response: Response },
     DefaultError,
     Options<PlaceOrderData>
   > = {
@@ -358,9 +370,13 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>,
-): MutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteOrderData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeleteOrderData>
   > = {
@@ -406,12 +422,12 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>,
 ): MutationOptions<
-  CreateUserResponse,
+  { data: CreateUserResponse; request: Request; response: Response },
   DefaultError,
   Options<CreateUserData>
 > => {
   const mutationOptions: MutationOptions<
-    CreateUserResponse,
+    { data: CreateUserResponse; request: Request; response: Response },
     DefaultError,
     Options<CreateUserData>
   > = {
@@ -435,12 +451,20 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>,
 ): MutationOptions<
-  CreateUsersWithListInputResponse,
+  {
+    data: CreateUsersWithListInputResponse;
+    request: Request;
+    response: Response;
+  },
   DefaultError,
   Options<CreateUsersWithListInputData>
 > => {
   const mutationOptions: MutationOptions<
-    CreateUsersWithListInputResponse,
+    {
+      data: CreateUsersWithListInputResponse;
+      request: Request;
+      response: Response;
+    },
     DefaultError,
     Options<CreateUsersWithListInputData>
   > = {
@@ -507,9 +531,13 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>,
-): MutationOptions<unknown, DefaultError, Options<DeleteUserData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteUserData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<DeleteUserData>
   > = {
@@ -554,9 +582,13 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>,
-): MutationOptions<unknown, DefaultError, Options<UpdateUserData>> => {
+): MutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<UpdateUserData>
+> => {
   const mutationOptions: MutationOptions<
-    unknown,
+    { data: unknown; request: Request; response: Response },
     DefaultError,
     Options<UpdateUserData>
   > = {
diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts
index 9050f1d24..80aab83a4 100644
--- a/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts
+++ b/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts
@@ -61,8 +61,16 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>
-): UseMutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => {
-  const mutationOptions: UseMutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> = {
+): UseMutationOptions<
+  { data: AddPetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<AddPetData>
+> => {
+  const mutationOptions: UseMutationOptions<
+    { data: AddPetResponse; request: Request; response: Response },
+    DefaultError,
+    Options<AddPetData>
+  > = {
     mutationFn: async (fnOptions) => {
       const { data } = await addPet({
         ...options,
@@ -82,9 +90,13 @@ export const addPetMutation = (
  */
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>
-): UseMutationOptions<UpdatePetResponse, DefaultError, Options<UpdatePetData>> => {
+): UseMutationOptions<
+  { data: UpdatePetResponse; request: Request; response: Response },
+  DefaultError,
+  Options<UpdatePetData>
+> => {
   const mutationOptions: UseMutationOptions<
-    UpdatePetResponse,
+    { data: UpdatePetResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetData>
   > = {
@@ -190,8 +202,16 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>
-): UseMutationOptions<unknown, DefaultError, Options<DeletePetData>> => {
-  const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeletePetData>> = {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeletePetData>
+> => {
+  const mutationOptions: UseMutationOptions<
+    { data: unknown; request: Request; response: Response },
+    DefaultError,
+    Options<DeletePetData>
+  > = {
     mutationFn: async (fnOptions) => {
       const { data } = await deletePet({
         ...options,
@@ -233,9 +253,13 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
  */
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>
-): UseMutationOptions<UpdatePetWithFormResponse, DefaultError, Options<UpdatePetWithFormData>> => {
+): UseMutationOptions<
+  { data: UpdatePetWithFormResponse; request: Request; response: Response },
+  DefaultError,
+  Options<UpdatePetWithFormData>
+> => {
   const mutationOptions: UseMutationOptions<
-    UpdatePetWithFormResponse,
+    { data: UpdatePetWithFormResponse; request: Request; response: Response },
     DefaultError,
     Options<UpdatePetWithFormData>
   > = {
@@ -258,9 +282,13 @@ export const updatePetWithFormMutation = (
  */
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>
-): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
+): UseMutationOptions<
+  { data: UploadFileResponse; request: Request; response: Response },
+  DefaultError,
+  Options<UploadFileData>
+> => {
   const mutationOptions: UseMutationOptions<
-    UploadFileResponse,
+    { data: UploadFileResponse; request: Request; response: Response },
     DefaultError,
     Options<UploadFileData>
   > = {
@@ -305,9 +333,13 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
  */
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>
-): UseMutationOptions<PlaceOrderResponse, DefaultError, Options<PlaceOrderData>> => {
+): UseMutationOptions<
+  { data: PlaceOrderResponse; request: Request; response: Response },
+  DefaultError,
+  Options<PlaceOrderData>
+> => {
   const mutationOptions: UseMutationOptions<
-    PlaceOrderResponse,
+    { data: PlaceOrderResponse; request: Request; response: Response },
     DefaultError,
     Options<PlaceOrderData>
   > = {
@@ -330,8 +362,16 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>
-): UseMutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => {
-  const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteOrderData>> = {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteOrderData>
+> => {
+  const mutationOptions: UseMutationOptions<
+    { data: unknown; request: Request; response: Response },
+    DefaultError,
+    Options<DeleteOrderData>
+  > = {
     mutationFn: async (fnOptions) => {
       const { data } = await deleteOrder({
         ...options,
@@ -373,9 +413,13 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
  */
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>
-): UseMutationOptions<CreateUserResponse, DefaultError, Options<CreateUserData>> => {
+): UseMutationOptions<
+  { data: CreateUserResponse; request: Request; response: Response },
+  DefaultError,
+  Options<CreateUserData>
+> => {
   const mutationOptions: UseMutationOptions<
-    CreateUserResponse,
+    { data: CreateUserResponse; request: Request; response: Response },
     DefaultError,
     Options<CreateUserData>
   > = {
@@ -399,12 +443,12 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>
 ): UseMutationOptions<
-  CreateUsersWithListInputResponse,
+  { data: CreateUsersWithListInputResponse; request: Request; response: Response },
   DefaultError,
   Options<CreateUsersWithListInputData>
 > => {
   const mutationOptions: UseMutationOptions<
-    CreateUsersWithListInputResponse,
+    { data: CreateUsersWithListInputResponse; request: Request; response: Response },
     DefaultError,
     Options<CreateUsersWithListInputData>
   > = {
@@ -471,8 +515,16 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>
-): UseMutationOptions<unknown, DefaultError, Options<DeleteUserData>> => {
-  const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteUserData>> = {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<DeleteUserData>
+> => {
+  const mutationOptions: UseMutationOptions<
+    { data: unknown; request: Request; response: Response },
+    DefaultError,
+    Options<DeleteUserData>
+  > = {
     mutationFn: async (fnOptions) => {
       const { data } = await deleteUser({
         ...options,
@@ -514,8 +566,16 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>
-): UseMutationOptions<unknown, DefaultError, Options<UpdateUserData>> => {
-  const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<UpdateUserData>> = {
+): UseMutationOptions<
+  { data: unknown; request: Request; response: Response },
+  DefaultError,
+  Options<UpdateUserData>
+> => {
+  const mutationOptions: UseMutationOptions<
+    { data: unknown; request: Request; response: Response },
+    DefaultError,
+    Options<UpdateUserData>
+  > = {
     mutationFn: async (fnOptions) => {
       const { data } = await updateUser({
         ...options,
diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
index cd13be537..3629133ee 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
@@ -27,7 +27,7 @@ export const createMutationOptions = ({
   const typeError = useTypeError({ operation, plugin });
   const typeResponse = useTypeResponse({ operation, plugin });
   // TODO: better types syntax
-  const mutationType = `${symbolMutationOptionsType.placeholder}<${typeResponse}, ${typeError}, ${typeData}>`;
+  const mutationType = `${symbolMutationOptionsType.placeholder}<{data: ${typeResponse}, response: Response, request: Request }, ${typeError}, ${typeData}>`;
 
   const fnOptions = 'fnOptions';
 

From 3dd4496100f9d07488fac020f34bca9f1214610e Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 18:13:28 +0300
Subject: [PATCH 08/13] fix: directly return mutationOptions object

---
 .../@tanstack/query-core/mutationOptions.ts   | 43 ++++++++-----------
 1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
index 3629133ee..222e81914 100644
--- a/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@tanstack/query-core/mutationOptions.ts
@@ -27,7 +27,7 @@ export const createMutationOptions = ({
   const typeError = useTypeError({ operation, plugin });
   const typeResponse = useTypeResponse({ operation, plugin });
   // TODO: better types syntax
-  const mutationType = `${symbolMutationOptionsType.placeholder}<{data: ${typeResponse}, response: Response, request: Request }, ${typeError}, ${typeData}>`;
+  const mutationType = `${symbolMutationOptionsType.placeholder}<${plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response' ? `{data: ${typeResponse}, response: Response, request: Request }` : typeResponse}, ${typeError}, ${typeData}>`;
 
   const fnOptions = 'fnOptions';
 
@@ -103,29 +103,6 @@ export const createMutationOptions = ({
     });
   }
 
-  const mutationOptionsFn = 'mutationOptions';
-  const expression = tsc.arrowFunction({
-    parameters: [
-      {
-        isRequired: false,
-        name: 'options',
-        type: `Partial<${typeData}>`,
-      },
-    ],
-    returnType: mutationType,
-    statements: [
-      tsc.constVariable({
-        expression: tsc.objectExpression({
-          obj: mutationOptionsObj,
-        }),
-        name: mutationOptionsFn,
-        typeName: mutationType,
-      }),
-      tsc.returnVariable({
-        expression: mutationOptionsFn,
-      }),
-    ],
-  });
   const symbolMutationOptions = plugin.registerSymbol({
     exported: true,
     name: buildName({
@@ -138,7 +115,23 @@ export const createMutationOptions = ({
       ? createOperationComment({ operation })
       : undefined,
     exportConst: symbolMutationOptions.exported,
-    expression,
+    expression: tsc.arrowFunction({
+      parameters: [
+        {
+          isRequired: false,
+          name: 'options',
+          type: `Partial<${typeData}>`,
+        },
+      ],
+      returnType: mutationType,
+      statements: [
+        tsc.returnStatement({
+          expression: tsc.objectExpression({
+            obj: mutationOptionsObj,
+          }),
+        }),
+      ],
+    }),
     name: symbolMutationOptions.placeholder,
   });
   plugin.setSymbolValue(symbolMutationOptions, statement);

From 9f400c6c48f98b7014633b465f57f25f3ad89f03 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 18:15:14 +0300
Subject: [PATCH 09/13] chore: re-generated examples

---
 .../angular-query-experimental.gen.ts         | 337 ++++++----------
 .../openapi-ts.config.ts                      |   2 +-
 .../src/client/@tanstack/react-query.gen.ts   | 379 +++++++-----------
 .../src/client/@tanstack/svelte-query.gen.ts  | 337 ++++++----------
 .../src/client/@tanstack/vue-query.gen.ts     | 317 +++++----------
 5 files changed, 489 insertions(+), 883 deletions(-)

diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts
index b192327c9..af06613f2 100644
--- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts
+++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/@tanstack/angular-query-experimental.gen.ts
@@ -65,27 +65,16 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>,
-): MutationOptions<
-  { data: AddPetResponse; request: Request; response: Response },
-  DefaultError,
-  Options<AddPetData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: AddPetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<AddPetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await addPet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await addPet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Update an existing pet.
@@ -95,26 +84,19 @@ export const addPetMutation = (
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>,
 ): MutationOptions<
-  { data: UpdatePetResponse; request: Request; response: Response },
+  UpdatePetResponse,
   DefaultError,
   Options<UpdatePetData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: UpdatePetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export type QueryKey<TOptions extends Options> = [
   Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
@@ -210,27 +192,16 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeletePetData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeletePetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deletePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<DeletePetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deletePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getPetByIdQueryKey = (options: Options<GetPetByIdData>) =>
   createQueryKey('getPetById', options);
@@ -262,26 +233,19 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>,
 ): MutationOptions<
-  { data: UpdatePetWithFormResponse; request: Request; response: Response },
+  UpdatePetWithFormResponse,
   DefaultError,
   Options<UpdatePetWithFormData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: UpdatePetWithFormResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetWithFormData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePetWithForm({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePetWithForm({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Uploads an image.
@@ -291,26 +255,19 @@ export const updatePetWithFormMutation = (
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>,
 ): MutationOptions<
-  { data: UploadFileResponse; request: Request; response: Response },
+  UploadFileResponse,
   DefaultError,
   Options<UploadFileData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: UploadFileResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UploadFileData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await uploadFile({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getInventoryQueryKey = (options?: Options<GetInventoryData>) =>
   createQueryKey('getInventory', options);
@@ -342,26 +299,19 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>,
 ): MutationOptions<
-  { data: PlaceOrderResponse; request: Request; response: Response },
+  PlaceOrderResponse,
   DefaultError,
   Options<PlaceOrderData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: PlaceOrderResponse; request: Request; response: Response },
-    DefaultError,
-    Options<PlaceOrderData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await placeOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await placeOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Delete purchase order by identifier.
@@ -370,27 +320,16 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteOrderData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteOrderData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getOrderByIdQueryKey = (options: Options<GetOrderByIdData>) =>
   createQueryKey('getOrderById', options);
@@ -422,26 +361,19 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>,
 ): MutationOptions<
-  { data: CreateUserResponse; request: Request; response: Response },
+  CreateUserResponse,
   DefaultError,
   Options<CreateUserData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: CreateUserResponse; request: Request; response: Response },
-    DefaultError,
-    Options<CreateUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Creates list of users with given input array.
@@ -451,34 +383,19 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>,
 ): MutationOptions<
-  {
-    data: CreateUsersWithListInputResponse;
-    request: Request;
-    response: Response;
-  },
+  CreateUsersWithListInputResponse,
   DefaultError,
   Options<CreateUsersWithListInputData>
-> => {
-  const mutationOptions: MutationOptions<
-    {
-      data: CreateUsersWithListInputResponse;
-      request: Request;
-      response: Response;
-    },
-    DefaultError,
-    Options<CreateUsersWithListInputData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUsersWithListInput({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUsersWithListInput({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const loginUserQueryKey = (options?: Options<LoginUserData>) =>
   createQueryKey('loginUser', options);
@@ -531,27 +448,16 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteUserData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<DeleteUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getUserByNameQueryKey = (options: Options<GetUserByNameData>) =>
   createQueryKey('getUserByName', options);
@@ -582,24 +488,13 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<UpdateUserData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<UpdateUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updateUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<UpdateUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updateUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
diff --git a/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts b/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts
index 01350acf3..0fc4b15c1 100644
--- a/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts
+++ b/examples/openapi-ts-tanstack-react-query/openapi-ts.config.ts
@@ -11,7 +11,7 @@ export default defineConfig({
   plugins: [
     '@hey-api/client-fetch',
     '@hey-api/schemas',
-    { name: '@hey-api/sdk', responseStyle: 'response' },
+    '@hey-api/sdk',
     {
       enums: 'javascript',
       name: '@hey-api/typescript',
diff --git a/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts b/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts
index f67100b9c..3b93fdc92 100644
--- a/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts
+++ b/examples/openapi-ts-tanstack-react-query/src/client/@tanstack/react-query.gen.ts
@@ -65,25 +65,16 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>,
-): UseMutationOptions<
-  { data: AddPetResponse; request: Request; response: Response },
-  DefaultError,
-  Options<AddPetData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: AddPetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<AddPetData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await addPet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+): UseMutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await addPet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Update an existing pet.
@@ -93,24 +84,19 @@ export const addPetMutation = (
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>,
 ): UseMutationOptions<
-  { data: UpdatePetResponse; request: Request; response: Response },
+  UpdatePetResponse,
   DefaultError,
   Options<UpdatePetData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: UpdatePetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await updatePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export type QueryKey<TOptions extends Options> = [
   Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
@@ -165,13 +151,15 @@ export const findPetsByStatusOptions = (
   options: Options<FindPetsByStatusData>,
 ) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await findPetsByStatus({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await findPetsByStatus({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: findPetsByStatusQueryKey(options),
   });
 
@@ -185,13 +173,15 @@ export const findPetsByTagsQueryKey = (options: Options<FindPetsByTagsData>) =>
  */
 export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await findPetsByTags({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await findPetsByTags({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: findPetsByTagsQueryKey(options),
   });
 
@@ -202,25 +192,16 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>,
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeletePetData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeletePetData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await deletePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+): UseMutationOptions<unknown, DefaultError, Options<DeletePetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deletePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getPetByIdQueryKey = (options: Options<GetPetByIdData>) =>
   createQueryKey('getPetById', options);
@@ -232,13 +213,15 @@ export const getPetByIdQueryKey = (options: Options<GetPetByIdData>) =>
  */
 export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await getPetById({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await getPetById({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: getPetByIdQueryKey(options),
   });
 
@@ -250,24 +233,19 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>,
 ): UseMutationOptions<
-  { data: UpdatePetWithFormResponse; request: Request; response: Response },
+  UpdatePetWithFormResponse,
   DefaultError,
   Options<UpdatePetWithFormData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: UpdatePetWithFormResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetWithFormData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await updatePetWithForm({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePetWithForm({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Uploads an image.
@@ -277,24 +255,19 @@ export const updatePetWithFormMutation = (
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>,
 ): UseMutationOptions<
-  { data: UploadFileResponse; request: Request; response: Response },
+  UploadFileResponse,
   DefaultError,
   Options<UploadFileData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: UploadFileResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UploadFileData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await uploadFile({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getInventoryQueryKey = (options?: Options<GetInventoryData>) =>
   createQueryKey('getInventory', options);
@@ -306,13 +279,15 @@ export const getInventoryQueryKey = (options?: Options<GetInventoryData>) =>
  */
 export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await getInventory({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await getInventory({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: getInventoryQueryKey(options),
   });
 
@@ -324,24 +299,19 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>,
 ): UseMutationOptions<
-  { data: PlaceOrderResponse; request: Request; response: Response },
+  PlaceOrderResponse,
   DefaultError,
   Options<PlaceOrderData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: PlaceOrderResponse; request: Request; response: Response },
-    DefaultError,
-    Options<PlaceOrderData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await placeOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await placeOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Delete purchase order by identifier.
@@ -350,25 +320,16 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>,
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteOrderData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteOrderData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await deleteOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+): UseMutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getOrderByIdQueryKey = (options: Options<GetOrderByIdData>) =>
   createQueryKey('getOrderById', options);
@@ -380,13 +341,15 @@ export const getOrderByIdQueryKey = (options: Options<GetOrderByIdData>) =>
  */
 export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await getOrderById({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await getOrderById({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: getOrderByIdQueryKey(options),
   });
 
@@ -398,24 +361,19 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>,
 ): UseMutationOptions<
-  { data: CreateUserResponse; request: Request; response: Response },
+  CreateUserResponse,
   DefaultError,
   Options<CreateUserData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: CreateUserResponse; request: Request; response: Response },
-    DefaultError,
-    Options<CreateUserData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await createUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Creates list of users with given input array.
@@ -425,32 +383,19 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>,
 ): UseMutationOptions<
-  {
-    data: CreateUsersWithListInputResponse;
-    request: Request;
-    response: Response;
-  },
+  CreateUsersWithListInputResponse,
   DefaultError,
   Options<CreateUsersWithListInputData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    {
-      data: CreateUsersWithListInputResponse;
-      request: Request;
-      response: Response;
-    },
-    DefaultError,
-    Options<CreateUsersWithListInputData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await createUsersWithListInput({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUsersWithListInput({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const loginUserQueryKey = (options?: Options<LoginUserData>) =>
   createQueryKey('loginUser', options);
@@ -462,13 +407,15 @@ export const loginUserQueryKey = (options?: Options<LoginUserData>) =>
  */
 export const loginUserOptions = (options?: Options<LoginUserData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await loginUser({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await loginUser({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: loginUserQueryKey(options),
   });
 
@@ -482,13 +429,15 @@ export const logoutUserQueryKey = (options?: Options<LogoutUserData>) =>
  */
 export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await logoutUser({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await logoutUser({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: logoutUserQueryKey(options),
   });
 
@@ -499,25 +448,16 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>,
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteUserData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteUserData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await deleteUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+): UseMutationOptions<unknown, DefaultError, Options<DeleteUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getUserByNameQueryKey = (options: Options<GetUserByNameData>) =>
   createQueryKey('getUserByName', options);
@@ -529,13 +469,15 @@ export const getUserByNameQueryKey = (options: Options<GetUserByNameData>) =>
  */
 export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
   queryOptions({
-    queryFn: async ({ queryKey, signal }) =>
-      await getUserByName({
+    queryFn: async ({ queryKey, signal }) => {
+      const { data } = await getUserByName({
         ...options,
         ...queryKey[0],
         signal,
         throwOnError: true,
-      }),
+      });
+      return data;
+    },
     queryKey: getUserByNameQueryKey(options),
   });
 
@@ -546,22 +488,13 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>,
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<UpdateUserData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<UpdateUserData>
-  > = {
-    mutationFn: async (fnOptions) =>
-      await updateUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      }),
-  };
-  return mutationOptions;
-};
+): UseMutationOptions<unknown, DefaultError, Options<UpdateUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updateUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
diff --git a/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts b/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts
index db1d08924..2711efb3a 100644
--- a/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts
+++ b/examples/openapi-ts-tanstack-svelte-query/src/client/@tanstack/svelte-query.gen.ts
@@ -65,27 +65,16 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>,
-): MutationOptions<
-  { data: AddPetResponse; request: Request; response: Response },
-  DefaultError,
-  Options<AddPetData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: AddPetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<AddPetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await addPet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await addPet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Update an existing pet.
@@ -95,26 +84,19 @@ export const addPetMutation = (
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>,
 ): MutationOptions<
-  { data: UpdatePetResponse; request: Request; response: Response },
+  UpdatePetResponse,
   DefaultError,
   Options<UpdatePetData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: UpdatePetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export type QueryKey<TOptions extends Options> = [
   Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
@@ -210,27 +192,16 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeletePetData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeletePetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deletePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<DeletePetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deletePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getPetByIdQueryKey = (options: Options<GetPetByIdData>) =>
   createQueryKey('getPetById', options);
@@ -262,26 +233,19 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>,
 ): MutationOptions<
-  { data: UpdatePetWithFormResponse; request: Request; response: Response },
+  UpdatePetWithFormResponse,
   DefaultError,
   Options<UpdatePetWithFormData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: UpdatePetWithFormResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetWithFormData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePetWithForm({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePetWithForm({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Uploads an image.
@@ -291,26 +255,19 @@ export const updatePetWithFormMutation = (
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>,
 ): MutationOptions<
-  { data: UploadFileResponse; request: Request; response: Response },
+  UploadFileResponse,
   DefaultError,
   Options<UploadFileData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: UploadFileResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UploadFileData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await uploadFile({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getInventoryQueryKey = (options?: Options<GetInventoryData>) =>
   createQueryKey('getInventory', options);
@@ -342,26 +299,19 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>,
 ): MutationOptions<
-  { data: PlaceOrderResponse; request: Request; response: Response },
+  PlaceOrderResponse,
   DefaultError,
   Options<PlaceOrderData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: PlaceOrderResponse; request: Request; response: Response },
-    DefaultError,
-    Options<PlaceOrderData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await placeOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await placeOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Delete purchase order by identifier.
@@ -370,27 +320,16 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteOrderData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteOrderData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getOrderByIdQueryKey = (options: Options<GetOrderByIdData>) =>
   createQueryKey('getOrderById', options);
@@ -422,26 +361,19 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>,
 ): MutationOptions<
-  { data: CreateUserResponse; request: Request; response: Response },
+  CreateUserResponse,
   DefaultError,
   Options<CreateUserData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: CreateUserResponse; request: Request; response: Response },
-    DefaultError,
-    Options<CreateUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 /**
  * Creates list of users with given input array.
@@ -451,34 +383,19 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>,
 ): MutationOptions<
-  {
-    data: CreateUsersWithListInputResponse;
-    request: Request;
-    response: Response;
-  },
+  CreateUsersWithListInputResponse,
   DefaultError,
   Options<CreateUsersWithListInputData>
-> => {
-  const mutationOptions: MutationOptions<
-    {
-      data: CreateUsersWithListInputResponse;
-      request: Request;
-      response: Response;
-    },
-    DefaultError,
-    Options<CreateUsersWithListInputData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUsersWithListInput({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUsersWithListInput({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const loginUserQueryKey = (options?: Options<LoginUserData>) =>
   createQueryKey('loginUser', options);
@@ -531,27 +448,16 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteUserData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<DeleteUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
 
 export const getUserByNameQueryKey = (options: Options<GetUserByNameData>) =>
   createQueryKey('getUserByName', options);
@@ -582,24 +488,13 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>,
-): MutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<UpdateUserData>
-> => {
-  const mutationOptions: MutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<UpdateUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updateUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true,
-      });
-      return data;
-    },
-  };
-  return mutationOptions;
-};
+): MutationOptions<unknown, DefaultError, Options<UpdateUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updateUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true,
+    });
+    return data;
+  },
+});
diff --git a/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts b/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts
index 80aab83a4..27398fbe2 100644
--- a/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts
+++ b/examples/openapi-ts-tanstack-vue-query/src/client/@tanstack/vue-query.gen.ts
@@ -61,27 +61,16 @@ import type {
  */
 export const addPetMutation = (
   options?: Partial<Options<AddPetData>>
-): UseMutationOptions<
-  { data: AddPetResponse; request: Request; response: Response },
-  DefaultError,
-  Options<AddPetData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: AddPetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<AddPetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await addPet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<AddPetResponse, DefaultError, Options<AddPetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await addPet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 /**
  * Update an existing pet.
@@ -90,27 +79,16 @@ export const addPetMutation = (
  */
 export const updatePetMutation = (
   options?: Partial<Options<UpdatePetData>>
-): UseMutationOptions<
-  { data: UpdatePetResponse; request: Request; response: Response },
-  DefaultError,
-  Options<UpdatePetData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: UpdatePetResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<UpdatePetResponse, DefaultError, Options<UpdatePetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 export type QueryKey<TOptions extends Options> = [
   Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
@@ -202,27 +180,16 @@ export const findPetsByTagsOptions = (options: Options<FindPetsByTagsData>) =>
  */
 export const deletePetMutation = (
   options?: Partial<Options<DeletePetData>>
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeletePetData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeletePetData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deletePet({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<unknown, DefaultError, Options<DeletePetData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deletePet({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 export const getPetByIdQueryKey = (options: Options<GetPetByIdData>) =>
   createQueryKey('getPetById', options)
@@ -253,27 +220,16 @@ export const getPetByIdOptions = (options: Options<GetPetByIdData>) =>
  */
 export const updatePetWithFormMutation = (
   options?: Partial<Options<UpdatePetWithFormData>>
-): UseMutationOptions<
-  { data: UpdatePetWithFormResponse; request: Request; response: Response },
-  DefaultError,
-  Options<UpdatePetWithFormData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: UpdatePetWithFormResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UpdatePetWithFormData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updatePetWithForm({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<UpdatePetWithFormResponse, DefaultError, Options<UpdatePetWithFormData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updatePetWithForm({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 /**
  * Uploads an image.
@@ -282,27 +238,16 @@ export const updatePetWithFormMutation = (
  */
 export const uploadFileMutation = (
   options?: Partial<Options<UploadFileData>>
-): UseMutationOptions<
-  { data: UploadFileResponse; request: Request; response: Response },
-  DefaultError,
-  Options<UploadFileData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: UploadFileResponse; request: Request; response: Response },
-    DefaultError,
-    Options<UploadFileData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await uploadFile({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await uploadFile({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 export const getInventoryQueryKey = (options?: Options<GetInventoryData>) =>
   createQueryKey('getInventory', options)
@@ -333,27 +278,16 @@ export const getInventoryOptions = (options?: Options<GetInventoryData>) =>
  */
 export const placeOrderMutation = (
   options?: Partial<Options<PlaceOrderData>>
-): UseMutationOptions<
-  { data: PlaceOrderResponse; request: Request; response: Response },
-  DefaultError,
-  Options<PlaceOrderData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: PlaceOrderResponse; request: Request; response: Response },
-    DefaultError,
-    Options<PlaceOrderData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await placeOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<PlaceOrderResponse, DefaultError, Options<PlaceOrderData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await placeOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 /**
  * Delete purchase order by identifier.
@@ -362,27 +296,16 @@ export const placeOrderMutation = (
  */
 export const deleteOrderMutation = (
   options?: Partial<Options<DeleteOrderData>>
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteOrderData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteOrderData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteOrder({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<unknown, DefaultError, Options<DeleteOrderData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteOrder({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 export const getOrderByIdQueryKey = (options: Options<GetOrderByIdData>) =>
   createQueryKey('getOrderById', options)
@@ -413,27 +336,16 @@ export const getOrderByIdOptions = (options: Options<GetOrderByIdData>) =>
  */
 export const createUserMutation = (
   options?: Partial<Options<CreateUserData>>
-): UseMutationOptions<
-  { data: CreateUserResponse; request: Request; response: Response },
-  DefaultError,
-  Options<CreateUserData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: CreateUserResponse; request: Request; response: Response },
-    DefaultError,
-    Options<CreateUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<CreateUserResponse, DefaultError, Options<CreateUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 /**
  * Creates list of users with given input array.
@@ -443,26 +355,19 @@ export const createUserMutation = (
 export const createUsersWithListInputMutation = (
   options?: Partial<Options<CreateUsersWithListInputData>>
 ): UseMutationOptions<
-  { data: CreateUsersWithListInputResponse; request: Request; response: Response },
+  CreateUsersWithListInputResponse,
   DefaultError,
   Options<CreateUsersWithListInputData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: CreateUsersWithListInputResponse; request: Request; response: Response },
-    DefaultError,
-    Options<CreateUsersWithListInputData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await createUsersWithListInput({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await createUsersWithListInput({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 export const loginUserQueryKey = (options?: Options<LoginUserData>) =>
   createQueryKey('loginUser', options)
@@ -515,27 +420,16 @@ export const logoutUserOptions = (options?: Options<LogoutUserData>) =>
  */
 export const deleteUserMutation = (
   options?: Partial<Options<DeleteUserData>>
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<DeleteUserData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<DeleteUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await deleteUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<unknown, DefaultError, Options<DeleteUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await deleteUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})
 
 export const getUserByNameQueryKey = (options: Options<GetUserByNameData>) =>
   createQueryKey('getUserByName', options)
@@ -566,24 +460,13 @@ export const getUserByNameOptions = (options: Options<GetUserByNameData>) =>
  */
 export const updateUserMutation = (
   options?: Partial<Options<UpdateUserData>>
-): UseMutationOptions<
-  { data: unknown; request: Request; response: Response },
-  DefaultError,
-  Options<UpdateUserData>
-> => {
-  const mutationOptions: UseMutationOptions<
-    { data: unknown; request: Request; response: Response },
-    DefaultError,
-    Options<UpdateUserData>
-  > = {
-    mutationFn: async (fnOptions) => {
-      const { data } = await updateUser({
-        ...options,
-        ...fnOptions,
-        throwOnError: true
-      })
-      return data
-    }
+): UseMutationOptions<unknown, DefaultError, Options<UpdateUserData>> => ({
+  mutationFn: async (fnOptions) => {
+    const { data } = await updateUser({
+      ...options,
+      ...fnOptions,
+      throwOnError: true
+    })
+    return data
   }
-  return mutationOptions
-}
+})

From e3cb6e97c32abcdbdcf8710a25b40b327ec8eccd Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Wed, 5 Nov 2025 18:45:42 +0300
Subject: [PATCH 10/13] chore: updated snapshots

---
 .../client/types.gen.ts                       |  2 +-
 .../2.0.x/form-data/client/types.gen.ts       |  2 +-
 .../common/default-class/client/types.gen.ts  |  2 +-
 .../common/default/client/types.gen.ts        |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../sdk-nested-classes/client/types.gen.ts    |  2 +-
 .../@hey-api/sdk/default/client/types.gen.ts  |  2 +-
 .../@hey-api/sdk/instance/client/types.gen.ts |  2 +-
 .../sdk/throwOnError/client/types.gen.ts      |  2 +-
 .../type-format-valibot/client/types.gen.ts   |  2 +-
 .../type-format-zod/client/types.gen.ts       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../@pinia/colada/asClass/client/types.gen.ts |  2 +-
 .../@pinia/colada/fetch/client/types.gen.ts   |  2 +-
 .../angular-query-experimental.gen.ts         | 12 +--
 .../asClass/client/types.gen.ts               |  2 +-
 .../angular-query-experimental.gen.ts         | 60 +++++--------
 .../angular-query-experimental.gen.ts         | 60 +++++--------
 .../fetch/client/types.gen.ts                 |  2 +-
 .../angular-query-experimental.gen.ts         | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/react-query.gen.ts      | 12 +--
 .../react-query/asClass/client/types.gen.ts   |  2 +-
 .../axios/@tanstack/react-query.gen.ts        | 60 +++++--------
 .../fetch/@tanstack/react-query.gen.ts        | 60 +++++--------
 .../react-query/fetch/client/types.gen.ts     |  2 +-
 .../name-builder/@tanstack/react-query.gen.ts | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/solid-query.gen.ts      | 12 +--
 .../solid-query/asClass/client/types.gen.ts   |  2 +-
 .../axios/@tanstack/solid-query.gen.ts        | 60 +++++--------
 .../fetch/@tanstack/solid-query.gen.ts        | 60 +++++--------
 .../solid-query/fetch/client/types.gen.ts     |  2 +-
 .../name-builder/@tanstack/solid-query.gen.ts | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/svelte-query.gen.ts     | 12 +--
 .../svelte-query/asClass/client/types.gen.ts  |  2 +-
 .../axios/@tanstack/svelte-query.gen.ts       | 60 +++++--------
 .../fetch/@tanstack/svelte-query.gen.ts       | 60 +++++--------
 .../svelte-query/fetch/client/types.gen.ts    |  2 +-
 .../@tanstack/svelte-query.gen.ts             | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/vue-query.gen.ts        | 12 +--
 .../vue-query/asClass/client/types.gen.ts     |  2 +-
 .../axios/@tanstack/vue-query.gen.ts          | 60 +++++--------
 .../fetch/@tanstack/vue-query.gen.ts          | 60 +++++--------
 .../vue-query/fetch/client/types.gen.ts       |  2 +-
 .../name-builder/@tanstack/vue-query.gen.ts   | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../2.0.x/schema-unknown/client/types.gen.ts  |  2 +-
 .../security-api-key/client/types.gen.ts      |  2 +-
 .../2.0.x/security-basic/client/types.gen.ts  |  2 +-
 .../2.0.x/security-false/client/types.gen.ts  |  2 +-
 .../2.0.x/security-oauth2/client/types.gen.ts |  2 +-
 .../servers-base-path/client/types.gen.ts     |  2 +-
 .../2.0.x/servers-host/client/types.gen.ts    |  2 +-
 .../2.0.x/servers/client/types.gen.ts         |  2 +-
 .../transforms-read-write/client/types.gen.ts |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../@tanstack/react-query.gen.ts              |  6 +-
 .../client/types.gen.ts                       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../common/default-class/client/types.gen.ts  |  2 +-
 .../common/default/client/types.gen.ts        |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../sdk-nested-classes/client/types.gen.ts    |  2 +-
 .../@hey-api/sdk/default/client/types.gen.ts  |  2 +-
 .../@hey-api/sdk/instance/client/types.gen.ts |  2 +-
 .../sdk/throwOnError/client/types.gen.ts      |  2 +-
 .../type-format-valibot/client/types.gen.ts   |  2 +-
 .../type-format-zod/client/types.gen.ts       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../@pinia/colada/asClass/client/types.gen.ts |  2 +-
 .../@pinia/colada/fetch/client/types.gen.ts   |  2 +-
 .../angular-query-experimental.gen.ts         | 12 +--
 .../asClass/client/types.gen.ts               |  2 +-
 .../angular-query-experimental.gen.ts         | 87 +++++++------------
 .../angular-query-experimental.gen.ts         | 87 +++++++------------
 .../fetch/client/types.gen.ts                 |  2 +-
 .../angular-query-experimental.gen.ts         | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/react-query.gen.ts      | 12 +--
 .../react-query/asClass/client/types.gen.ts   |  2 +-
 .../axios/@tanstack/react-query.gen.ts        | 87 +++++++------------
 .../fetch/@tanstack/react-query.gen.ts        | 87 +++++++------------
 .../react-query/fetch/client/types.gen.ts     |  2 +-
 .../name-builder/@tanstack/react-query.gen.ts | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/solid-query.gen.ts      | 12 +--
 .../solid-query/asClass/client/types.gen.ts   |  2 +-
 .../axios/@tanstack/solid-query.gen.ts        | 87 +++++++------------
 .../fetch/@tanstack/solid-query.gen.ts        | 87 +++++++------------
 .../solid-query/fetch/client/types.gen.ts     |  2 +-
 .../name-builder/@tanstack/solid-query.gen.ts | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/svelte-query.gen.ts     | 12 +--
 .../svelte-query/asClass/client/types.gen.ts  |  2 +-
 .../axios/@tanstack/svelte-query.gen.ts       | 87 +++++++------------
 .../fetch/@tanstack/svelte-query.gen.ts       | 87 +++++++------------
 .../svelte-query/fetch/client/types.gen.ts    |  2 +-
 .../@tanstack/svelte-query.gen.ts             | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/vue-query.gen.ts        | 12 +--
 .../vue-query/asClass/client/types.gen.ts     |  2 +-
 .../axios/@tanstack/vue-query.gen.ts          | 87 +++++++------------
 .../fetch/@tanstack/vue-query.gen.ts          | 87 +++++++------------
 .../vue-query/fetch/client/types.gen.ts       |  2 +-
 .../name-builder/@tanstack/vue-query.gen.ts   | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../security-api-key/client/types.gen.ts      |  2 +-
 .../3.0.x/security-false/client/types.gen.ts  |  2 +-
 .../security-http-bearer/client/types.gen.ts  |  2 +-
 .../3.0.x/security-oauth2/client/types.gen.ts |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../3.0.x/servers/client/types.gen.ts         |  2 +-
 .../transformers-all-of/client/types.gen.ts   |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../transformers-array/client/types.gen.ts    |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../transforms-read-write/client/types.gen.ts |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../base-url-false/client/types.gen.ts        |  2 +-
 .../base-url-number/client/types.gen.ts       |  2 +-
 .../base-url-strict/client/types.gen.ts       |  2 +-
 .../base-url-string/client/types.gen.ts       |  2 +-
 .../clean-false/client/types.gen.ts           |  2 +-
 .../client-fetch/default/client/types.gen.ts  |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../sdk-client-optional/client/types.gen.ts   |  2 +-
 .../sdk-client-required/client/types.gen.ts   |  2 +-
 .../tsconfig-nodenext-sdk/client/types.gen.ts |  2 +-
 .../base-url-false/client/types.gen.ts        |  2 +-
 .../base-url-number/client/types.gen.ts       |  2 +-
 .../base-url-strict/client/types.gen.ts       |  2 +-
 .../base-url-string/client/types.gen.ts       |  2 +-
 .../clean-false/client/types.gen.ts           |  2 +-
 .../client-ofetch/default/client/types.gen.ts |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../sdk-client-optional/client/types.gen.ts   |  2 +-
 .../sdk-client-required/client/types.gen.ts   |  2 +-
 .../tsconfig-nodenext-sdk/client/types.gen.ts |  2 +-
 .../3.1.x/headers/client/types.gen.ts         |  2 +-
 .../@tanstack/react-query.gen.ts              |  6 +-
 .../client/types.gen.ts                       |  2 +-
 .../@tanstack/react-query.gen.ts              |  3 +-
 .../3.1.x/pagination-ref/client/types.gen.ts  |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../common/default-class/client/types.gen.ts  |  2 +-
 .../common/default/client/types.gen.ts        |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../sdk-nested-classes/client/types.gen.ts    |  2 +-
 .../@hey-api/sdk/default/client/types.gen.ts  |  2 +-
 .../@hey-api/sdk/instance/client/types.gen.ts |  2 +-
 .../sdk/throwOnError/client/types.gen.ts      |  2 +-
 .../type-format-valibot/client/types.gen.ts   |  2 +-
 .../type-format-zod/client/types.gen.ts       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../@pinia/colada/asClass/client/types.gen.ts |  2 +-
 .../@pinia/colada/fetch/client/types.gen.ts   |  2 +-
 .../angular-query-experimental.gen.ts         | 12 +--
 .../asClass/client/types.gen.ts               |  2 +-
 .../angular-query-experimental.gen.ts         | 87 +++++++------------
 .../angular-query-experimental.gen.ts         | 87 +++++++------------
 .../fetch/client/types.gen.ts                 |  2 +-
 .../angular-query-experimental.gen.ts         | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/react-query.gen.ts      | 12 +--
 .../react-query/asClass/client/types.gen.ts   |  2 +-
 .../axios/@tanstack/react-query.gen.ts        | 87 +++++++------------
 .../fetch/@tanstack/react-query.gen.ts        | 87 +++++++------------
 .../react-query/fetch/client/types.gen.ts     |  2 +-
 .../name-builder/@tanstack/react-query.gen.ts | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/solid-query.gen.ts      | 12 +--
 .../solid-query/asClass/client/types.gen.ts   |  2 +-
 .../axios/@tanstack/solid-query.gen.ts        | 87 +++++++------------
 .../fetch/@tanstack/solid-query.gen.ts        | 87 +++++++------------
 .../solid-query/fetch/client/types.gen.ts     |  2 +-
 .../name-builder/@tanstack/solid-query.gen.ts | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/svelte-query.gen.ts     | 12 +--
 .../svelte-query/asClass/client/types.gen.ts  |  2 +-
 .../axios/@tanstack/svelte-query.gen.ts       | 87 +++++++------------
 .../fetch/@tanstack/svelte-query.gen.ts       | 87 +++++++------------
 .../svelte-query/fetch/client/types.gen.ts    |  2 +-
 .../@tanstack/svelte-query.gen.ts             | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../asClass/@tanstack/vue-query.gen.ts        | 12 +--
 .../vue-query/asClass/client/types.gen.ts     |  2 +-
 .../axios/@tanstack/vue-query.gen.ts          | 87 +++++++------------
 .../fetch/@tanstack/vue-query.gen.ts          | 87 +++++++------------
 .../vue-query/fetch/client/types.gen.ts       |  2 +-
 .../name-builder/@tanstack/vue-query.gen.ts   | 12 +--
 .../name-builder/client/types.gen.ts          |  2 +-
 .../security-api-key/client/types.gen.ts      |  2 +-
 .../3.1.x/security-false/client/types.gen.ts  |  2 +-
 .../security-http-bearer/client/types.gen.ts  |  2 +-
 .../3.1.x/security-oauth2/client/types.gen.ts |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../3.1.x/servers/client/types.gen.ts         |  2 +-
 .../3.1.x/sse-angular/client/types.gen.ts     |  2 +-
 .../3.1.x/sse-fetch/client/types.gen.ts       |  2 +-
 .../3.1.x/sse-ofetch/client/types.gen.ts      |  2 +-
 .../transformers-all-of/client/types.gen.ts   |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../transformers-array/client/types.gen.ts    |  2 +-
 .../client/types.gen.ts                       |  2 +-
 .../transforms-read-write/client/types.gen.ts |  2 +-
 .../@tanstack/meta/client/types.gen.ts        |  2 +-
 .../class/client/types.gen.ts                 |  2 +-
 .../flat/client/types.gen.ts                  |  2 +-
 .../instance/client/types.gen.ts              |  2 +-
 .../opencode/flat/client/types.gen.ts         |  2 +-
 .../opencode/grouped/client/types.gen.ts      |  2 +-
 217 files changed, 1059 insertions(+), 1964 deletions(-)

diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/body-response-text-plain/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/form-data/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 1535d0aad..864b124ad 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 d2570ea44..61dbe0056 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
@@ -60,7 +60,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -84,11 +83,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -98,7 +96,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -119,7 +116,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -129,11 +126,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -143,11 +139,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -157,11 +152,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -171,11 +165,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -185,11 +178,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -199,7 +191,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -220,7 +211,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -230,11 +221,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -244,11 +234,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -258,7 +247,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -279,7 +267,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -289,11 +277,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -303,7 +290,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -392,7 +378,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -402,11 +388,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -416,7 +401,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -471,7 +455,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -481,11 +465,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -495,11 +478,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -509,7 +491,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -518,7 +499,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * 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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -528,5 +509,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             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 c90738b7e..2548261fa 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
@@ -59,7 +59,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -83,11 +82,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -97,7 +95,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -118,7 +115,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -128,11 +125,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -142,11 +138,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -156,11 +151,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -170,11 +164,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -184,11 +177,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -198,7 +190,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -219,7 +210,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -229,11 +220,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -243,11 +233,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -257,7 +246,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -278,7 +266,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -288,11 +276,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -302,7 +289,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -391,7 +377,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -401,11 +387,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -415,7 +400,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -470,7 +454,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -480,11 +464,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -494,11 +477,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -508,7 +490,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -517,7 +498,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * Body should not be unknown
  */
 export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
-    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -527,5 +508,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 cb1e4e215..ecd910cc9 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 d5a4b2cef..47a372e8e 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Us
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 2ce85c986..b0352003b 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
@@ -60,7 +60,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -84,11 +83,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -98,7 +96,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -119,7 +116,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -129,11 +126,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -143,11 +139,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -157,11 +152,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -171,11 +165,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -185,11 +178,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -199,7 +191,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -220,7 +211,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -230,11 +221,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -244,11 +234,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -258,7 +247,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -279,7 +267,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -289,11 +277,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -303,7 +290,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -392,7 +378,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -402,11 +388,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -416,7 +401,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -471,7 +455,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -481,11 +465,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -495,11 +478,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -509,7 +491,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -518,7 +499,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * 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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -528,5 +509,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             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 808afc886..c9267498a 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
@@ -59,7 +59,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -83,11 +82,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -97,7 +95,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -118,7 +115,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -128,11 +125,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -142,11 +138,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -156,11 +151,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -170,11 +164,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -184,11 +177,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -198,7 +190,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -219,7 +210,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -229,11 +220,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -243,11 +233,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -257,7 +246,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -278,7 +266,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -288,11 +276,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -302,7 +289,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -391,7 +377,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -401,11 +387,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -415,7 +400,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -470,7 +454,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -480,11 +464,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -494,11 +477,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -508,7 +490,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -517,7 +498,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * Body should not be unknown
  */
 export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
-    const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -527,5 +508,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 3df5874d3..2da666ee3 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOpti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMuta
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutati
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 30684c0f1..d46ab8945 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 1c3762af0..c4603bc87 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
@@ -60,7 +60,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -84,11 +83,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -98,7 +96,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -119,7 +116,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -129,11 +126,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -143,11 +139,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -157,11 +152,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -171,11 +165,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -185,11 +178,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -199,7 +191,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -220,7 +211,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -230,11 +221,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -244,11 +234,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -258,7 +247,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -279,7 +267,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -289,11 +277,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -303,7 +290,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -392,7 +378,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -402,11 +388,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -416,7 +401,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -471,7 +455,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -481,11 +465,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -495,11 +478,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -509,7 +491,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -518,7 +499,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * 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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -528,5 +509,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             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 b297ca035..d233b493f 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
@@ -59,7 +59,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -83,11 +82,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -97,7 +95,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -118,7 +115,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -128,11 +125,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -142,11 +138,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -156,11 +151,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -170,11 +164,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -184,11 +177,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -198,7 +190,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -219,7 +210,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -229,11 +220,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -243,11 +233,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -257,7 +246,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -278,7 +266,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -288,11 +276,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -302,7 +289,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -391,7 +377,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -401,11 +387,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -415,7 +400,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -470,7 +454,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -480,11 +464,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -494,11 +477,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -508,7 +490,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -517,7 +498,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * Body should not be unknown
  */
 export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
-    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -527,5 +508,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 a289b331f..11d0f0942 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 91cbc9932..f9f26508b 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e3d5e0972..08af3e212 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
@@ -60,7 +60,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -84,11 +83,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -98,7 +96,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -119,7 +116,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -129,11 +126,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -143,11 +139,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -157,11 +152,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -171,11 +165,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -185,11 +178,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -199,7 +191,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -220,7 +211,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -230,11 +221,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -244,11 +234,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -258,7 +247,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -279,7 +267,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -289,11 +277,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -303,7 +290,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -392,7 +378,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -402,11 +388,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -416,7 +401,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -471,7 +455,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -481,11 +465,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -495,11 +478,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -509,7 +491,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -518,7 +499,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * 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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -528,5 +509,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             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 20d2aaa0c..f2b3cde5f 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
@@ -59,7 +59,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -83,11 +82,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -97,7 +95,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -118,7 +115,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -128,11 +125,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -142,11 +138,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -156,11 +151,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -170,11 +164,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -184,11 +177,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -198,7 +190,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -219,7 +210,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -229,11 +220,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -243,11 +233,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -257,7 +246,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -278,7 +266,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -288,11 +276,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -302,7 +289,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -391,7 +377,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -401,11 +387,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -415,7 +400,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -470,7 +454,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -480,11 +464,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -494,11 +477,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -508,7 +490,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -517,7 +498,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * Body should not be unknown
  */
 export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
-    const mutationOptions: MutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -527,5 +508,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e1c24e597..f04649685 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e86035920..27731c8b5 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Us
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 7cef0e722..93dfe03c1 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
@@ -60,7 +60,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -84,11 +83,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -98,7 +96,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -119,7 +116,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -129,11 +126,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -143,11 +139,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -157,11 +152,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -171,11 +165,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -185,11 +178,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -199,7 +191,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -220,7 +211,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -230,11 +221,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -244,11 +234,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -258,7 +247,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -279,7 +267,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -289,11 +277,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -303,7 +290,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -392,7 +378,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -402,11 +388,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -416,7 +401,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -471,7 +455,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -481,11 +465,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -495,11 +478,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -509,7 +491,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -518,7 +499,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * 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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -528,5 +509,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             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 cb29f6d75..9c9fe30f2 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
@@ -59,7 +59,7 @@ export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTag
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -83,11 +82,10 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -97,7 +95,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -118,7 +115,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -128,11 +125,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -142,11 +138,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -156,11 +151,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -170,11 +164,10 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -184,11 +177,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -198,7 +190,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -219,7 +210,7 @@ export const callWithDefaultParametersOptions = (options: Options<CallWithDefaul
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -229,11 +220,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -243,11 +233,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -257,7 +246,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -278,7 +266,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -288,11 +276,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -302,7 +289,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -391,7 +377,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -401,11 +387,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -415,7 +400,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -470,7 +454,7 @@ export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -480,11 +464,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -494,11 +477,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -508,7 +490,6 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
@@ -517,7 +498,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  * Body should not be unknown
  */
 export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
-    const mutationOptions: UseMutationOptions<PostApiVbyApiVersionBodyResponse, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionBody({
                 ...options,
@@ -527,5 +508,4 @@ export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostA
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 598b39c93..df228bd30 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOpti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMuta
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutati
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/schema-unknown/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-api-key/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-basic/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/security-oauth2/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-base-path/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers-host/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/servers/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/transforms-read-write/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/body-response-text-plain/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 ea7daa0ee..fa34ca686 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
@@ -59,7 +59,7 @@ export const createOptions = (options?: Options<CreateData>) => {
 };
 
 export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMutationOptions<unknown, DefaultError, Options<Create2Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create2Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await create2({
                 ...options,
@@ -69,11 +69,10 @@ export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMutationOptions<unknown, DefaultError, Options<Create3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await create3({
                 ...options,
@@ -83,5 +82,4 @@ export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/internal-name-conflict/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/parameter-explode-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/default/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 1535d0aad..864b124ad 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 bc018d680..5c1562bb3 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 96d6c3dac..4c4c15cfb 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 cb1e4e215..ecd910cc9 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 d5a4b2cef..47a372e8e 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Us
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 9a9734b9f..6f70fa5c6 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 d23244127..c817f3d99 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 3df5874d3..2da666ee3 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOpti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMuta
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutati
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 30684c0f1..d46ab8945 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 f5572bc65..4c689b4b8 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 f1d12d214..e6db7535f 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 a289b331f..11d0f0942 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 91cbc9932..f9f26508b 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 32b1482ee..86c35de58 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 848a8a56d..1de8d6559 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e1c24e597..f04649685 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e86035920..27731c8b5 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Us
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 58e3144db..03f4966a7 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 706e8a224..e0276691c 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 598b39c93..df228bd30 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOpti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMuta
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutati
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-api-key/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-http-bearer/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-oauth2/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/security-open-id-connect/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/servers/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-all-of/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-any-of-null/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-array/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transformers-recursive/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/transforms-read-write/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/body-response-text-plain/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-number/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-strict/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/base-url-string/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/clean-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/default/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/types.gen.ts
index ce67386ca..f6ef4e708 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/import-file-extension-ts/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen.ts';
 import type { Middleware } from './utils.gen.ts';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-optional/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/sdk-client-required/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/types.gen.ts
index 21c8ee1fb..f1c8bc710 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-fetch/tsconfig-nodenext-sdk/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen.js';
 import type { Middleware } from './utils.gen.js';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-false/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-number/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-strict/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/base-url-string/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/clean-false/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/default/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/types.gen.ts
index e163e0882..ee18efce5 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/import-file-extension-ts/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen.ts';
 import type { Middleware } from './utils.gen.ts';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-optional/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/sdk-client-required/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/types.gen.ts
index 067e3d14d..d1cdb6cdb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-ofetch/tsconfig-nodenext-sdk/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen.js';
 import type { Middleware } from './utils.gen.js';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/headers/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 ea7daa0ee..fa34ca686 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
@@ -59,7 +59,7 @@ export const createOptions = (options?: Options<CreateData>) => {
 };
 
 export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMutationOptions<unknown, DefaultError, Options<Create2Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create2Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await create2({
                 ...options,
@@ -69,11 +69,10 @@ export const create2Mutation = (options?: Partial<Options<Create2Data>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMutationOptions<unknown, DefaultError, Options<Create3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<Create3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await create3({
                 ...options,
@@ -83,5 +82,4 @@ export const create3Mutation = (options?: Partial<Options<Create3Data>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/internal-name-conflict/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 f734d9b10..8e7a59d97 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
@@ -116,7 +116,7 @@ export const getFooInfiniteOptions = (options: Options<GetFooData>) => {
 };
 
 export const postFooMutation = (options?: Partial<Options<PostFooData>>): UseMutationOptions<unknown, DefaultError, Options<PostFooData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostFooData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postFoo({
                 ...options,
@@ -126,5 +126,4 @@ export const postFooMutation = (options?: Partial<Options<PostFooData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/pagination-ref/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/parameter-explode-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes-instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/client-fetch/sdk-nested-classes/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/default/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/sdk/throwOnError/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-valibot/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/transformers/type-format-zod/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-custom-name/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@hey-api/typescript/transforms-read-write-ignore/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 1535d0aad..864b124ad 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 bc018d680..5c1562bb3 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 96d6c3dac..4c4c15cfb 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 cb1e4e215..ecd910cc9 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/angular-query-experimental/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 d5a4b2cef..47a372e8e 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Us
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 9a9734b9f..6f70fa5c6 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 d23244127..c817f3d99 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 3df5874d3..2da666ee3 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOpti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMuta
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutati
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 30684c0f1..d46ab8945 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 f5572bc65..4c689b4b8 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 f1d12d214..e6db7535f 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 a289b331f..11d0f0942 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/solid-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 91cbc9932..f9f26508b 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): Mutati
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Mu
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 32b1482ee..86c35de58 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 848a8a56d..1de8d6559 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): MutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: MutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): MutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): Mutation
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): M
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: MutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: MutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: MutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: MutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: MutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e1c24e597..f04649685 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: MutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): MutationOptio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: MutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): MutationOptions
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: MutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): Mutatio
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: MutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): MutationO
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/svelte-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 e86035920..27731c8b5 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
@@ -59,7 +59,7 @@ export const getFooOptions = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.post({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostMutation = (options?: Partial<Options<FooPostData>>): UseMut
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.put({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutMutation = (options?: Partial<Options<FooPutData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarQueryKey = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarOptions = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.post({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostMutation = (options?: Partial<Options<FooBarPostData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await FooBazService.fooService.barService.put({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutMutation = (options?: Partial<Options<FooBarPutData>>): Us
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/asClass/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 58e3144db..03f4966a7 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
@@ -60,7 +60,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -70,11 +70,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -84,11 +83,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -98,7 +96,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -136,7 +133,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -146,7 +143,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -167,7 +163,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -177,11 +173,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -191,11 +186,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -205,11 +199,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -219,11 +212,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -233,14 +225,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -250,11 +241,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -264,11 +254,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -278,7 +267,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -356,7 +344,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, AxiosError<DefaultError>, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -366,11 +354,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -380,11 +367,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -394,7 +380,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -415,7 +400,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -425,11 +410,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -439,11 +423,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -453,7 +436,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -474,7 +456,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -484,11 +466,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -498,7 +479,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -587,7 +567,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, AxiosError<CallWithDuplicateResponsesError>, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -597,11 +577,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -611,7 +590,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -649,7 +627,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, AxiosError<DefaultError>, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -659,7 +637,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -714,7 +691,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, AxiosError<DefaultError>, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -724,11 +701,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -738,11 +714,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -752,11 +727,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -766,11 +740,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -780,14 +753,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -797,5 +769,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             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 706e8a224..e0276691c 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
@@ -59,7 +59,7 @@ export const exportOptions = (options?: Options<ExportData>) => {
 };
 
 export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchApiVbyApiVersionNoTag({
                 ...options,
@@ -69,11 +69,10 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> => {
-    const mutationOptions: UseMutationOptions<ImportResponse, DefaultError, Options<ImportData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await import_({
                 ...options,
@@ -83,11 +82,10 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, DefaultError, Options<FooWowData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<FooWowData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooWow({
                 ...options,
@@ -97,7 +95,6 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
@@ -135,7 +132,7 @@ export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetAp
 };
 
 export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteCallWithoutParametersAndResponse({
                 ...options,
@@ -145,7 +142,6 @@ export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
@@ -166,7 +162,7 @@ export const getCallWithoutParametersAndResponseOptions = (options?: Options<Get
 };
 
 export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await patchCallWithoutParametersAndResponse({
                 ...options,
@@ -176,11 +172,10 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithoutParametersAndResponse({
                 ...options,
@@ -190,11 +185,10 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PutCallWithoutParametersAndResponseData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putCallWithoutParametersAndResponse({
                 ...options,
@@ -204,11 +198,10 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeleteFooData3>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deleteFoo({
                 ...options,
@@ -218,11 +211,10 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDescriptionsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDescriptions({
                 ...options,
@@ -232,14 +224,13 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 /**
  * @deprecated
  */
 export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DeprecatedCallData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await deprecatedCall({
                 ...options,
@@ -249,11 +240,10 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithParameters({
                 ...options,
@@ -263,11 +253,10 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithWeirdParameterNamesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithWeirdParameterNames({
                 ...options,
@@ -277,7 +266,6 @@ export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<Ca
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
@@ -355,7 +343,7 @@ export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCall
 };
 
 export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> => {
-    const mutationOptions: UseMutationOptions<PostCallWithOptionalParamResponse, DefaultError, Options<PostCallWithOptionalParamData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postCallWithOptionalParam({
                 ...options,
@@ -365,11 +353,10 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionRequestBody({
                 ...options,
@@ -379,11 +366,10 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<PostApiVbyApiVersionFormDataData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await postApiVbyApiVersionFormData({
                 ...options,
@@ -393,7 +379,6 @@ export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<P
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
@@ -414,7 +399,7 @@ export const callWithDefaultParametersOptions = (options?: Options<CallWithDefau
 };
 
 export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithDefaultOptionalParametersData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDefaultOptionalParameters({
                 ...options,
@@ -424,11 +409,10 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallToTestOrderOfParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callToTestOrderOfParams({
                 ...options,
@@ -438,11 +422,10 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateNameData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName({
                 ...options,
@@ -452,7 +435,6 @@ export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
@@ -473,7 +455,7 @@ export const duplicateName2Options = (options?: Options<DuplicateName2Data>) =>
 };
 
 export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName3Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName3({
                 ...options,
@@ -483,11 +465,10 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<DuplicateName4Data>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await duplicateName4({
                 ...options,
@@ -497,7 +478,6 @@ export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4D
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
@@ -586,7 +566,7 @@ export const callWithResponseOptions = (options?: Options<CallWithResponseData>)
 };
 
 export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithDuplicateResponsesResponse, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithDuplicateResponses({
                 ...options,
@@ -596,11 +576,10 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> => {
-    const mutationOptions: UseMutationOptions<CallWithResponsesResponse, CallWithResponsesError, Options<CallWithResponsesData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResponses({
                 ...options,
@@ -610,7 +589,6 @@ export const callWithResponsesMutation = (options?: Partial<Options<CallWithResp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
@@ -648,7 +626,7 @@ export const typesOptions = (options: Options<TypesData>) => {
 };
 
 export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> => {
-    const mutationOptions: UseMutationOptions<UploadFileResponse, DefaultError, Options<UploadFileData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await uploadFile({
                 ...options,
@@ -658,7 +636,6 @@ export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>):
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
@@ -713,7 +690,7 @@ export const multipartResponseOptions = (options?: Options<MultipartResponseData
 };
 
 export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<MultipartRequestData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await multipartRequest({
                 ...options,
@@ -723,11 +700,10 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> => {
-    const mutationOptions: UseMutationOptions<ComplexParamsResponse, DefaultError, Options<ComplexParamsData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await complexParams({
                 ...options,
@@ -737,11 +713,10 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<CallWithResultFromHeaderData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await callWithResultFromHeader({
                 ...options,
@@ -751,11 +726,10 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> => {
-    const mutationOptions: UseMutationOptions<unknown, DefaultError, Options<TestErrorCodeData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await testErrorCode({
                 ...options,
@@ -765,11 +739,10 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await nonAsciiæøåÆøÅöôêÊ字符串({
                 ...options,
@@ -779,14 +752,13 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
             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>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await putWithFormUrlEncoded({
                 ...options,
@@ -796,5 +768,4 @@ export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithF
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
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 598b39c93..df228bd30 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
@@ -59,7 +59,7 @@ export const getFooE = (options?: Options<GetFooData>) => {
 };
 
 export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> => {
-    const mutationOptions: UseMutationOptions<FooPostResponse, DefaultError, Options<FooPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPost({
                 ...options,
@@ -69,11 +69,10 @@ export const fooPostC = (options?: Partial<Options<FooPostData>>): UseMutationOp
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> => {
-    const mutationOptions: UseMutationOptions<FooPutResponse, DefaultError, Options<FooPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooPut({
                 ...options,
@@ -83,7 +82,6 @@ export const fooPutC = (options?: Partial<Options<FooPutData>>): UseMutationOpti
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const getFooBarD = (options?: Options<GetFooBarData>) => createQueryKey('getFooBar', options);
@@ -104,7 +102,7 @@ export const getFooBarE = (options?: Options<GetFooBarData>) => {
 };
 
 export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPostResponse, DefaultError, Options<FooBarPostData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPost({
                 ...options,
@@ -114,11 +112,10 @@ export const fooBarPostC = (options?: Partial<Options<FooBarPostData>>): UseMuta
             return data;
         }
     };
-    return mutationOptions;
 };
 
 export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> => {
-    const mutationOptions: UseMutationOptions<FooBarPutResponse, DefaultError, Options<FooBarPutData>> = {
+    return {
         mutationFn: async (fnOptions) => {
             const { data } = await fooBarPut({
                 ...options,
@@ -128,5 +125,4 @@ export const fooBarPutC = (options?: Partial<Options<FooBarPutData>>): UseMutati
             return data;
         }
     };
-    return mutationOptions;
 };
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/name-builder/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-api-key/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-false/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-http-bearer/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-oauth2/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/security-open-id-connect/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/servers/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/types.gen.ts
index c7b4e2e12..327ac212d 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/types.gen.ts
@@ -20,7 +20,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-fetch/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/types.gen.ts
index 76d3c1c36..b63f12d1b 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-ofetch/client/types.gen.ts
@@ -17,7 +17,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-all-of/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-any-of-null/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-array/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transformers-recursive/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/transforms-read-write/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/plugins/@tanstack/meta/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/types.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/types.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/class/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/types.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/types.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/flat/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/types.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/types.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/method-class-conflict/instance/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/types.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/types.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/flat/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
diff --git a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/types.gen.ts b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/types.gen.ts
index b4a499cc0..3660071f7 100644
--- a/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/types.gen.ts
+++ b/packages/openapi-ts-tests/sdks/__snapshots__/opencode/grouped/client/types.gen.ts
@@ -11,7 +11,7 @@ import type {
 } from '../core/types.gen';
 import type { Middleware } from './utils.gen';
 
-export type ResponseStyle = 'data' | 'fields';
+export type ResponseStyle = 'data' | 'fields' | 'response';
 
 export interface Config<T extends ClientOptions = ClientOptions>
   extends Omit<RequestInit, 'body' | 'headers' | 'method'>,

From 4c7843a644bca8550d5fcd379a5c47561c2d6704 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Thu, 6 Nov 2025 11:56:36 +0300
Subject: [PATCH 11/13] tests: added responseStyle: 'response' tests and
 snapshots

---
 .../@pinia/colada.gen.ts                      |  446 ++++
 .../fetch-pinia-response-style/client.gen.ts  |   18 +
 .../client/client.gen.ts                      |  268 +++
 .../client/index.ts                           |   25 +
 .../client/types.gen.ts                       |  241 ++
 .../client/utils.gen.ts                       |  332 +++
 .../core/auth.gen.ts                          |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../core/params.gen.ts                        |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../core/types.gen.ts                         |  118 +
 .../core/utils.gen.ts                         |  143 ++
 .../fetch-pinia-response-style/index.ts       |    4 +
 .../fetch-pinia-response-style/sdk.gen.ts     |  335 +++
 .../fetch-pinia-response-style/types.gen.ts   | 1188 ++++++++++
 .../@tanstack/react-query.gen.ts              |  479 ++++
 .../fetch-response-style/client.gen.ts        |   18 +
 .../fetch-response-style/client/client.gen.ts |  268 +++
 .../fetch-response-style/client/index.ts      |   25 +
 .../fetch-response-style/client/types.gen.ts  |  241 ++
 .../fetch-response-style/client/utils.gen.ts  |  332 +++
 .../fetch-response-style/core/auth.gen.ts     |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../fetch-response-style/core/params.gen.ts   |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../fetch-response-style/core/types.gen.ts    |  118 +
 .../fetch-response-style/core/utils.gen.ts    |  143 ++
 .../react-query/fetch-response-style/index.ts |    4 +
 .../fetch-response-style/sdk.gen.ts           |  335 +++
 .../fetch-response-style/types.gen.ts         | 1188 ++++++++++
 .../@tanstack/vue-query.gen.ts                |  479 ++++
 .../fetch-vue-response-style/client.gen.ts    |   18 +
 .../client/client.gen.ts                      |  268 +++
 .../fetch-vue-response-style/client/index.ts  |   25 +
 .../client/types.gen.ts                       |  241 ++
 .../client/utils.gen.ts                       |  332 +++
 .../fetch-vue-response-style/core/auth.gen.ts |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../core/params.gen.ts                        |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../core/types.gen.ts                         |  118 +
 .../core/utils.gen.ts                         |  143 ++
 .../fetch-vue-response-style/index.ts         |    4 +
 .../fetch-vue-response-style/sdk.gen.ts       |  335 +++
 .../fetch-vue-response-style/types.gen.ts     | 1188 ++++++++++
 .../@pinia/colada.gen.ts                      |  620 +++++
 .../fetch-pinia-response-style/client.gen.ts  |   18 +
 .../client/client.gen.ts                      |  268 +++
 .../client/index.ts                           |   25 +
 .../client/types.gen.ts                       |  241 ++
 .../client/utils.gen.ts                       |  332 +++
 .../core/auth.gen.ts                          |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../core/params.gen.ts                        |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../core/types.gen.ts                         |  118 +
 .../core/utils.gen.ts                         |  143 ++
 .../fetch-pinia-response-style/index.ts       |    4 +
 .../fetch-pinia-response-style/sdk.gen.ts     |  418 ++++
 .../fetch-pinia-response-style/types.gen.ts   | 2072 ++++++++++++++++
 .../@tanstack/react-query.gen.ts              |  724 ++++++
 .../fetch-response-style/client.gen.ts        |   18 +
 .../fetch-response-style/client/client.gen.ts |  268 +++
 .../fetch-response-style/client/index.ts      |   25 +
 .../fetch-response-style/client/types.gen.ts  |  241 ++
 .../fetch-response-style/client/utils.gen.ts  |  332 +++
 .../fetch-response-style/core/auth.gen.ts     |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../fetch-response-style/core/params.gen.ts   |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../fetch-response-style/core/types.gen.ts    |  118 +
 .../fetch-response-style/core/utils.gen.ts    |  143 ++
 .../react-query/fetch-response-style/index.ts |    4 +
 .../fetch-response-style/sdk.gen.ts           |  418 ++++
 .../fetch-response-style/types.gen.ts         | 2072 ++++++++++++++++
 .../@tanstack/vue-query.gen.ts                |  724 ++++++
 .../fetch-vue-response-style/client.gen.ts    |   18 +
 .../client/client.gen.ts                      |  268 +++
 .../fetch-vue-response-style/client/index.ts  |   25 +
 .../client/types.gen.ts                       |  241 ++
 .../client/utils.gen.ts                       |  332 +++
 .../fetch-vue-response-style/core/auth.gen.ts |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../core/params.gen.ts                        |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../core/types.gen.ts                         |  118 +
 .../core/utils.gen.ts                         |  143 ++
 .../fetch-vue-response-style/index.ts         |    4 +
 .../fetch-vue-response-style/sdk.gen.ts       |  418 ++++
 .../fetch-vue-response-style/types.gen.ts     | 2072 ++++++++++++++++
 .../@pinia/colada.gen.ts                      |  620 +++++
 .../fetch-pinia-response-style/client.gen.ts  |   18 +
 .../client/client.gen.ts                      |  268 +++
 .../client/index.ts                           |   25 +
 .../client/types.gen.ts                       |  241 ++
 .../client/utils.gen.ts                       |  332 +++
 .../core/auth.gen.ts                          |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../core/params.gen.ts                        |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../core/types.gen.ts                         |  118 +
 .../core/utils.gen.ts                         |  143 ++
 .../fetch-pinia-response-style/index.ts       |    4 +
 .../fetch-pinia-response-style/sdk.gen.ts     |  418 ++++
 .../fetch-pinia-response-style/types.gen.ts   | 2091 +++++++++++++++++
 .../@tanstack/react-query.gen.ts              |  724 ++++++
 .../fetch-response-style/client.gen.ts        |   18 +
 .../fetch-response-style/client/client.gen.ts |  268 +++
 .../fetch-response-style/client/index.ts      |   25 +
 .../fetch-response-style/client/types.gen.ts  |  241 ++
 .../fetch-response-style/client/utils.gen.ts  |  332 +++
 .../fetch-response-style/core/auth.gen.ts     |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../fetch-response-style/core/params.gen.ts   |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../fetch-response-style/core/types.gen.ts    |  118 +
 .../fetch-response-style/core/utils.gen.ts    |  143 ++
 .../react-query/fetch-response-style/index.ts |    4 +
 .../fetch-response-style/sdk.gen.ts           |  418 ++++
 .../fetch-response-style/types.gen.ts         | 2091 +++++++++++++++++
 .../@tanstack/vue-query.gen.ts                |  724 ++++++
 .../fetch-vue-response-style/client.gen.ts    |   18 +
 .../client/client.gen.ts                      |  268 +++
 .../fetch-vue-response-style/client/index.ts  |   25 +
 .../client/types.gen.ts                       |  241 ++
 .../client/utils.gen.ts                       |  332 +++
 .../fetch-vue-response-style/core/auth.gen.ts |   42 +
 .../core/bodySerializer.gen.ts                |  100 +
 .../core/params.gen.ts                        |  176 ++
 .../core/pathSerializer.gen.ts                |  181 ++
 .../core/queryKeySerializer.gen.ts            |  136 ++
 .../core/serverSentEvents.gen.ts              |  264 +++
 .../core/types.gen.ts                         |  118 +
 .../core/utils.gen.ts                         |  143 ++
 .../fetch-vue-response-style/index.ts         |    4 +
 .../fetch-vue-response-style/sdk.gen.ts       |  418 ++++
 .../fetch-vue-response-style/types.gen.ts     | 2091 +++++++++++++++++
 .../main/test/plugins.test.ts                 |   45 +
 154 files changed, 43583 insertions(+)
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
 create mode 100644 packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts

diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
new file mode 100644
index 000000000..3e5d1bb0f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
@@ -0,0 +1,446 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@pinia/colada';
+
+import { serializeQueryKeyValue } from '../client';
+import { client } from '../client.gen';
+import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen';
+import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'path'> & {
+        _id: string;
+        baseUrl?: _JSONValue;
+        body?: _JSONValue;
+        query?: _JSONValue;
+        tags?: _JSONValue;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (tags) {
+        params.tags = tags as unknown as _JSONValue;
+    }
+    if (options?.body !== undefined) {
+        const normalizedBody = serializeQueryKeyValue(options.body);
+        if (normalizedBody !== undefined) {
+            params.body = normalizedBody;
+        }
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query !== undefined) {
+        const normalizedQuery = serializeQueryKeyValue(options.query);
+        if (normalizedQuery !== undefined) {
+            params.query = normalizedQuery;
+        }
+    }
+    return [
+        params
+    ];
+};
+
+export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
+
+export const serviceWithEmptyTagQuery = defineQueryOptions((options?: Options<ServiceWithEmptyTagData>) => ({
+    key: serviceWithEmptyTagQueryKey(options),
+    query: async (context) => {
+        return await serviceWithEmptyTag({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
+    key: getCallWithoutParametersAndResponseQueryKey(options),
+    query: async (context) => {
+        return await getCallWithoutParametersAndResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersQuery = defineQueryOptions((options: Options<CallWithDefaultParametersData>) => ({
+    key: callWithDefaultParametersQueryKey(options),
+    query: async (context) => {
+        return await callWithDefaultParameters({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
+    key: duplicateName2QueryKey(options),
+    query: async (context) => {
+        return await duplicateName2({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
+    key: callWithNoContentResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
+    key: callWithResponseAndNoContentResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithResponseAndNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
+    key: dummyAQueryKey(options),
+    query: async (context) => {
+        return await dummyA({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
+    key: dummyBQueryKey(options),
+    query: async (context) => {
+        return await dummyB({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
+    key: callWithResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
+    key: collectionFormatQueryKey(options),
+    query: async (context) => {
+        return await collectionFormat({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
+    key: typesQueryKey(options),
+    query: async (context) => {
+        return await types({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
+    key: complexTypesQueryKey(options),
+    query: async (context) => {
+        return await complexTypes({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Body should not be unknown
+ *
+ * Body should not be unknown
+ */
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, Options<PostApiVbyApiVersionBodyData>, PostApiVbyApiVersionBodyError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
new file mode 100644
index 000000000..9143c9432
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
@@ -0,0 +1,335 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Client, Options as Options2, TDataShape } from './client';
+import { client } from './client.gen';
+import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const serviceWithEmptyTag = <ThrowOnError extends boolean = false>(options?: Options<ServiceWithEmptyTagData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions/',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterModel: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterArrayCSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArraySSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArrayTSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArrayPipes: {
+                    array: {
+                        explode: false
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterArray: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterDictionary: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                },
+                parameterReference: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Body should not be unknown
+ *
+ * Body should not be unknown
+ */
+export const postApiVbyApiVersionBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostApiVbyApiVersionBodyResponses, PostApiVbyApiVersionBodyErrors, ThrowOnError>({
+        url: '/api/v{api-version}/body',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
new file mode 100644
index 000000000..9be8ff439
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
@@ -0,0 +1,1188 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    foo?: string;
+    bar?: string;
+}>;
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a type-only model that defines Date as a string
+ */
+export type _Date = string;
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp: string | null;
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    test?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string;
+        };
+    };
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+export type Default = {
+    name?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type ParameterActivityParams = {
+    description?: string;
+    graduate_id?: number;
+    organization_id?: number;
+    parent_activity?: number;
+    post_id?: number;
+};
+
+export type ResponsePostActivityResponse = {
+    description?: string;
+    graduate_id?: number;
+    organization_id?: number;
+    parent_activity_id?: number;
+    post_id?: number;
+};
+
+export type FailureFailure = {
+    error?: string;
+    message?: string;
+    reference_code?: string;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type ServiceWithEmptyTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions/';
+};
+
+export type CallWithParametersData = {
+    body?: never;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query: {
+        /**
+         * This is the parameter that goes into the query params
+         */
+        parameterQuery: string;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that is sent as request body
+     */
+    body: string;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString: string;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber: number;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean: boolean;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a model with one string property
+         */
+        parameterModel: {
+            /**
+             * This is a simple string property
+             */
+            prop?: string;
+        };
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string>;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string>;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string>;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        };
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * This is a model with one string property
+         */
+        parameterReference: {
+            /**
+             * This is a simple string property
+             */
+            prop?: string;
+        };
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: string;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: NonAsciiStringæøåÆøÅöôêÊ字符串;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PostApiVbyApiVersionBodyData = {
+    /**
+     * Body should not be unknown
+     */
+    body: ParameterActivityParams;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/body';
+};
+
+export type PostApiVbyApiVersionBodyErrors = {
+    /**
+     * Bad Request
+     */
+    400: FailureFailure;
+    /**
+     * Internal Server Error
+     */
+    500: FailureFailure;
+};
+
+export type PostApiVbyApiVersionBodyError = PostApiVbyApiVersionBodyErrors[keyof PostApiVbyApiVersionBodyErrors];
+
+export type PostApiVbyApiVersionBodyResponses = {
+    /**
+     * OK
+     */
+    200: ResponsePostActivityResponse;
+};
+
+export type PostApiVbyApiVersionBodyResponse = PostApiVbyApiVersionBodyResponses[keyof PostApiVbyApiVersionBodyResponses];
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
new file mode 100644
index 000000000..9dd0c800f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
@@ -0,0 +1,479 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanstack/react-query';
+
+import { client } from '../client.gen';
+import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen';
+import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
+        _id: string;
+        _infinite?: boolean;
+        tags?: ReadonlyArray<string>;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (infinite) {
+        params._infinite = infinite;
+    }
+    if (tags) {
+        params.tags = tags;
+    }
+    if (options?.body) {
+        params.body = options.body;
+    }
+    if (options?.headers) {
+        params.headers = options.headers;
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query) {
+        params.query = options.query;
+    }
+    return [
+        params
+    ];
+};
+
+export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
+
+export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await serviceWithEmptyTag({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: serviceWithEmptyTagQueryKey(options)
+    });
+};
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<FooWowData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithoutParametersAndResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithoutParametersAndResponseQueryKey(options)
+    });
+};
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDescriptionsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithDefaultParameters({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithDefaultParametersQueryKey(options)
+    });
+};
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateNameData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await duplicateName2({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: duplicateName2QueryKey(options)
+    });
+};
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName3Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName4Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithNoContentResponseQueryKey(options)
+    });
+};
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponseAndNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseAndNoContentResponseQueryKey(options)
+    });
+};
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAOptions = (options?: Options<DummyAData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyA({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyAQueryKey(options)
+    });
+};
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBOptions = (options?: Options<DummyBData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyB({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyBQueryKey(options)
+    });
+};
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseQueryKey(options)
+    });
+};
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatOptions = (options: Options<CollectionFormatData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await collectionFormat({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: collectionFormatQueryKey(options)
+    });
+};
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesOptions = (options: Options<TypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await types({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: typesQueryKey(options)
+    });
+};
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await complexTypes({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: complexTypesQueryKey(options)
+    });
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<TestErrorCodeData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Body should not be unknown
+ *
+ * Body should not be unknown
+ */
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<{data: PostApiVbyApiVersionBodyResponse, response: Response, request: Request }, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
new file mode 100644
index 000000000..9143c9432
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
@@ -0,0 +1,335 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Client, Options as Options2, TDataShape } from './client';
+import { client } from './client.gen';
+import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const serviceWithEmptyTag = <ThrowOnError extends boolean = false>(options?: Options<ServiceWithEmptyTagData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions/',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterModel: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterArrayCSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArraySSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArrayTSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArrayPipes: {
+                    array: {
+                        explode: false
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterArray: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterDictionary: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                },
+                parameterReference: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Body should not be unknown
+ *
+ * Body should not be unknown
+ */
+export const postApiVbyApiVersionBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostApiVbyApiVersionBodyResponses, PostApiVbyApiVersionBodyErrors, ThrowOnError>({
+        url: '/api/v{api-version}/body',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
new file mode 100644
index 000000000..9be8ff439
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
@@ -0,0 +1,1188 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    foo?: string;
+    bar?: string;
+}>;
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a type-only model that defines Date as a string
+ */
+export type _Date = string;
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp: string | null;
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    test?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string;
+        };
+    };
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+export type Default = {
+    name?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type ParameterActivityParams = {
+    description?: string;
+    graduate_id?: number;
+    organization_id?: number;
+    parent_activity?: number;
+    post_id?: number;
+};
+
+export type ResponsePostActivityResponse = {
+    description?: string;
+    graduate_id?: number;
+    organization_id?: number;
+    parent_activity_id?: number;
+    post_id?: number;
+};
+
+export type FailureFailure = {
+    error?: string;
+    message?: string;
+    reference_code?: string;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type ServiceWithEmptyTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions/';
+};
+
+export type CallWithParametersData = {
+    body?: never;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query: {
+        /**
+         * This is the parameter that goes into the query params
+         */
+        parameterQuery: string;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that is sent as request body
+     */
+    body: string;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString: string;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber: number;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean: boolean;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a model with one string property
+         */
+        parameterModel: {
+            /**
+             * This is a simple string property
+             */
+            prop?: string;
+        };
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string>;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string>;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string>;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        };
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * This is a model with one string property
+         */
+        parameterReference: {
+            /**
+             * This is a simple string property
+             */
+            prop?: string;
+        };
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: string;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: NonAsciiStringæøåÆøÅöôêÊ字符串;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PostApiVbyApiVersionBodyData = {
+    /**
+     * Body should not be unknown
+     */
+    body: ParameterActivityParams;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/body';
+};
+
+export type PostApiVbyApiVersionBodyErrors = {
+    /**
+     * Bad Request
+     */
+    400: FailureFailure;
+    /**
+     * Internal Server Error
+     */
+    500: FailureFailure;
+};
+
+export type PostApiVbyApiVersionBodyError = PostApiVbyApiVersionBodyErrors[keyof PostApiVbyApiVersionBodyErrors];
+
+export type PostApiVbyApiVersionBodyResponses = {
+    /**
+     * OK
+     */
+    200: ResponsePostActivityResponse;
+};
+
+export type PostApiVbyApiVersionBodyResponse = PostApiVbyApiVersionBodyResponses[keyof PostApiVbyApiVersionBodyResponses];
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
new file mode 100644
index 000000000..9b87509d5
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
@@ -0,0 +1,479 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type DefaultError, queryOptions, type UseMutationOptions } from '@tanstack/vue-query';
+
+import { client } from '../client.gen';
+import { callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexTypes, deleteCallWithoutParametersAndResponse, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, fooWow, getCallWithoutParametersAndResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionBody, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, serviceWithEmptyTag, testErrorCode, types } from '../sdk.gen';
+import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, GetCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyError, PostApiVbyApiVersionBodyResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TypesData } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
+        _id: string;
+        _infinite?: boolean;
+        tags?: ReadonlyArray<string>;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (infinite) {
+        params._infinite = infinite;
+    }
+    if (tags) {
+        params.tags = tags;
+    }
+    if (options?.body) {
+        params.body = options.body;
+    }
+    if (options?.headers) {
+        params.headers = options.headers;
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query) {
+        params.query = options.query;
+    }
+    return [
+        params
+    ];
+};
+
+export const serviceWithEmptyTagQueryKey = (options?: Options<ServiceWithEmptyTagData>) => createQueryKey('serviceWithEmptyTag', options);
+
+export const serviceWithEmptyTagOptions = (options?: Options<ServiceWithEmptyTagData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await serviceWithEmptyTag({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: serviceWithEmptyTagQueryKey(options)
+    });
+};
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<FooWowData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithoutParametersAndResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithoutParametersAndResponseQueryKey(options)
+    });
+};
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDescriptionsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersOptions = (options: Options<CallWithDefaultParametersData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithDefaultParameters({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithDefaultParametersQueryKey(options)
+    });
+};
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateNameData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await duplicateName2({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: duplicateName2QueryKey(options)
+    });
+};
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName3Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName4Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithNoContentResponseQueryKey(options)
+    });
+};
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponseAndNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseAndNoContentResponseQueryKey(options)
+    });
+};
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAOptions = (options?: Options<DummyAData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyA({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyAQueryKey(options)
+    });
+};
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBOptions = (options?: Options<DummyBData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyB({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyBQueryKey(options)
+    });
+};
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseQueryKey(options)
+    });
+};
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatOptions = (options: Options<CollectionFormatData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await collectionFormat({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: collectionFormatQueryKey(options)
+    });
+};
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesOptions = (options: Options<TypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await types({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: typesQueryKey(options)
+    });
+};
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await complexTypes({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: complexTypesQueryKey(options)
+    });
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<TestErrorCodeData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Body should not be unknown
+ *
+ * Body should not be unknown
+ */
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<{data: PostApiVbyApiVersionBodyResponse, response: Response, request: Request }, PostApiVbyApiVersionBodyError, Options<PostApiVbyApiVersionBodyData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
new file mode 100644
index 000000000..9143c9432
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
@@ -0,0 +1,335 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Client, Options as Options2, TDataShape } from './client';
+import { client } from './client.gen';
+import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, FooWowData, FooWowResponses, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionBodyData, PostApiVbyApiVersionBodyErrors, PostApiVbyApiVersionBodyResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, ServiceWithEmptyTagData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const serviceWithEmptyTag = <ThrowOnError extends boolean = false>(options?: Options<ServiceWithEmptyTagData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions/',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterModel: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterArrayCSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArraySSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArrayTSV: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterArrayPipes: {
+                    array: {
+                        explode: false
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterArray: {
+                    array: {
+                        explode: false
+                    }
+                },
+                parameterDictionary: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                },
+                parameterReference: {
+                    object: {
+                        explode: false,
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Body should not be unknown
+ *
+ * Body should not be unknown
+ */
+export const postApiVbyApiVersionBody = <ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostApiVbyApiVersionBodyResponses, PostApiVbyApiVersionBodyErrors, ThrowOnError>({
+        url: '/api/v{api-version}/body',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
new file mode 100644
index 000000000..9be8ff439
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
@@ -0,0 +1,1188 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    foo?: string;
+    bar?: string;
+}>;
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a type-only model that defines Date as a string
+ */
+export type _Date = string;
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp: string | null;
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    test?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string;
+        };
+    };
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+export type Default = {
+    name?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type ParameterActivityParams = {
+    description?: string;
+    graduate_id?: number;
+    organization_id?: number;
+    parent_activity?: number;
+    post_id?: number;
+};
+
+export type ResponsePostActivityResponse = {
+    description?: string;
+    graduate_id?: number;
+    organization_id?: number;
+    parent_activity_id?: number;
+    post_id?: number;
+};
+
+export type FailureFailure = {
+    error?: string;
+    message?: string;
+    reference_code?: string;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type ServiceWithEmptyTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions/';
+};
+
+export type CallWithParametersData = {
+    body?: never;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query: {
+        /**
+         * This is the parameter that goes into the query params
+         */
+        parameterQuery: string;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that is sent as request body
+     */
+    body: string;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString: string;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber: number;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean: boolean;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a model with one string property
+         */
+        parameterModel: {
+            /**
+             * This is a simple string property
+             */
+            prop?: string;
+        };
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: unknown;
+};
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithString;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string>;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string>;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string>;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string>;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        };
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * This is a model with one string property
+         */
+        parameterReference: {
+            /**
+             * This is a simple string property
+             */
+            prop?: string;
+        };
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: string;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: NonAsciiStringæøåÆøÅöôêÊ字符串;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PostApiVbyApiVersionBodyData = {
+    /**
+     * Body should not be unknown
+     */
+    body: ParameterActivityParams;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/body';
+};
+
+export type PostApiVbyApiVersionBodyErrors = {
+    /**
+     * Bad Request
+     */
+    400: FailureFailure;
+    /**
+     * Internal Server Error
+     */
+    500: FailureFailure;
+};
+
+export type PostApiVbyApiVersionBodyError = PostApiVbyApiVersionBodyErrors[keyof PostApiVbyApiVersionBodyErrors];
+
+export type PostApiVbyApiVersionBodyResponses = {
+    /**
+     * OK
+     */
+    200: ResponsePostActivityResponse;
+};
+
+export type PostApiVbyApiVersionBodyResponse = PostApiVbyApiVersionBodyResponses[keyof PostApiVbyApiVersionBodyResponses];
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
new file mode 100644
index 000000000..15ee607eb
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
@@ -0,0 +1,620 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@pinia/colada';
+
+import { serializeQueryKeyValue } from '../client';
+import { client } from '../client.gen';
+import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen';
+import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'path'> & {
+        _id: string;
+        baseUrl?: _JSONValue;
+        body?: _JSONValue;
+        query?: _JSONValue;
+        tags?: _JSONValue;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (tags) {
+        params.tags = tags as unknown as _JSONValue;
+    }
+    if (options?.body !== undefined) {
+        const normalizedBody = serializeQueryKeyValue(options.body);
+        if (normalizedBody !== undefined) {
+            params.body = normalizedBody;
+        }
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query !== undefined) {
+        const normalizedQuery = serializeQueryKeyValue(options.query);
+        if (normalizedQuery !== undefined) {
+            params.query = normalizedQuery;
+        }
+    }
+    return [
+        params
+    ];
+};
+
+export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
+
+export const exportQuery = defineQueryOptions((options?: Options<ExportData>) => ({
+    key: exportQueryKey(options),
+    query: async (context) => {
+        return await export_({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, Options<ImportData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
+
+export const apiVVersionODataControllerCountQuery = defineQueryOptions((options?: Options<ApiVVersionODataControllerCountData>) => ({
+    key: apiVVersionODataControllerCountQueryKey(options),
+    query: async (context) => {
+        return await apiVVersionODataControllerCount({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
+
+export const getApiVbyApiVersionSimpleOperationQuery = defineQueryOptions((options: Options<GetApiVbyApiVersionSimpleOperationData>) => ({
+    key: getApiVbyApiVersionSimpleOperationQueryKey(options),
+    query: async (context) => {
+        return await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
+    key: getCallWithoutParametersAndResponseQueryKey(options),
+    query: async (context) => {
+        return await getCallWithoutParametersAndResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, Options<DeleteFooData3>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, Options<DeprecatedCallData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
+
+export const getCallWithOptionalParamQuery = defineQueryOptions((options: Options<GetCallWithOptionalParamData>) => ({
+    key: getCallWithOptionalParamQueryKey(options),
+    query: async (context) => {
+        return await getCallWithOptionalParam({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, Options<PostCallWithOptionalParamData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionRequestBodyData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionFormDataData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersQuery = defineQueryOptions((options?: Options<CallWithDefaultParametersData>) => ({
+    key: callWithDefaultParametersQueryKey(options),
+    query: async (context) => {
+        return await callWithDefaultParameters({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
+    key: duplicateName2QueryKey(options),
+    query: async (context) => {
+        return await duplicateName2({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
+    key: callWithNoContentResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
+    key: callWithResponseAndNoContentResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithResponseAndNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
+    key: dummyAQueryKey(options),
+    query: async (context) => {
+        return await dummyA({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
+    key: dummyBQueryKey(options),
+    query: async (context) => {
+        return await dummyB({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
+    key: callWithResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
+    key: collectionFormatQueryKey(options),
+    query: async (context) => {
+        return await collectionFormat({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
+    key: typesQueryKey(options),
+    query: async (context) => {
+        return await types({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, Options<UploadFileData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
+
+export const fileResponseQuery = defineQueryOptions((options: Options<FileResponseData>) => ({
+    key: fileResponseQueryKey(options),
+    query: async (context) => {
+        return await fileResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
+    key: complexTypesQueryKey(options),
+    query: async (context) => {
+        return await complexTypes({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
+
+export const multipartResponseQuery = defineQueryOptions((options?: Options<MultipartResponseData>) => ({
+    key: multipartResponseQueryKey(options),
+    query: async (context) => {
+        return await multipartResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, Options<MultipartRequestData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, Options<ComplexParamsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, Options<PutWithFormUrlEncodedData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
new file mode 100644
index 000000000..4166f8b7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
@@ -0,0 +1,418 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
+import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const export_ = <ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple/$count',
+        ...options
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+        url: '/api/v{api-version}/simple:operation',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions',
+        ...options
+    });
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/deprecated',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/requestBody',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/formData',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/upload',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
+
+export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/file/{id}',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const multipartResponse = <ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multipart',
+        ...options
+    });
+};
+
+export const multipartRequest = <ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/multipart',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/complex/{id}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json-patch+json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
new file mode 100644
index 000000000..ef8b52efd
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
@@ -0,0 +1,2072 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+/**
+ * Model with number-only name
+ */
+export type _400 = string;
+
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CamelCaseCommentWithBreaks = number;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+/**
+ * This is a simple reference
+ */
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string | null;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+export type EnumWithReplacedCharacters = "'Single Quote'" | '"Double Quotes"' | 'øæåôöØÆÅÔÖ字符串' | 3.1 | '';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+export type EnumWithXEnumNames = 0 | 1 | 2;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    '16x16'?: CamelCaseCommentWithBreaks;
+    bar?: string;
+}>;
+
+/**
+ * This is a simple array with any of properties
+ */
+export type ArrayWithAnyOfProperties = Array<{
+    foo?: string;
+} | {
+    bar?: string;
+}>;
+
+export type AnyOfAnyAndNull = {
+    data?: unknown;
+};
+
+/**
+ * This is a simple array with any of properties
+ */
+export type AnyOfArrays = {
+    results?: Array<{
+        foo?: string;
+    } | {
+        bar?: string;
+    }>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+export type DictionaryWithPropertiesAndAdditionalProperties = {
+    foo?: number;
+    bar?: boolean;
+    [key: string]: string | number | boolean | undefined;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * `Comment` or `VoiceComment`. The JSON object for adding voice comments to tickets is different. See [Adding voice comments to tickets](/documentation/ticketing/managing-tickets/adding-voice-comments-to-tickets)
+ */
+export type ModelFromZendesk = string;
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp1?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp1: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableProp2?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp2: string | null;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum with escaped name
+ */
+export type ModelWithEnumWithHyphen = {
+    /**
+     * Foo-Bar-Baz-Qux
+     */
+    'foo-bar-baz-qux'?: '3.0';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnly = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnly>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a deprecated model with a deprecated property
+ *
+ * @deprecated
+ */
+export type DeprecatedModel = {
+    /**
+     * This is a deprecated property
+     *
+     * @deprecated
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * Circle
+ */
+export type ModelCircle = {
+    kind: string;
+    radius?: number;
+};
+
+/**
+ * Square
+ */
+export type ModelSquare = {
+    kind: string;
+    sideLength?: number;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfDiscriminator = ({
+    kind: 'circle';
+} & ModelCircle) | ({
+    kind: 'square';
+} & ModelSquare);
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithAnyOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * This is a model with nested 'any of' property with a type null
+ */
+export type CompositionWithNestedAnyAndTypeNull = {
+    propA?: Array<ModelWithDictionary | null> | Array<ModelWithArray | null>;
+};
+
+export type _3eNum1Период = 'Bird' | 'Dog';
+
+export type ConstValue = 'ConstValue';
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithNestedAnyOfAndNull = {
+    propA?: Array<_3eNum1Период | ConstValue> | null;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a model that contains a simple dictionary within composition
+ */
+export type CompositionWithOneOfAndSimpleDictionary = {
+    propA?: boolean | {
+        [key: string]: number;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of simple arrays within composition
+ */
+export type CompositionWithOneOfAndSimpleArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<boolean>;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of complex arrays (composited) within composition
+ */
+export type CompositionWithOneOfAndComplexArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<number | string>;
+    };
+};
+
+/**
+ * This is a model with one property with a 'all of' relationship
+ */
+export type CompositionWithAllOfAndNullable = {
+    propA?: ({
+        boolean?: boolean;
+    } & ModelWithEnum & ModelWithArray & ModelWithDictionary) | null;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a base model with two simple optional properties
+ */
+export type CompositionBaseModel = {
+    firstName?: string;
+    lastname?: string;
+};
+
+/**
+ * This is a model that extends the base model
+ */
+export type CompositionExtendedModel = CompositionBaseModel & {
+    age: number;
+    firstName: string;
+    lastname: string;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string | null;
+        } | null;
+    } | null;
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type File = {
+    /**
+     * Id
+     */
+    readonly id?: string;
+    /**
+     * Updated at
+     */
+    readonly updated_at?: string;
+    /**
+     * Created at
+     */
+    readonly created_at?: string;
+    /**
+     * Mime
+     */
+    mime: string;
+    /**
+     * File
+     */
+    readonly file?: string;
+};
+
+export type Default = {
+    name?: string;
+};
+
+export type Pageable = {
+    page?: number;
+    size?: number;
+    sort?: Array<string>;
+};
+
+/**
+ * This is a free-form object without additionalProperties.
+ */
+export type FreeFormObjectWithoutAdditionalProperties = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: true.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqTrue = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: {}.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqEmptyObject = {
+    [key: string]: unknown;
+};
+
+export type ModelWithConst = {
+    String?: 'String';
+    number?: 0;
+    null?: unknown;
+    withType?: 'Some string';
+};
+
+/**
+ * This is a model with one property and additionalProperties: true
+ */
+export type ModelWithAdditionalPropertiesEqTrue = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+    [key: string]: unknown | string | undefined;
+};
+
+export type NestedAnyOfArraysNullable = {
+    nullableArray?: Array<string | boolean> | null;
+};
+
+export type CompositionWithOneOfAndProperties = ({
+    foo: SimpleParameter;
+} | {
+    bar: NonAsciiStringæøåÆøÅöôêÊ字符串;
+}) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * An object that can be null
+ */
+export type NullableObject = {
+    foo?: string;
+} | null;
+
+/**
+ * Some % character
+ */
+export type CharactersInDescription = string;
+
+export type ModelWithNullableObject = {
+    data?: NullableObject;
+};
+
+export type ModelWithOneOfEnum = {
+    foo: 'Bar';
+} | {
+    foo: 'Baz';
+} | {
+    foo: 'Qux';
+} | {
+    content: string;
+    foo: 'Quux';
+} | {
+    content: [
+        string,
+        string
+    ];
+    foo: 'Corge';
+};
+
+export type ModelWithNestedArrayEnumsDataFoo = 'foo' | 'bar';
+
+export type ModelWithNestedArrayEnumsDataBar = 'baz' | 'qux';
+
+export type ModelWithNestedArrayEnumsData = {
+    foo?: Array<ModelWithNestedArrayEnumsDataFoo>;
+    bar?: Array<ModelWithNestedArrayEnumsDataBar>;
+};
+
+export type ModelWithNestedArrayEnums = {
+    array_strings?: Array<string>;
+    data?: ModelWithNestedArrayEnumsData;
+};
+
+export type ModelWithNestedCompositionEnums = {
+    foo?: ModelWithNestedArrayEnumsDataFoo;
+};
+
+export type ModelWithReadOnlyAndWriteOnly = {
+    foo: string;
+    readonly bar: string;
+};
+
+export type ModelWithConstantSizeArray = [
+    number,
+    number
+];
+
+export type ModelWithAnyOfConstantSizeArray = [
+    number | string,
+    number | string,
+    number | string
+];
+
+export type ModelWithPrefixItemsConstantSizeArray = Array<ModelWithInteger | number | string>;
+
+export type ModelWithAnyOfConstantSizeArrayNullable = [
+    number | null | string,
+    number | null | string,
+    number | null | string
+];
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions = [
+    number | Import,
+    number | Import
+];
+
+export type ModelWithAnyOfConstantSizeArrayAndIntersect = [
+    number & string,
+    number & string
+];
+
+export type ModelWithNumericEnumUnion = {
+    /**
+     * Период
+     */
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
+};
+
+/**
+ * Some description with `back ticks`
+ */
+export type ModelWithBackticksInDescription = {
+    /**
+     * The template `that` should be used for parsing and importing the contents of the CSV file.
+     *
+     * <br/><p>There is one placeholder currently supported:<ul>     <li><b>${x}</b> - refers to the n-th column in the CSV file, e.g. ${1}, ${2}, ...)</li></ul><p>Example of a correct JSON template:</p>
+     * <pre>
+     * [
+     * {
+     * "resourceType": "Asset",
+     * "identifier": {
+     * "name": "${1}",
+     * "domain": {
+     * "name": "${2}",
+     * "community": {
+     * "name": "Some Community"
+     * }
+     * }
+     * },
+     * "attributes" : {
+     * "00000000-0000-0000-0000-000000003115" : [ {
+     * "value" : "${3}"
+     * } ],
+     * "00000000-0000-0000-0000-000000000222" : [ {
+     * "value" : "${4}"
+     * } ]
+     * }
+     * }
+     * ]
+     * </pre>
+     */
+    template?: string;
+};
+
+export type ModelWithOneOfAndProperties = (SimpleParameter | NonAsciiStringæøåÆøÅöôêÊ字符串) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * Model used to test deduplication strategy (unused)
+ */
+export type ParameterSimpleParameterUnused = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse2 = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData2 = string;
+
+/**
+ * Model with restricted keyword name
+ */
+export type Import = string;
+
+export type SchemaWithFormRestrictedKeys = {
+    description?: string;
+    'x-enum-descriptions'?: string;
+    'x-enum-varnames'?: string;
+    'x-enumNames'?: string;
+    title?: string;
+    object?: {
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    };
+    array?: Array<{
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    }>;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1DeleteOptions = {
+    /**
+     * Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.
+     */
+    preconditions?: IoK8sApimachineryPkgApisMetaV1Preconditions;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1Preconditions = {
+    /**
+     * Specifies the target ResourceVersion
+     */
+    resourceVersion?: string;
+    /**
+     * Specifies the target UID.
+     */
+    uid?: string;
+};
+
+export type AdditionalPropertiesUnknownIssue = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue2 = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue3 = string & {
+    entries: {
+        [key: string]: AdditionalPropertiesUnknownIssue;
+    };
+};
+
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: number;
+};
+
+export type OneOfAllOfIssue = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBoolean = {
+    item?: boolean;
+    error?: string | null;
+    readonly hasError?: boolean;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemString = {
+    item?: string | null;
+    error?: string | null;
+    readonly hasError?: boolean;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnlyWritable = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnlyWritable>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type FileWritable = {
+    /**
+     * Mime
+     */
+    mime: string;
+};
+
+export type ModelWithReadOnlyAndWriteOnlyWritable = {
+    foo: string;
+    baz: string;
+};
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable = [
+    number | Import,
+    number | Import
+];
+
+export type AdditionalPropertiesUnknownIssueWritable = {
+    [key: string]: string | number;
+};
+
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
+    item?: boolean;
+    error?: string | null;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemStringWritable = {
+    item?: string | null;
+    error?: string | null;
+};
+
+/**
+ * This is a reusable parameter
+ */
+export type SimpleParameter = string;
+
+/**
+ * Parameter with illegal characters
+ */
+export type XFooBar = ModelWithString;
+
+export type SimpleRequestBody = ModelWithString;
+
+export type SimpleFormData = ModelWithString;
+
+export type ExportData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ImportData = {
+    body: ModelWithReadOnlyAndWriteOnlyWritable | ModelWithArrayReadOnlyAndWriteOnlyWritable;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type ImportResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+    /**
+     * Default success response
+     */
+    default: ModelWithReadOnlyAndWriteOnly;
+};
+
+export type ImportResponse = ImportResponses[keyof ImportResponses];
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ApiVVersionODataControllerCountData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple/$count';
+};
+
+export type ApiVVersionODataControllerCountResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+};
+
+export type ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponses[keyof ApiVVersionODataControllerCountResponses];
+
+export type GetApiVbyApiVersionSimpleOperationData = {
+    body?: never;
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/simple:operation';
+};
+
+export type GetApiVbyApiVersionSimpleOperationErrors = {
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type GetApiVbyApiVersionSimpleOperationError = GetApiVbyApiVersionSimpleOperationErrors[keyof GetApiVbyApiVersionSimpleOperationErrors];
+
+export type GetApiVbyApiVersionSimpleOperationResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+};
+
+export type GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponses[keyof GetApiVbyApiVersionSimpleOperationResponses];
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type DeleteFooData3 = {
+    body?: never;
+    headers: {
+        /**
+         * Parameter with illegal characters
+         */
+        'x-Foo-Bar': ModelWithString;
+    };
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+        /**
+         * bar in method
+         */
+        BarParam: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions';
+};
+
+export type DeprecatedCallData = {
+    body?: never;
+    headers: {
+        /**
+         * This parameter is deprecated
+         *
+         * @deprecated
+         */
+        parameter: DeprecatedModel | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/parameters/deprecated';
+};
+
+export type CallWithParametersData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: {
+        [key: string]: unknown;
+    } | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string | null;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        foo_ref_enum?: ModelWithNestedArrayEnumsDataFoo;
+        foo_all_of_enum: ModelWithNestedArrayEnumsDataFoo;
+        /**
+         * This is the parameter that goes into the query params
+         */
+        cursor: string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: ModelWithString | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type GetCallWithOptionalParamData = {
+    /**
+     * This is a required parameter
+     */
+    body: ModelWithOneOfEnum;
+    path?: never;
+    query?: {
+        /**
+         * This is an optional parameter
+         */
+        page?: number;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamData = {
+    /**
+     * This is an optional parameter
+     */
+    body?: {
+        offset?: number | null;
+    };
+    path?: never;
+    query: {
+        /**
+         * This is a required parameter
+         */
+        parameter: Pageable;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponses[keyof PostCallWithOptionalParamResponses];
+
+export type PostApiVbyApiVersionRequestBodyData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleRequestBody;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/requestBody';
+};
+
+export type PostApiVbyApiVersionFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleFormData;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/formData';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString?: string | null;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber?: number | null;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean?: boolean | null;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model with default value
+         */
+        parameterModel?: ModelWithString | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model that is optional with default value
+         */
+        parameterModel?: ModelWithString;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithNoContentResponseResponse = CallWithNoContentResponseResponses[keyof CallWithNoContentResponseResponses];
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    200: _400;
+};
+
+export type DummyAResponse = DummyAResponses[keyof DummyAResponses];
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type DummyBResponse = DummyBResponses[keyof DummyBResponses];
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    default: Import;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for 4XX errors
+     */
+    '4XX': DictionaryWithArray;
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: ModelWithBoolean & ModelWithInteger;
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithStringError;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string> | null;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string | null;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean | null;
+        /**
+         * This is an object parameter
+         */
+        parameterObject: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string> | null;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type UploadFileData = {
+    body: Blob | File;
+    path: {
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query?: never;
+    url: '/api/v{api-version}/upload';
+};
+
+export type UploadFileResponses = {
+    200: boolean;
+};
+
+export type UploadFileResponse = UploadFileResponses[keyof UploadFileResponses];
+
+export type FileResponseData = {
+    body?: never;
+    path: {
+        id: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/file/{id}';
+};
+
+export type FileResponseResponses = {
+    /**
+     * Success
+     */
+    200: Blob | File;
+};
+
+export type FileResponseResponse = FileResponseResponses[keyof FileResponseResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * Parameter containing reference
+         */
+        parameterReference: ModelWithString;
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 `server` error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type MultipartResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type MultipartResponseResponses = {
+    /**
+     * OK
+     */
+    200: {
+        file?: Blob | File;
+        metadata?: {
+            foo?: string;
+            bar?: string;
+        };
+    };
+};
+
+export type MultipartResponseResponse = MultipartResponseResponses[keyof MultipartResponseResponses];
+
+export type MultipartRequestData = {
+    body?: {
+        content?: Blob | File;
+        data?: ModelWithString | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type ComplexParamsData = {
+    body?: {
+        readonly key: string | null;
+        name: string | null;
+        enabled?: boolean;
+        type: 'Monkey' | 'Horse' | 'Bird';
+        listOfModels?: Array<ModelWithString> | null;
+        listOfStrings?: Array<string> | null;
+        parameters: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+        readonly user?: {
+            readonly id?: number;
+            readonly name?: string | null;
+        };
+    };
+    path: {
+        id: number;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/complex/{id}';
+};
+
+export type ComplexParamsResponses = {
+    /**
+     * Success
+     */
+    200: ModelWithString;
+};
+
+export type ComplexParamsResponse = ComplexParamsResponses[keyof ComplexParamsResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: number;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: Array<NonAsciiStringæøåÆøÅöôêÊ字符串>;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PutWithFormUrlEncodedData = {
+    body: ArrayWithStrings;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
new file mode 100644
index 000000000..fadadfd36
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
@@ -0,0 +1,724 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type DefaultError, type InfiniteData, infiniteQueryOptions, queryOptions, type UseMutationOptions } from '@tanstack/react-query';
+
+import { client } from '../client.gen';
+import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen';
+import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
+        _id: string;
+        _infinite?: boolean;
+        tags?: ReadonlyArray<string>;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (infinite) {
+        params._infinite = infinite;
+    }
+    if (tags) {
+        params.tags = tags;
+    }
+    if (options?.body) {
+        params.body = options.body;
+    }
+    if (options?.headers) {
+        params.headers = options.headers;
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query) {
+        params.query = options.query;
+    }
+    return [
+        params
+    ];
+};
+
+export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
+
+export const exportOptions = (options?: Options<ExportData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await export_({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: exportQueryKey(options)
+    });
+};
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<{data: ImportResponse, response: Response, request: Request }, DefaultError, Options<ImportData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<FooWowData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
+
+export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await apiVVersionODataControllerCount({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: apiVVersionODataControllerCountQueryKey(options)
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
+
+export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getApiVbyApiVersionSimpleOperation({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
+    });
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithoutParametersAndResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithoutParametersAndResponseQueryKey(options)
+    });
+};
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteFooData3>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDescriptionsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeprecatedCallData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
+
+export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithOptionalParam({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamQueryKey(options)
+    });
+};
+
+const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
+    const params = {
+        ...queryKey[0]
+    };
+    if (page.body) {
+        params.body = {
+            ...queryKey[0].body as any,
+            ...page.body as any
+        };
+    }
+    if (page.headers) {
+        params.headers = {
+            ...queryKey[0].headers,
+            ...page.headers
+        };
+    }
+    if (page.path) {
+        params.path = {
+            ...queryKey[0].path as any,
+            ...page.path as any
+        };
+    }
+    if (page.query) {
+        params.query = {
+            ...queryKey[0].query as any,
+            ...page.query as any
+        };
+    }
+    return params as unknown as typeof page;
+};
+
+export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey('getCallWithOptionalParam', options, true);
+
+export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+    // @ts-ignore
+    {
+        queryFn: async ({ pageParam, queryKey, signal }) => {
+            // @ts-ignore
+            const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+                query: {
+                    page: pageParam
+                }
+            };
+            const params = createInfiniteParams(queryKey, page);
+            return await getCallWithOptionalParam({
+                ...options,
+                ...params,
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
+    });
+};
+
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<{data: PostCallWithOptionalParamResponse, response: Response, request: Request }, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithDefaultParameters({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithDefaultParametersQueryKey(options)
+    });
+};
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateNameData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await duplicateName2({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: duplicateName2QueryKey(options)
+    });
+};
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName3Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName4Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithNoContentResponseQueryKey(options)
+    });
+};
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponseAndNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseAndNoContentResponseQueryKey(options)
+    });
+};
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAOptions = (options?: Options<DummyAData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyA({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyAQueryKey(options)
+    });
+};
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBOptions = (options?: Options<DummyBData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyB({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyBQueryKey(options)
+    });
+};
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseQueryKey(options)
+    });
+};
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatOptions = (options: Options<CollectionFormatData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await collectionFormat({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: collectionFormatQueryKey(options)
+    });
+};
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesOptions = (options: Options<TypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await types({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: typesQueryKey(options)
+    });
+};
+
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<{data: UploadFileResponse, response: Response, request: Request }, DefaultError, Options<UploadFileData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
+
+export const fileResponseOptions = (options: Options<FileResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await fileResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: fileResponseQueryKey(options)
+    });
+};
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await complexTypes({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: complexTypesQueryKey(options)
+    });
+};
+
+export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
+
+export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await multipartResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: multipartResponseQueryKey(options)
+    });
+};
+
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<MultipartRequestData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<{data: ComplexParamsResponse, response: Response, request: Request }, DefaultError, Options<ComplexParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<TestErrorCodeData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
new file mode 100644
index 000000000..4166f8b7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
@@ -0,0 +1,418 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
+import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const export_ = <ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple/$count',
+        ...options
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+        url: '/api/v{api-version}/simple:operation',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions',
+        ...options
+    });
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/deprecated',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/requestBody',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/formData',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/upload',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
+
+export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/file/{id}',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const multipartResponse = <ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multipart',
+        ...options
+    });
+};
+
+export const multipartRequest = <ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/multipart',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/complex/{id}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json-patch+json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
new file mode 100644
index 000000000..ef8b52efd
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
@@ -0,0 +1,2072 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+/**
+ * Model with number-only name
+ */
+export type _400 = string;
+
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CamelCaseCommentWithBreaks = number;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+/**
+ * This is a simple reference
+ */
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string | null;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+export type EnumWithReplacedCharacters = "'Single Quote'" | '"Double Quotes"' | 'øæåôöØÆÅÔÖ字符串' | 3.1 | '';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+export type EnumWithXEnumNames = 0 | 1 | 2;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    '16x16'?: CamelCaseCommentWithBreaks;
+    bar?: string;
+}>;
+
+/**
+ * This is a simple array with any of properties
+ */
+export type ArrayWithAnyOfProperties = Array<{
+    foo?: string;
+} | {
+    bar?: string;
+}>;
+
+export type AnyOfAnyAndNull = {
+    data?: unknown;
+};
+
+/**
+ * This is a simple array with any of properties
+ */
+export type AnyOfArrays = {
+    results?: Array<{
+        foo?: string;
+    } | {
+        bar?: string;
+    }>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+export type DictionaryWithPropertiesAndAdditionalProperties = {
+    foo?: number;
+    bar?: boolean;
+    [key: string]: string | number | boolean | undefined;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * `Comment` or `VoiceComment`. The JSON object for adding voice comments to tickets is different. See [Adding voice comments to tickets](/documentation/ticketing/managing-tickets/adding-voice-comments-to-tickets)
+ */
+export type ModelFromZendesk = string;
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp1?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp1: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableProp2?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp2: string | null;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum with escaped name
+ */
+export type ModelWithEnumWithHyphen = {
+    /**
+     * Foo-Bar-Baz-Qux
+     */
+    'foo-bar-baz-qux'?: '3.0';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnly = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnly>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a deprecated model with a deprecated property
+ *
+ * @deprecated
+ */
+export type DeprecatedModel = {
+    /**
+     * This is a deprecated property
+     *
+     * @deprecated
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * Circle
+ */
+export type ModelCircle = {
+    kind: string;
+    radius?: number;
+};
+
+/**
+ * Square
+ */
+export type ModelSquare = {
+    kind: string;
+    sideLength?: number;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfDiscriminator = ({
+    kind: 'circle';
+} & ModelCircle) | ({
+    kind: 'square';
+} & ModelSquare);
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithAnyOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * This is a model with nested 'any of' property with a type null
+ */
+export type CompositionWithNestedAnyAndTypeNull = {
+    propA?: Array<ModelWithDictionary | null> | Array<ModelWithArray | null>;
+};
+
+export type _3eNum1Период = 'Bird' | 'Dog';
+
+export type ConstValue = 'ConstValue';
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithNestedAnyOfAndNull = {
+    propA?: Array<_3eNum1Период | ConstValue> | null;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a model that contains a simple dictionary within composition
+ */
+export type CompositionWithOneOfAndSimpleDictionary = {
+    propA?: boolean | {
+        [key: string]: number;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of simple arrays within composition
+ */
+export type CompositionWithOneOfAndSimpleArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<boolean>;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of complex arrays (composited) within composition
+ */
+export type CompositionWithOneOfAndComplexArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<number | string>;
+    };
+};
+
+/**
+ * This is a model with one property with a 'all of' relationship
+ */
+export type CompositionWithAllOfAndNullable = {
+    propA?: ({
+        boolean?: boolean;
+    } & ModelWithEnum & ModelWithArray & ModelWithDictionary) | null;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a base model with two simple optional properties
+ */
+export type CompositionBaseModel = {
+    firstName?: string;
+    lastname?: string;
+};
+
+/**
+ * This is a model that extends the base model
+ */
+export type CompositionExtendedModel = CompositionBaseModel & {
+    age: number;
+    firstName: string;
+    lastname: string;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string | null;
+        } | null;
+    } | null;
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type File = {
+    /**
+     * Id
+     */
+    readonly id?: string;
+    /**
+     * Updated at
+     */
+    readonly updated_at?: string;
+    /**
+     * Created at
+     */
+    readonly created_at?: string;
+    /**
+     * Mime
+     */
+    mime: string;
+    /**
+     * File
+     */
+    readonly file?: string;
+};
+
+export type Default = {
+    name?: string;
+};
+
+export type Pageable = {
+    page?: number;
+    size?: number;
+    sort?: Array<string>;
+};
+
+/**
+ * This is a free-form object without additionalProperties.
+ */
+export type FreeFormObjectWithoutAdditionalProperties = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: true.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqTrue = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: {}.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqEmptyObject = {
+    [key: string]: unknown;
+};
+
+export type ModelWithConst = {
+    String?: 'String';
+    number?: 0;
+    null?: unknown;
+    withType?: 'Some string';
+};
+
+/**
+ * This is a model with one property and additionalProperties: true
+ */
+export type ModelWithAdditionalPropertiesEqTrue = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+    [key: string]: unknown | string | undefined;
+};
+
+export type NestedAnyOfArraysNullable = {
+    nullableArray?: Array<string | boolean> | null;
+};
+
+export type CompositionWithOneOfAndProperties = ({
+    foo: SimpleParameter;
+} | {
+    bar: NonAsciiStringæøåÆøÅöôêÊ字符串;
+}) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * An object that can be null
+ */
+export type NullableObject = {
+    foo?: string;
+} | null;
+
+/**
+ * Some % character
+ */
+export type CharactersInDescription = string;
+
+export type ModelWithNullableObject = {
+    data?: NullableObject;
+};
+
+export type ModelWithOneOfEnum = {
+    foo: 'Bar';
+} | {
+    foo: 'Baz';
+} | {
+    foo: 'Qux';
+} | {
+    content: string;
+    foo: 'Quux';
+} | {
+    content: [
+        string,
+        string
+    ];
+    foo: 'Corge';
+};
+
+export type ModelWithNestedArrayEnumsDataFoo = 'foo' | 'bar';
+
+export type ModelWithNestedArrayEnumsDataBar = 'baz' | 'qux';
+
+export type ModelWithNestedArrayEnumsData = {
+    foo?: Array<ModelWithNestedArrayEnumsDataFoo>;
+    bar?: Array<ModelWithNestedArrayEnumsDataBar>;
+};
+
+export type ModelWithNestedArrayEnums = {
+    array_strings?: Array<string>;
+    data?: ModelWithNestedArrayEnumsData;
+};
+
+export type ModelWithNestedCompositionEnums = {
+    foo?: ModelWithNestedArrayEnumsDataFoo;
+};
+
+export type ModelWithReadOnlyAndWriteOnly = {
+    foo: string;
+    readonly bar: string;
+};
+
+export type ModelWithConstantSizeArray = [
+    number,
+    number
+];
+
+export type ModelWithAnyOfConstantSizeArray = [
+    number | string,
+    number | string,
+    number | string
+];
+
+export type ModelWithPrefixItemsConstantSizeArray = Array<ModelWithInteger | number | string>;
+
+export type ModelWithAnyOfConstantSizeArrayNullable = [
+    number | null | string,
+    number | null | string,
+    number | null | string
+];
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions = [
+    number | Import,
+    number | Import
+];
+
+export type ModelWithAnyOfConstantSizeArrayAndIntersect = [
+    number & string,
+    number & string
+];
+
+export type ModelWithNumericEnumUnion = {
+    /**
+     * Период
+     */
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
+};
+
+/**
+ * Some description with `back ticks`
+ */
+export type ModelWithBackticksInDescription = {
+    /**
+     * The template `that` should be used for parsing and importing the contents of the CSV file.
+     *
+     * <br/><p>There is one placeholder currently supported:<ul>     <li><b>${x}</b> - refers to the n-th column in the CSV file, e.g. ${1}, ${2}, ...)</li></ul><p>Example of a correct JSON template:</p>
+     * <pre>
+     * [
+     * {
+     * "resourceType": "Asset",
+     * "identifier": {
+     * "name": "${1}",
+     * "domain": {
+     * "name": "${2}",
+     * "community": {
+     * "name": "Some Community"
+     * }
+     * }
+     * },
+     * "attributes" : {
+     * "00000000-0000-0000-0000-000000003115" : [ {
+     * "value" : "${3}"
+     * } ],
+     * "00000000-0000-0000-0000-000000000222" : [ {
+     * "value" : "${4}"
+     * } ]
+     * }
+     * }
+     * ]
+     * </pre>
+     */
+    template?: string;
+};
+
+export type ModelWithOneOfAndProperties = (SimpleParameter | NonAsciiStringæøåÆøÅöôêÊ字符串) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * Model used to test deduplication strategy (unused)
+ */
+export type ParameterSimpleParameterUnused = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse2 = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData2 = string;
+
+/**
+ * Model with restricted keyword name
+ */
+export type Import = string;
+
+export type SchemaWithFormRestrictedKeys = {
+    description?: string;
+    'x-enum-descriptions'?: string;
+    'x-enum-varnames'?: string;
+    'x-enumNames'?: string;
+    title?: string;
+    object?: {
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    };
+    array?: Array<{
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    }>;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1DeleteOptions = {
+    /**
+     * Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.
+     */
+    preconditions?: IoK8sApimachineryPkgApisMetaV1Preconditions;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1Preconditions = {
+    /**
+     * Specifies the target ResourceVersion
+     */
+    resourceVersion?: string;
+    /**
+     * Specifies the target UID.
+     */
+    uid?: string;
+};
+
+export type AdditionalPropertiesUnknownIssue = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue2 = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue3 = string & {
+    entries: {
+        [key: string]: AdditionalPropertiesUnknownIssue;
+    };
+};
+
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: number;
+};
+
+export type OneOfAllOfIssue = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBoolean = {
+    item?: boolean;
+    error?: string | null;
+    readonly hasError?: boolean;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemString = {
+    item?: string | null;
+    error?: string | null;
+    readonly hasError?: boolean;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnlyWritable = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnlyWritable>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type FileWritable = {
+    /**
+     * Mime
+     */
+    mime: string;
+};
+
+export type ModelWithReadOnlyAndWriteOnlyWritable = {
+    foo: string;
+    baz: string;
+};
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable = [
+    number | Import,
+    number | Import
+];
+
+export type AdditionalPropertiesUnknownIssueWritable = {
+    [key: string]: string | number;
+};
+
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
+    item?: boolean;
+    error?: string | null;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemStringWritable = {
+    item?: string | null;
+    error?: string | null;
+};
+
+/**
+ * This is a reusable parameter
+ */
+export type SimpleParameter = string;
+
+/**
+ * Parameter with illegal characters
+ */
+export type XFooBar = ModelWithString;
+
+export type SimpleRequestBody = ModelWithString;
+
+export type SimpleFormData = ModelWithString;
+
+export type ExportData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ImportData = {
+    body: ModelWithReadOnlyAndWriteOnlyWritable | ModelWithArrayReadOnlyAndWriteOnlyWritable;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type ImportResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+    /**
+     * Default success response
+     */
+    default: ModelWithReadOnlyAndWriteOnly;
+};
+
+export type ImportResponse = ImportResponses[keyof ImportResponses];
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ApiVVersionODataControllerCountData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple/$count';
+};
+
+export type ApiVVersionODataControllerCountResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+};
+
+export type ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponses[keyof ApiVVersionODataControllerCountResponses];
+
+export type GetApiVbyApiVersionSimpleOperationData = {
+    body?: never;
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/simple:operation';
+};
+
+export type GetApiVbyApiVersionSimpleOperationErrors = {
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type GetApiVbyApiVersionSimpleOperationError = GetApiVbyApiVersionSimpleOperationErrors[keyof GetApiVbyApiVersionSimpleOperationErrors];
+
+export type GetApiVbyApiVersionSimpleOperationResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+};
+
+export type GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponses[keyof GetApiVbyApiVersionSimpleOperationResponses];
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type DeleteFooData3 = {
+    body?: never;
+    headers: {
+        /**
+         * Parameter with illegal characters
+         */
+        'x-Foo-Bar': ModelWithString;
+    };
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+        /**
+         * bar in method
+         */
+        BarParam: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions';
+};
+
+export type DeprecatedCallData = {
+    body?: never;
+    headers: {
+        /**
+         * This parameter is deprecated
+         *
+         * @deprecated
+         */
+        parameter: DeprecatedModel | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/parameters/deprecated';
+};
+
+export type CallWithParametersData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: {
+        [key: string]: unknown;
+    } | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string | null;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        foo_ref_enum?: ModelWithNestedArrayEnumsDataFoo;
+        foo_all_of_enum: ModelWithNestedArrayEnumsDataFoo;
+        /**
+         * This is the parameter that goes into the query params
+         */
+        cursor: string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: ModelWithString | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type GetCallWithOptionalParamData = {
+    /**
+     * This is a required parameter
+     */
+    body: ModelWithOneOfEnum;
+    path?: never;
+    query?: {
+        /**
+         * This is an optional parameter
+         */
+        page?: number;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamData = {
+    /**
+     * This is an optional parameter
+     */
+    body?: {
+        offset?: number | null;
+    };
+    path?: never;
+    query: {
+        /**
+         * This is a required parameter
+         */
+        parameter: Pageable;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponses[keyof PostCallWithOptionalParamResponses];
+
+export type PostApiVbyApiVersionRequestBodyData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleRequestBody;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/requestBody';
+};
+
+export type PostApiVbyApiVersionFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleFormData;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/formData';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString?: string | null;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber?: number | null;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean?: boolean | null;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model with default value
+         */
+        parameterModel?: ModelWithString | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model that is optional with default value
+         */
+        parameterModel?: ModelWithString;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithNoContentResponseResponse = CallWithNoContentResponseResponses[keyof CallWithNoContentResponseResponses];
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    200: _400;
+};
+
+export type DummyAResponse = DummyAResponses[keyof DummyAResponses];
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type DummyBResponse = DummyBResponses[keyof DummyBResponses];
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    default: Import;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for 4XX errors
+     */
+    '4XX': DictionaryWithArray;
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: ModelWithBoolean & ModelWithInteger;
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithStringError;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string> | null;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string | null;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean | null;
+        /**
+         * This is an object parameter
+         */
+        parameterObject: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string> | null;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type UploadFileData = {
+    body: Blob | File;
+    path: {
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query?: never;
+    url: '/api/v{api-version}/upload';
+};
+
+export type UploadFileResponses = {
+    200: boolean;
+};
+
+export type UploadFileResponse = UploadFileResponses[keyof UploadFileResponses];
+
+export type FileResponseData = {
+    body?: never;
+    path: {
+        id: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/file/{id}';
+};
+
+export type FileResponseResponses = {
+    /**
+     * Success
+     */
+    200: Blob | File;
+};
+
+export type FileResponseResponse = FileResponseResponses[keyof FileResponseResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * Parameter containing reference
+         */
+        parameterReference: ModelWithString;
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 `server` error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type MultipartResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type MultipartResponseResponses = {
+    /**
+     * OK
+     */
+    200: {
+        file?: Blob | File;
+        metadata?: {
+            foo?: string;
+            bar?: string;
+        };
+    };
+};
+
+export type MultipartResponseResponse = MultipartResponseResponses[keyof MultipartResponseResponses];
+
+export type MultipartRequestData = {
+    body?: {
+        content?: Blob | File;
+        data?: ModelWithString | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type ComplexParamsData = {
+    body?: {
+        readonly key: string | null;
+        name: string | null;
+        enabled?: boolean;
+        type: 'Monkey' | 'Horse' | 'Bird';
+        listOfModels?: Array<ModelWithString> | null;
+        listOfStrings?: Array<string> | null;
+        parameters: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+        readonly user?: {
+            readonly id?: number;
+            readonly name?: string | null;
+        };
+    };
+    path: {
+        id: number;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/complex/{id}';
+};
+
+export type ComplexParamsResponses = {
+    /**
+     * Success
+     */
+    200: ModelWithString;
+};
+
+export type ComplexParamsResponse = ComplexParamsResponses[keyof ComplexParamsResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: number;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: Array<NonAsciiStringæøåÆøÅöôêÊ字符串>;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PutWithFormUrlEncodedData = {
+    body: ArrayWithStrings;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
new file mode 100644
index 000000000..961114036
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
@@ -0,0 +1,724 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type DefaultError, type InfiniteData, infiniteQueryOptions, queryOptions, type UseMutationOptions } from '@tanstack/vue-query';
+
+import { client } from '../client.gen';
+import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen';
+import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
+        _id: string;
+        _infinite?: boolean;
+        tags?: ReadonlyArray<string>;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (infinite) {
+        params._infinite = infinite;
+    }
+    if (tags) {
+        params.tags = tags;
+    }
+    if (options?.body) {
+        params.body = options.body;
+    }
+    if (options?.headers) {
+        params.headers = options.headers;
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query) {
+        params.query = options.query;
+    }
+    return [
+        params
+    ];
+};
+
+export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
+
+export const exportOptions = (options?: Options<ExportData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await export_({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: exportQueryKey(options)
+    });
+};
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<{data: ImportResponse, response: Response, request: Request }, DefaultError, Options<ImportData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<FooWowData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
+
+export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await apiVVersionODataControllerCount({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: apiVVersionODataControllerCountQueryKey(options)
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
+
+export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getApiVbyApiVersionSimpleOperation({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
+    });
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithoutParametersAndResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithoutParametersAndResponseQueryKey(options)
+    });
+};
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteFooData3>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDescriptionsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeprecatedCallData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
+
+export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithOptionalParam({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamQueryKey(options)
+    });
+};
+
+const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
+    const params = {
+        ...queryKey[0]
+    };
+    if (page.body) {
+        params.body = {
+            ...queryKey[0].body as any,
+            ...page.body as any
+        };
+    }
+    if (page.headers) {
+        params.headers = {
+            ...queryKey[0].headers,
+            ...page.headers
+        };
+    }
+    if (page.path) {
+        params.path = {
+            ...queryKey[0].path as any,
+            ...page.path as any
+        };
+    }
+    if (page.query) {
+        params.query = {
+            ...queryKey[0].query as any,
+            ...page.query as any
+        };
+    }
+    return params as unknown as typeof page;
+};
+
+export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey('getCallWithOptionalParam', options, true);
+
+export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+    // @ts-ignore
+    {
+        queryFn: async ({ pageParam, queryKey, signal }) => {
+            // @ts-ignore
+            const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+                query: {
+                    page: pageParam
+                }
+            };
+            const params = createInfiniteParams(queryKey, page);
+            return await getCallWithOptionalParam({
+                ...options,
+                ...params,
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
+    });
+};
+
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<{data: PostCallWithOptionalParamResponse, response: Response, request: Request }, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithDefaultParameters({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithDefaultParametersQueryKey(options)
+    });
+};
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateNameData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await duplicateName2({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: duplicateName2QueryKey(options)
+    });
+};
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName3Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName4Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithNoContentResponseQueryKey(options)
+    });
+};
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponseAndNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseAndNoContentResponseQueryKey(options)
+    });
+};
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAOptions = (options?: Options<DummyAData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyA({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyAQueryKey(options)
+    });
+};
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBOptions = (options?: Options<DummyBData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyB({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyBQueryKey(options)
+    });
+};
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseQueryKey(options)
+    });
+};
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatOptions = (options: Options<CollectionFormatData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await collectionFormat({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: collectionFormatQueryKey(options)
+    });
+};
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesOptions = (options: Options<TypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await types({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: typesQueryKey(options)
+    });
+};
+
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<{data: UploadFileResponse, response: Response, request: Request }, DefaultError, Options<UploadFileData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
+
+export const fileResponseOptions = (options: Options<FileResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await fileResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: fileResponseQueryKey(options)
+    });
+};
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await complexTypes({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: complexTypesQueryKey(options)
+    });
+};
+
+export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
+
+export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await multipartResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: multipartResponseQueryKey(options)
+    });
+};
+
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<MultipartRequestData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<{data: ComplexParamsResponse, response: Response, request: Request }, DefaultError, Options<ComplexParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<TestErrorCodeData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
new file mode 100644
index 000000000..4166f8b7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
@@ -0,0 +1,418 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
+import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const export_ = <ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple/$count',
+        ...options
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+        url: '/api/v{api-version}/simple:operation',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions',
+        ...options
+    });
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/deprecated',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/requestBody',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/formData',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/upload',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
+
+export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/file/{id}',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const multipartResponse = <ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multipart',
+        ...options
+    });
+};
+
+export const multipartRequest = <ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/multipart',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/complex/{id}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json-patch+json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
new file mode 100644
index 000000000..ef8b52efd
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
@@ -0,0 +1,2072 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+/**
+ * Model with number-only name
+ */
+export type _400 = string;
+
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CamelCaseCommentWithBreaks = number;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+/**
+ * This is a simple reference
+ */
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string | null;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+export type EnumWithReplacedCharacters = "'Single Quote'" | '"Double Quotes"' | 'øæåôöØÆÅÔÖ字符串' | 3.1 | '';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+export type EnumWithXEnumNames = 0 | 1 | 2;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    '16x16'?: CamelCaseCommentWithBreaks;
+    bar?: string;
+}>;
+
+/**
+ * This is a simple array with any of properties
+ */
+export type ArrayWithAnyOfProperties = Array<{
+    foo?: string;
+} | {
+    bar?: string;
+}>;
+
+export type AnyOfAnyAndNull = {
+    data?: unknown;
+};
+
+/**
+ * This is a simple array with any of properties
+ */
+export type AnyOfArrays = {
+    results?: Array<{
+        foo?: string;
+    } | {
+        bar?: string;
+    }>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+export type DictionaryWithPropertiesAndAdditionalProperties = {
+    foo?: number;
+    bar?: boolean;
+    [key: string]: string | number | boolean | undefined;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * `Comment` or `VoiceComment`. The JSON object for adding voice comments to tickets is different. See [Adding voice comments to tickets](/documentation/ticketing/managing-tickets/adding-voice-comments-to-tickets)
+ */
+export type ModelFromZendesk = string;
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp1?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp1: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableProp2?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp2: string | null;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum with escaped name
+ */
+export type ModelWithEnumWithHyphen = {
+    /**
+     * Foo-Bar-Baz-Qux
+     */
+    'foo-bar-baz-qux'?: '3.0';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnly = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnly>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a deprecated model with a deprecated property
+ *
+ * @deprecated
+ */
+export type DeprecatedModel = {
+    /**
+     * This is a deprecated property
+     *
+     * @deprecated
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * Circle
+ */
+export type ModelCircle = {
+    kind: string;
+    radius?: number;
+};
+
+/**
+ * Square
+ */
+export type ModelSquare = {
+    kind: string;
+    sideLength?: number;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfDiscriminator = ({
+    kind: 'circle';
+} & ModelCircle) | ({
+    kind: 'square';
+} & ModelSquare);
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithAnyOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * This is a model with nested 'any of' property with a type null
+ */
+export type CompositionWithNestedAnyAndTypeNull = {
+    propA?: Array<ModelWithDictionary | null> | Array<ModelWithArray | null>;
+};
+
+export type _3eNum1Период = 'Bird' | 'Dog';
+
+export type ConstValue = 'ConstValue';
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithNestedAnyOfAndNull = {
+    propA?: Array<_3eNum1Период | ConstValue> | null;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a model that contains a simple dictionary within composition
+ */
+export type CompositionWithOneOfAndSimpleDictionary = {
+    propA?: boolean | {
+        [key: string]: number;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of simple arrays within composition
+ */
+export type CompositionWithOneOfAndSimpleArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<boolean>;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of complex arrays (composited) within composition
+ */
+export type CompositionWithOneOfAndComplexArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<number | string>;
+    };
+};
+
+/**
+ * This is a model with one property with a 'all of' relationship
+ */
+export type CompositionWithAllOfAndNullable = {
+    propA?: ({
+        boolean?: boolean;
+    } & ModelWithEnum & ModelWithArray & ModelWithDictionary) | null;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a base model with two simple optional properties
+ */
+export type CompositionBaseModel = {
+    firstName?: string;
+    lastname?: string;
+};
+
+/**
+ * This is a model that extends the base model
+ */
+export type CompositionExtendedModel = CompositionBaseModel & {
+    age: number;
+    firstName: string;
+    lastname: string;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string | null;
+        } | null;
+    } | null;
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type File = {
+    /**
+     * Id
+     */
+    readonly id?: string;
+    /**
+     * Updated at
+     */
+    readonly updated_at?: string;
+    /**
+     * Created at
+     */
+    readonly created_at?: string;
+    /**
+     * Mime
+     */
+    mime: string;
+    /**
+     * File
+     */
+    readonly file?: string;
+};
+
+export type Default = {
+    name?: string;
+};
+
+export type Pageable = {
+    page?: number;
+    size?: number;
+    sort?: Array<string>;
+};
+
+/**
+ * This is a free-form object without additionalProperties.
+ */
+export type FreeFormObjectWithoutAdditionalProperties = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: true.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqTrue = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: {}.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqEmptyObject = {
+    [key: string]: unknown;
+};
+
+export type ModelWithConst = {
+    String?: 'String';
+    number?: 0;
+    null?: unknown;
+    withType?: 'Some string';
+};
+
+/**
+ * This is a model with one property and additionalProperties: true
+ */
+export type ModelWithAdditionalPropertiesEqTrue = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+    [key: string]: unknown | string | undefined;
+};
+
+export type NestedAnyOfArraysNullable = {
+    nullableArray?: Array<string | boolean> | null;
+};
+
+export type CompositionWithOneOfAndProperties = ({
+    foo: SimpleParameter;
+} | {
+    bar: NonAsciiStringæøåÆøÅöôêÊ字符串;
+}) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * An object that can be null
+ */
+export type NullableObject = {
+    foo?: string;
+} | null;
+
+/**
+ * Some % character
+ */
+export type CharactersInDescription = string;
+
+export type ModelWithNullableObject = {
+    data?: NullableObject;
+};
+
+export type ModelWithOneOfEnum = {
+    foo: 'Bar';
+} | {
+    foo: 'Baz';
+} | {
+    foo: 'Qux';
+} | {
+    content: string;
+    foo: 'Quux';
+} | {
+    content: [
+        string,
+        string
+    ];
+    foo: 'Corge';
+};
+
+export type ModelWithNestedArrayEnumsDataFoo = 'foo' | 'bar';
+
+export type ModelWithNestedArrayEnumsDataBar = 'baz' | 'qux';
+
+export type ModelWithNestedArrayEnumsData = {
+    foo?: Array<ModelWithNestedArrayEnumsDataFoo>;
+    bar?: Array<ModelWithNestedArrayEnumsDataBar>;
+};
+
+export type ModelWithNestedArrayEnums = {
+    array_strings?: Array<string>;
+    data?: ModelWithNestedArrayEnumsData;
+};
+
+export type ModelWithNestedCompositionEnums = {
+    foo?: ModelWithNestedArrayEnumsDataFoo;
+};
+
+export type ModelWithReadOnlyAndWriteOnly = {
+    foo: string;
+    readonly bar: string;
+};
+
+export type ModelWithConstantSizeArray = [
+    number,
+    number
+];
+
+export type ModelWithAnyOfConstantSizeArray = [
+    number | string,
+    number | string,
+    number | string
+];
+
+export type ModelWithPrefixItemsConstantSizeArray = Array<ModelWithInteger | number | string>;
+
+export type ModelWithAnyOfConstantSizeArrayNullable = [
+    number | null | string,
+    number | null | string,
+    number | null | string
+];
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions = [
+    number | Import,
+    number | Import
+];
+
+export type ModelWithAnyOfConstantSizeArrayAndIntersect = [
+    number & string,
+    number & string
+];
+
+export type ModelWithNumericEnumUnion = {
+    /**
+     * Период
+     */
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
+};
+
+/**
+ * Some description with `back ticks`
+ */
+export type ModelWithBackticksInDescription = {
+    /**
+     * The template `that` should be used for parsing and importing the contents of the CSV file.
+     *
+     * <br/><p>There is one placeholder currently supported:<ul>     <li><b>${x}</b> - refers to the n-th column in the CSV file, e.g. ${1}, ${2}, ...)</li></ul><p>Example of a correct JSON template:</p>
+     * <pre>
+     * [
+     * {
+     * "resourceType": "Asset",
+     * "identifier": {
+     * "name": "${1}",
+     * "domain": {
+     * "name": "${2}",
+     * "community": {
+     * "name": "Some Community"
+     * }
+     * }
+     * },
+     * "attributes" : {
+     * "00000000-0000-0000-0000-000000003115" : [ {
+     * "value" : "${3}"
+     * } ],
+     * "00000000-0000-0000-0000-000000000222" : [ {
+     * "value" : "${4}"
+     * } ]
+     * }
+     * }
+     * ]
+     * </pre>
+     */
+    template?: string;
+};
+
+export type ModelWithOneOfAndProperties = (SimpleParameter | NonAsciiStringæøåÆøÅöôêÊ字符串) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * Model used to test deduplication strategy (unused)
+ */
+export type ParameterSimpleParameterUnused = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse2 = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData2 = string;
+
+/**
+ * Model with restricted keyword name
+ */
+export type Import = string;
+
+export type SchemaWithFormRestrictedKeys = {
+    description?: string;
+    'x-enum-descriptions'?: string;
+    'x-enum-varnames'?: string;
+    'x-enumNames'?: string;
+    title?: string;
+    object?: {
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    };
+    array?: Array<{
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    }>;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1DeleteOptions = {
+    /**
+     * Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.
+     */
+    preconditions?: IoK8sApimachineryPkgApisMetaV1Preconditions;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1Preconditions = {
+    /**
+     * Specifies the target ResourceVersion
+     */
+    resourceVersion?: string;
+    /**
+     * Specifies the target UID.
+     */
+    uid?: string;
+};
+
+export type AdditionalPropertiesUnknownIssue = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue2 = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue3 = string & {
+    entries: {
+        [key: string]: AdditionalPropertiesUnknownIssue;
+    };
+};
+
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: number;
+};
+
+export type OneOfAllOfIssue = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBoolean = {
+    item?: boolean;
+    error?: string | null;
+    readonly hasError?: boolean;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemString = {
+    item?: string | null;
+    error?: string | null;
+    readonly hasError?: boolean;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnlyWritable = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnlyWritable>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type FileWritable = {
+    /**
+     * Mime
+     */
+    mime: string;
+};
+
+export type ModelWithReadOnlyAndWriteOnlyWritable = {
+    foo: string;
+    baz: string;
+};
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable = [
+    number | Import,
+    number | Import
+];
+
+export type AdditionalPropertiesUnknownIssueWritable = {
+    [key: string]: string | number;
+};
+
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
+    item?: boolean;
+    error?: string | null;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemStringWritable = {
+    item?: string | null;
+    error?: string | null;
+};
+
+/**
+ * This is a reusable parameter
+ */
+export type SimpleParameter = string;
+
+/**
+ * Parameter with illegal characters
+ */
+export type XFooBar = ModelWithString;
+
+export type SimpleRequestBody = ModelWithString;
+
+export type SimpleFormData = ModelWithString;
+
+export type ExportData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ImportData = {
+    body: ModelWithReadOnlyAndWriteOnlyWritable | ModelWithArrayReadOnlyAndWriteOnlyWritable;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type ImportResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+    /**
+     * Default success response
+     */
+    default: ModelWithReadOnlyAndWriteOnly;
+};
+
+export type ImportResponse = ImportResponses[keyof ImportResponses];
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ApiVVersionODataControllerCountData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple/$count';
+};
+
+export type ApiVVersionODataControllerCountResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+};
+
+export type ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponses[keyof ApiVVersionODataControllerCountResponses];
+
+export type GetApiVbyApiVersionSimpleOperationData = {
+    body?: never;
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/simple:operation';
+};
+
+export type GetApiVbyApiVersionSimpleOperationErrors = {
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type GetApiVbyApiVersionSimpleOperationError = GetApiVbyApiVersionSimpleOperationErrors[keyof GetApiVbyApiVersionSimpleOperationErrors];
+
+export type GetApiVbyApiVersionSimpleOperationResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+};
+
+export type GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponses[keyof GetApiVbyApiVersionSimpleOperationResponses];
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type DeleteFooData3 = {
+    body?: never;
+    headers: {
+        /**
+         * Parameter with illegal characters
+         */
+        'x-Foo-Bar': ModelWithString;
+    };
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+        /**
+         * bar in method
+         */
+        BarParam: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions';
+};
+
+export type DeprecatedCallData = {
+    body?: never;
+    headers: {
+        /**
+         * This parameter is deprecated
+         *
+         * @deprecated
+         */
+        parameter: DeprecatedModel | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/parameters/deprecated';
+};
+
+export type CallWithParametersData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: {
+        [key: string]: unknown;
+    } | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string | null;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        foo_ref_enum?: ModelWithNestedArrayEnumsDataFoo;
+        foo_all_of_enum: ModelWithNestedArrayEnumsDataFoo;
+        /**
+         * This is the parameter that goes into the query params
+         */
+        cursor: string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: ModelWithString | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type GetCallWithOptionalParamData = {
+    /**
+     * This is a required parameter
+     */
+    body: ModelWithOneOfEnum;
+    path?: never;
+    query?: {
+        /**
+         * This is an optional parameter
+         */
+        page?: number;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamData = {
+    /**
+     * This is an optional parameter
+     */
+    body?: {
+        offset?: number | null;
+    };
+    path?: never;
+    query: {
+        /**
+         * This is a required parameter
+         */
+        parameter: Pageable;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponses[keyof PostCallWithOptionalParamResponses];
+
+export type PostApiVbyApiVersionRequestBodyData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleRequestBody;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/requestBody';
+};
+
+export type PostApiVbyApiVersionFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleFormData;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/formData';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString?: string | null;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber?: number | null;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean?: boolean | null;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model with default value
+         */
+        parameterModel?: ModelWithString | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model that is optional with default value
+         */
+        parameterModel?: ModelWithString;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithNoContentResponseResponse = CallWithNoContentResponseResponses[keyof CallWithNoContentResponseResponses];
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    200: _400;
+};
+
+export type DummyAResponse = DummyAResponses[keyof DummyAResponses];
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type DummyBResponse = DummyBResponses[keyof DummyBResponses];
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    default: Import;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for 4XX errors
+     */
+    '4XX': DictionaryWithArray;
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: ModelWithBoolean & ModelWithInteger;
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithStringError;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string> | null;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string | null;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean | null;
+        /**
+         * This is an object parameter
+         */
+        parameterObject: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string> | null;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error';
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type UploadFileData = {
+    body: Blob | File;
+    path: {
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query?: never;
+    url: '/api/v{api-version}/upload';
+};
+
+export type UploadFileResponses = {
+    200: boolean;
+};
+
+export type UploadFileResponse = UploadFileResponses[keyof UploadFileResponses];
+
+export type FileResponseData = {
+    body?: never;
+    path: {
+        id: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/file/{id}';
+};
+
+export type FileResponseResponses = {
+    /**
+     * Success
+     */
+    200: Blob | File;
+};
+
+export type FileResponseResponse = FileResponseResponses[keyof FileResponseResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * Parameter containing reference
+         */
+        parameterReference: ModelWithString;
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 `server` error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type MultipartResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type MultipartResponseResponses = {
+    /**
+     * OK
+     */
+    200: {
+        file?: Blob | File;
+        metadata?: {
+            foo?: string;
+            bar?: string;
+        };
+    };
+};
+
+export type MultipartResponseResponse = MultipartResponseResponses[keyof MultipartResponseResponses];
+
+export type MultipartRequestData = {
+    body?: {
+        content?: Blob | File;
+        data?: ModelWithString | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type ComplexParamsData = {
+    body?: {
+        readonly key: string | null;
+        name: string | null;
+        enabled?: boolean;
+        type: 'Monkey' | 'Horse' | 'Bird';
+        listOfModels?: Array<ModelWithString> | null;
+        listOfStrings?: Array<string> | null;
+        parameters: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+        readonly user?: {
+            readonly id?: number;
+            readonly name?: string | null;
+        };
+    };
+    path: {
+        id: number;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/complex/{id}';
+};
+
+export type ComplexParamsResponses = {
+    /**
+     * Success
+     */
+    200: ModelWithString;
+};
+
+export type ComplexParamsResponse = ComplexParamsResponses[keyof ComplexParamsResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: number;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: Array<NonAsciiStringæøåÆøÅöôêÊ字符串>;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PutWithFormUrlEncodedData = {
+    body: ArrayWithStrings;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
new file mode 100644
index 000000000..15ee607eb
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
@@ -0,0 +1,620 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type _JSONValue, defineQueryOptions, type UseMutationOptions } from '@pinia/colada';
+
+import { serializeQueryKeyValue } from '../client';
+import { client } from '../client.gen';
+import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen';
+import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'path'> & {
+        _id: string;
+        baseUrl?: _JSONValue;
+        body?: _JSONValue;
+        query?: _JSONValue;
+        tags?: _JSONValue;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (tags) {
+        params.tags = tags as unknown as _JSONValue;
+    }
+    if (options?.body !== undefined) {
+        const normalizedBody = serializeQueryKeyValue(options.body);
+        if (normalizedBody !== undefined) {
+            params.body = normalizedBody;
+        }
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query !== undefined) {
+        const normalizedQuery = serializeQueryKeyValue(options.query);
+        if (normalizedQuery !== undefined) {
+            params.query = normalizedQuery;
+        }
+    }
+    return [
+        params
+    ];
+};
+
+export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
+
+export const exportQuery = defineQueryOptions((options?: Options<ExportData>) => ({
+    key: exportQueryKey(options),
+    query: async (context) => {
+        return await export_({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, Options<ImportData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
+
+export const apiVVersionODataControllerCountQuery = defineQueryOptions((options?: Options<ApiVVersionODataControllerCountData>) => ({
+    key: apiVVersionODataControllerCountQueryKey(options),
+    query: async (context) => {
+        return await apiVVersionODataControllerCount({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
+
+export const getApiVbyApiVersionSimpleOperationQuery = defineQueryOptions((options: Options<GetApiVbyApiVersionSimpleOperationData>) => ({
+    key: getApiVbyApiVersionSimpleOperationQueryKey(options),
+    query: async (context) => {
+        return await getApiVbyApiVersionSimpleOperation({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((options?: Options<GetCallWithoutParametersAndResponseData>) => ({
+    key: getCallWithoutParametersAndResponseQueryKey(options),
+    query: async (context) => {
+        return await getCallWithoutParametersAndResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, Options<DeleteFooData3>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, Options<DeprecatedCallData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
+
+export const getCallWithOptionalParamQuery = defineQueryOptions((options: Options<GetCallWithOptionalParamData>) => ({
+    key: getCallWithOptionalParamQueryKey(options),
+    query: async (context) => {
+        return await getCallWithOptionalParam({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, Options<PostCallWithOptionalParamData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionRequestBodyData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionFormDataData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersQuery = defineQueryOptions((options?: Options<CallWithDefaultParametersData>) => ({
+    key: callWithDefaultParametersQueryKey(options),
+    query: async (context) => {
+        return await callWithDefaultParameters({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Query = defineQueryOptions((options?: Options<DuplicateName2Data>) => ({
+    key: duplicateName2QueryKey(options),
+    query: async (context) => {
+        return await duplicateName2({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithNoContentResponseData>) => ({
+    key: callWithNoContentResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseQuery = defineQueryOptions((options?: Options<CallWithResponseAndNoContentResponseData>) => ({
+    key: callWithResponseAndNoContentResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithResponseAndNoContentResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAQuery = defineQueryOptions((options?: Options<DummyAData>) => ({
+    key: dummyAQueryKey(options),
+    query: async (context) => {
+        return await dummyA({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBQuery = defineQueryOptions((options?: Options<DummyBData>) => ({
+    key: dummyBQueryKey(options),
+    query: async (context) => {
+        return await dummyB({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseQuery = defineQueryOptions((options?: Options<CallWithResponseData>) => ({
+    key: callWithResponseQueryKey(options),
+    query: async (context) => {
+        return await callWithResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatQuery = defineQueryOptions((options: Options<CollectionFormatData>) => ({
+    key: collectionFormatQueryKey(options),
+    query: async (context) => {
+        return await collectionFormat({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
+    key: typesQueryKey(options),
+    query: async (context) => {
+        return await types({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, Options<UploadFileData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
+
+export const fileResponseQuery = defineQueryOptions((options: Options<FileResponseData>) => ({
+    key: fileResponseQueryKey(options),
+    query: async (context) => {
+        return await fileResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTypesData>) => ({
+    key: complexTypesQueryKey(options),
+    query: async (context) => {
+        return await complexTypes({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
+
+export const multipartResponseQuery = defineQueryOptions((options?: Options<MultipartResponseData>) => ({
+    key: multipartResponseQueryKey(options),
+    query: async (context) => {
+        return await multipartResponse({
+            ...options,
+            ...context,
+            throwOnError: true
+        });
+    }
+}));
+
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, Options<MultipartRequestData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, Options<ComplexParamsData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, Options<PutWithFormUrlEncodedData>, Error> => {
+    return {
+        mutation: async (fnOptions) => {
+            return await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
new file mode 100644
index 000000000..4166f8b7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/sdk.gen.ts
@@ -0,0 +1,418 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
+import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const export_ = <ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple/$count',
+        ...options
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+        url: '/api/v{api-version}/simple:operation',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions',
+        ...options
+    });
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/deprecated',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/requestBody',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/formData',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/upload',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
+
+export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/file/{id}',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const multipartResponse = <ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multipart',
+        ...options
+    });
+};
+
+export const multipartRequest = <ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/multipart',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/complex/{id}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json-patch+json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
new file mode 100644
index 000000000..3cdf939bb
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/types.gen.ts
@@ -0,0 +1,2091 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+/**
+ * Model with number-only name
+ */
+export type _400 = string;
+
+/**
+ * External ref to shared model (A)
+ */
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+/**
+ * External ref to shared model (B)
+ */
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CamelCaseCommentWithBreaks = number;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+/**
+ * This is a simple reference
+ */
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string | null;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+export type EnumWithReplacedCharacters = "'Single Quote'" | '"Double Quotes"' | 'øæåôöØÆÅÔÖ字符串' | 3.1 | '';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+export type EnumWithXEnumNames = 0 | 1 | 2;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    '16x16'?: CamelCaseCommentWithBreaks;
+    bar?: string;
+}>;
+
+/**
+ * This is a simple array with any of properties
+ */
+export type ArrayWithAnyOfProperties = Array<{
+    foo?: string;
+} | {
+    bar?: string;
+}>;
+
+export type AnyOfAnyAndNull = {
+    data?: unknown | null;
+};
+
+/**
+ * This is a simple array with any of properties
+ */
+export type AnyOfArrays = {
+    results?: Array<{
+        foo?: string;
+    } | {
+        bar?: string;
+    }>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+export type DictionaryWithPropertiesAndAdditionalProperties = {
+    foo?: number;
+    bar?: boolean;
+    [key: string]: string | number | boolean | undefined;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * `Comment` or `VoiceComment`. The JSON object for adding voice comments to tickets is different. See [Adding voice comments to tickets](/documentation/ticketing/managing-tickets/adding-voice-comments-to-tickets)
+ */
+export type ModelFromZendesk = string;
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp1?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp1: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableProp2?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp2: string | null;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum with escaped name
+ */
+export type ModelWithEnumWithHyphen = {
+    /**
+     * Foo-Bar-Baz-Qux
+     */
+    'foo-bar-baz-qux'?: '3.0';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnly = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnly>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a deprecated model with a deprecated property
+ *
+ * @deprecated
+ */
+export type DeprecatedModel = {
+    /**
+     * This is a deprecated property
+     *
+     * @deprecated
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * Circle
+ */
+export type ModelCircle = {
+    kind: string;
+    radius?: number;
+};
+
+/**
+ * Square
+ */
+export type ModelSquare = {
+    kind: string;
+    sideLength?: number;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfDiscriminator = ({
+    kind: 'circle';
+} & ModelCircle) | ({
+    kind: 'square';
+} & ModelSquare);
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithAnyOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * This is a model with nested 'any of' property with a type null
+ */
+export type CompositionWithNestedAnyAndTypeNull = {
+    propA?: Array<ModelWithDictionary | null> | Array<ModelWithArray | null>;
+};
+
+export type _3eNum1Период = 'Bird' | 'Dog';
+
+export type ConstValue = 'ConstValue';
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithNestedAnyOfAndNull = {
+    /**
+     * Scopes
+     */
+    propA?: Array<_3eNum1Период | ConstValue> | null;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a model that contains a simple dictionary within composition
+ */
+export type CompositionWithOneOfAndSimpleDictionary = {
+    propA?: boolean | {
+        [key: string]: number;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of simple arrays within composition
+ */
+export type CompositionWithOneOfAndSimpleArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<boolean>;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of complex arrays (composited) within composition
+ */
+export type CompositionWithOneOfAndComplexArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<number | string>;
+    };
+};
+
+/**
+ * This is a model with one property with a 'all of' relationship
+ */
+export type CompositionWithAllOfAndNullable = {
+    propA?: ({
+        boolean?: boolean;
+    } & ModelWithEnum & ModelWithArray & ModelWithDictionary) | null;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a base model with two simple optional properties
+ */
+export type CompositionBaseModel = {
+    firstName?: string;
+    lastname?: string;
+};
+
+/**
+ * This is a model that extends the base model
+ */
+export type CompositionExtendedModel = CompositionBaseModel & {
+    age: number;
+    firstName: string;
+    lastname: string;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string | null;
+        } | null;
+    } | null;
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type File = {
+    /**
+     * Id
+     */
+    readonly id?: string;
+    /**
+     * Updated at
+     */
+    readonly updated_at?: string;
+    /**
+     * Created at
+     */
+    readonly created_at?: string;
+    /**
+     * Mime
+     */
+    mime: string;
+    /**
+     * File
+     */
+    readonly file?: string;
+};
+
+export type Default = {
+    name?: string;
+};
+
+export type Pageable = {
+    page?: number;
+    size?: number;
+    sort?: Array<string>;
+};
+
+/**
+ * This is a free-form object without additionalProperties.
+ */
+export type FreeFormObjectWithoutAdditionalProperties = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: true.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqTrue = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: {}.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqEmptyObject = {
+    [key: string]: unknown;
+};
+
+export type ModelWithConst = {
+    String?: 'String';
+    number?: 0;
+    null?: null;
+    withType?: 'Some string';
+};
+
+/**
+ * This is a model with one property and additionalProperties: true
+ */
+export type ModelWithAdditionalPropertiesEqTrue = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+    [key: string]: unknown | string | undefined;
+};
+
+export type NestedAnyOfArraysNullable = {
+    nullableArray?: Array<string | boolean> | null;
+};
+
+export type CompositionWithOneOfAndProperties = ({
+    foo: SimpleParameter;
+} | {
+    bar: NonAsciiStringæøåÆøÅöôêÊ字符串;
+}) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * An object that can be null
+ */
+export type NullableObject = {
+    foo?: string;
+} | null;
+
+/**
+ * Some % character
+ */
+export type CharactersInDescription = string;
+
+export type ModelWithNullableObject = {
+    data?: NullableObject;
+};
+
+export type ModelWithOneOfEnum = {
+    foo: 'Bar';
+} | {
+    foo: 'Baz';
+} | {
+    foo: 'Qux';
+} | {
+    content: string;
+    foo: 'Quux';
+} | {
+    content: [
+        string,
+        string
+    ];
+    foo: 'Corge';
+};
+
+export type ModelWithNestedArrayEnumsDataFoo = 'foo' | 'bar';
+
+export type ModelWithNestedArrayEnumsDataBar = 'baz' | 'qux';
+
+export type ModelWithNestedArrayEnumsData = {
+    foo?: Array<ModelWithNestedArrayEnumsDataFoo>;
+    bar?: Array<ModelWithNestedArrayEnumsDataBar>;
+};
+
+export type ModelWithNestedArrayEnums = {
+    array_strings?: Array<string>;
+    data?: ModelWithNestedArrayEnumsData;
+};
+
+export type ModelWithNestedCompositionEnums = {
+    foo?: ModelWithNestedArrayEnumsDataFoo;
+};
+
+export type ModelWithReadOnlyAndWriteOnly = {
+    foo: string;
+    readonly bar: string;
+};
+
+export type ModelWithConstantSizeArray = [
+    number,
+    number
+];
+
+export type ModelWithAnyOfConstantSizeArray = [
+    number | string,
+    number | string,
+    number | string
+];
+
+export type ModelWithPrefixItemsConstantSizeArray = [
+    ModelWithInteger,
+    number | string,
+    string
+];
+
+export type ModelWithAnyOfConstantSizeArrayNullable = [
+    number | null | string,
+    number | null | string,
+    number | null | string
+];
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions = [
+    number | Import,
+    number | Import
+];
+
+export type ModelWithAnyOfConstantSizeArrayAndIntersect = [
+    number & string,
+    number & string
+];
+
+export type ModelWithNumericEnumUnion = {
+    /**
+     * Период
+     */
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
+};
+
+/**
+ * Some description with `back ticks`
+ */
+export type ModelWithBackticksInDescription = {
+    /**
+     * The template `that` should be used for parsing and importing the contents of the CSV file.
+     *
+     * <br/><p>There is one placeholder currently supported:<ul>     <li><b>${x}</b> - refers to the n-th column in the CSV file, e.g. ${1}, ${2}, ...)</li></ul><p>Example of a correct JSON template:</p>
+     * <pre>
+     * [
+     * {
+     * "resourceType": "Asset",
+     * "identifier": {
+     * "name": "${1}",
+     * "domain": {
+     * "name": "${2}",
+     * "community": {
+     * "name": "Some Community"
+     * }
+     * }
+     * },
+     * "attributes" : {
+     * "00000000-0000-0000-0000-000000003115" : [ {
+     * "value" : "${3}"
+     * } ],
+     * "00000000-0000-0000-0000-000000000222" : [ {
+     * "value" : "${4}"
+     * } ]
+     * }
+     * }
+     * ]
+     * </pre>
+     */
+    template?: string;
+};
+
+export type ModelWithOneOfAndProperties = (SimpleParameter | NonAsciiStringæøåÆøÅöôêÊ字符串) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * Model used to test deduplication strategy (unused)
+ */
+export type ParameterSimpleParameterUnused = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse2 = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData2 = string;
+
+/**
+ * Model with restricted keyword name
+ */
+export type Import = string;
+
+export type SchemaWithFormRestrictedKeys = {
+    description?: string;
+    'x-enum-descriptions'?: string;
+    'x-enum-varnames'?: string;
+    'x-enumNames'?: string;
+    title?: string;
+    object?: {
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    };
+    array?: Array<{
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    }>;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1DeleteOptions = {
+    /**
+     * Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.
+     */
+    preconditions?: IoK8sApimachineryPkgApisMetaV1Preconditions;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1Preconditions = {
+    /**
+     * Specifies the target ResourceVersion
+     */
+    resourceVersion?: string;
+    /**
+     * Specifies the target UID.
+     */
+    uid?: string;
+};
+
+export type AdditionalPropertiesUnknownIssue = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue2 = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue3 = string & {
+    entries: {
+        [key: string]: AdditionalPropertiesUnknownIssue;
+    };
+};
+
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: number;
+};
+
+export type OneOfAllOfIssue = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBoolean = {
+    item?: boolean;
+    error?: string | null;
+    readonly hasError?: boolean;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemString = {
+    item?: string | null;
+    error?: string | null;
+    readonly hasError?: boolean;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnlyWritable = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnlyWritable>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type FileWritable = {
+    /**
+     * Mime
+     */
+    mime: string;
+};
+
+export type ModelWithReadOnlyAndWriteOnlyWritable = {
+    foo: string;
+    baz: string;
+};
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable = [
+    number | Import,
+    number | Import
+];
+
+export type AdditionalPropertiesUnknownIssueWritable = {
+    [key: string]: string | number;
+};
+
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
+    item?: boolean;
+    error?: string | null;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemStringWritable = {
+    item?: string | null;
+    error?: string | null;
+};
+
+/**
+ * This is a reusable parameter
+ */
+export type SimpleParameter = string;
+
+/**
+ * Parameter with illegal characters
+ */
+export type XFooBar = ModelWithString;
+
+/**
+ * A reusable request body
+ */
+export type SimpleRequestBody = ModelWithString;
+
+/**
+ * A reusable request body
+ */
+export type SimpleFormData = ModelWithString;
+
+export type ExportData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ImportData = {
+    body: ModelWithReadOnlyAndWriteOnlyWritable | ModelWithArrayReadOnlyAndWriteOnlyWritable;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type ImportResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+    /**
+     * Default success response
+     */
+    default: ModelWithReadOnlyAndWriteOnly;
+};
+
+export type ImportResponse = ImportResponses[keyof ImportResponses];
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ApiVVersionODataControllerCountData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple/$count';
+};
+
+export type ApiVVersionODataControllerCountResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+};
+
+export type ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponses[keyof ApiVVersionODataControllerCountResponses];
+
+export type GetApiVbyApiVersionSimpleOperationData = {
+    body?: never;
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/simple:operation';
+};
+
+export type GetApiVbyApiVersionSimpleOperationErrors = {
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type GetApiVbyApiVersionSimpleOperationError = GetApiVbyApiVersionSimpleOperationErrors[keyof GetApiVbyApiVersionSimpleOperationErrors];
+
+export type GetApiVbyApiVersionSimpleOperationResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+};
+
+export type GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponses[keyof GetApiVbyApiVersionSimpleOperationResponses];
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type DeleteFooData3 = {
+    body?: never;
+    headers: {
+        /**
+         * Parameter with illegal characters
+         */
+        'x-Foo-Bar': ModelWithString;
+    };
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+        /**
+         * bar in method
+         */
+        BarParam: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions';
+};
+
+export type DeprecatedCallData = {
+    body?: never;
+    headers: {
+        /**
+         * This parameter is deprecated
+         *
+         * @deprecated
+         */
+        parameter: DeprecatedModel | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/parameters/deprecated';
+};
+
+export type CallWithParametersData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: {
+        [key: string]: unknown;
+    } | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string | null;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        foo_ref_enum?: ModelWithNestedArrayEnumsDataFoo;
+        foo_all_of_enum: ModelWithNestedArrayEnumsDataFoo;
+        /**
+         * This is the parameter that goes into the query params
+         */
+        cursor: string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: ModelWithString | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type GetCallWithOptionalParamData = {
+    /**
+     * This is a required parameter
+     */
+    body: ModelWithOneOfEnum;
+    path?: never;
+    query?: {
+        /**
+         * This is an optional parameter
+         */
+        page?: number;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamData = {
+    /**
+     * This is an optional parameter
+     */
+    body?: {
+        offset?: number | null;
+    };
+    path?: never;
+    query: {
+        /**
+         * This is a required parameter
+         */
+        parameter: Pageable;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponses[keyof PostCallWithOptionalParamResponses];
+
+export type PostApiVbyApiVersionRequestBodyData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleRequestBody;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/requestBody';
+};
+
+export type PostApiVbyApiVersionFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleFormData;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/formData';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString?: string | null;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber?: number | null;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean?: boolean | null;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model with default value
+         */
+        parameterModel?: ModelWithString | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model that is optional with default value
+         */
+        parameterModel?: ModelWithString;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithNoContentResponseResponse = CallWithNoContentResponseResponses[keyof CallWithNoContentResponseResponses];
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    200: _400;
+};
+
+export type DummyAResponse = DummyAResponses[keyof DummyAResponses];
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type DummyBResponse = DummyBResponses[keyof DummyBResponses];
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    default: Import;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for 4XX errors
+     */
+    '4XX': DictionaryWithArray;
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: ModelWithBoolean & ModelWithInteger;
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithStringError;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string> | null;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string | null;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean | null;
+        /**
+         * This is an object parameter
+         */
+        parameterObject: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string> | null;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error' | null;
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type UploadFileData = {
+    body: Blob | File;
+    path: {
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query?: never;
+    url: '/api/v{api-version}/upload';
+};
+
+export type UploadFileResponses = {
+    200: boolean;
+};
+
+export type UploadFileResponse = UploadFileResponses[keyof UploadFileResponses];
+
+export type FileResponseData = {
+    body?: never;
+    path: {
+        id: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/file/{id}';
+};
+
+export type FileResponseResponses = {
+    /**
+     * Success
+     */
+    200: Blob | File;
+};
+
+export type FileResponseResponse = FileResponseResponses[keyof FileResponseResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * Parameter containing reference
+         */
+        parameterReference: ModelWithString;
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 `server` error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type MultipartResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type MultipartResponseResponses = {
+    /**
+     * OK
+     */
+    200: {
+        file?: Blob | File;
+        metadata?: {
+            foo?: string;
+            bar?: string;
+        };
+    };
+};
+
+export type MultipartResponseResponse = MultipartResponseResponses[keyof MultipartResponseResponses];
+
+export type MultipartRequestData = {
+    body?: {
+        content?: Blob | File;
+        data?: ModelWithString | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type ComplexParamsData = {
+    body?: {
+        readonly key: string | null;
+        name: string | null;
+        enabled?: boolean;
+        type: 'Monkey' | 'Horse' | 'Bird';
+        listOfModels?: Array<ModelWithString> | null;
+        listOfStrings?: Array<string> | null;
+        parameters: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+        readonly user?: {
+            readonly id?: number;
+            readonly name?: string | null;
+        };
+    };
+    path: {
+        id: number;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/complex/{id}';
+};
+
+export type ComplexParamsResponses = {
+    /**
+     * Success
+     */
+    200: ModelWithString;
+};
+
+export type ComplexParamsResponse = ComplexParamsResponses[keyof ComplexParamsResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: number;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: Array<NonAsciiStringæøåÆøÅöôêÊ字符串>;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PutWithFormUrlEncodedData = {
+    body: ArrayWithStrings;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
new file mode 100644
index 000000000..fadadfd36
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/@tanstack/react-query.gen.ts
@@ -0,0 +1,724 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type DefaultError, type InfiniteData, infiniteQueryOptions, queryOptions, type UseMutationOptions } from '@tanstack/react-query';
+
+import { client } from '../client.gen';
+import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen';
+import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
+        _id: string;
+        _infinite?: boolean;
+        tags?: ReadonlyArray<string>;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (infinite) {
+        params._infinite = infinite;
+    }
+    if (tags) {
+        params.tags = tags;
+    }
+    if (options?.body) {
+        params.body = options.body;
+    }
+    if (options?.headers) {
+        params.headers = options.headers;
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query) {
+        params.query = options.query;
+    }
+    return [
+        params
+    ];
+};
+
+export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
+
+export const exportOptions = (options?: Options<ExportData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await export_({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: exportQueryKey(options)
+    });
+};
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<{data: ImportResponse, response: Response, request: Request }, DefaultError, Options<ImportData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<FooWowData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
+
+export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await apiVVersionODataControllerCount({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: apiVVersionODataControllerCountQueryKey(options)
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
+
+export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getApiVbyApiVersionSimpleOperation({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
+    });
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithoutParametersAndResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithoutParametersAndResponseQueryKey(options)
+    });
+};
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteFooData3>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDescriptionsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeprecatedCallData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
+
+export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithOptionalParam({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamQueryKey(options)
+    });
+};
+
+const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
+    const params = {
+        ...queryKey[0]
+    };
+    if (page.body) {
+        params.body = {
+            ...queryKey[0].body as any,
+            ...page.body as any
+        };
+    }
+    if (page.headers) {
+        params.headers = {
+            ...queryKey[0].headers,
+            ...page.headers
+        };
+    }
+    if (page.path) {
+        params.path = {
+            ...queryKey[0].path as any,
+            ...page.path as any
+        };
+    }
+    if (page.query) {
+        params.query = {
+            ...queryKey[0].query as any,
+            ...page.query as any
+        };
+    }
+    return params as unknown as typeof page;
+};
+
+export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey('getCallWithOptionalParam', options, true);
+
+export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+    // @ts-ignore
+    {
+        queryFn: async ({ pageParam, queryKey, signal }) => {
+            // @ts-ignore
+            const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+                query: {
+                    page: pageParam
+                }
+            };
+            const params = createInfiniteParams(queryKey, page);
+            return await getCallWithOptionalParam({
+                ...options,
+                ...params,
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
+    });
+};
+
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<{data: PostCallWithOptionalParamResponse, response: Response, request: Request }, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithDefaultParameters({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithDefaultParametersQueryKey(options)
+    });
+};
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateNameData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await duplicateName2({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: duplicateName2QueryKey(options)
+    });
+};
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName3Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName4Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithNoContentResponseQueryKey(options)
+    });
+};
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponseAndNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseAndNoContentResponseQueryKey(options)
+    });
+};
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAOptions = (options?: Options<DummyAData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyA({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyAQueryKey(options)
+    });
+};
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBOptions = (options?: Options<DummyBData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyB({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyBQueryKey(options)
+    });
+};
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseQueryKey(options)
+    });
+};
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatOptions = (options: Options<CollectionFormatData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await collectionFormat({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: collectionFormatQueryKey(options)
+    });
+};
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesOptions = (options: Options<TypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await types({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: typesQueryKey(options)
+    });
+};
+
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<{data: UploadFileResponse, response: Response, request: Request }, DefaultError, Options<UploadFileData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
+
+export const fileResponseOptions = (options: Options<FileResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await fileResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: fileResponseQueryKey(options)
+    });
+};
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await complexTypes({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: complexTypesQueryKey(options)
+    });
+};
+
+export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
+
+export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await multipartResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: multipartResponseQueryKey(options)
+    });
+};
+
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<MultipartRequestData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<{data: ComplexParamsResponse, response: Response, request: Request }, DefaultError, Options<ComplexParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<TestErrorCodeData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
new file mode 100644
index 000000000..4166f8b7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/sdk.gen.ts
@@ -0,0 +1,418 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
+import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const export_ = <ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple/$count',
+        ...options
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+        url: '/api/v{api-version}/simple:operation',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions',
+        ...options
+    });
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/deprecated',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/requestBody',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/formData',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/upload',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
+
+export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/file/{id}',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const multipartResponse = <ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multipart',
+        ...options
+    });
+};
+
+export const multipartRequest = <ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/multipart',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/complex/{id}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json-patch+json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
new file mode 100644
index 000000000..3cdf939bb
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/react-query/fetch-response-style/types.gen.ts
@@ -0,0 +1,2091 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+/**
+ * Model with number-only name
+ */
+export type _400 = string;
+
+/**
+ * External ref to shared model (A)
+ */
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+/**
+ * External ref to shared model (B)
+ */
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CamelCaseCommentWithBreaks = number;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+/**
+ * This is a simple reference
+ */
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string | null;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+export type EnumWithReplacedCharacters = "'Single Quote'" | '"Double Quotes"' | 'øæåôöØÆÅÔÖ字符串' | 3.1 | '';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+export type EnumWithXEnumNames = 0 | 1 | 2;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    '16x16'?: CamelCaseCommentWithBreaks;
+    bar?: string;
+}>;
+
+/**
+ * This is a simple array with any of properties
+ */
+export type ArrayWithAnyOfProperties = Array<{
+    foo?: string;
+} | {
+    bar?: string;
+}>;
+
+export type AnyOfAnyAndNull = {
+    data?: unknown | null;
+};
+
+/**
+ * This is a simple array with any of properties
+ */
+export type AnyOfArrays = {
+    results?: Array<{
+        foo?: string;
+    } | {
+        bar?: string;
+    }>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+export type DictionaryWithPropertiesAndAdditionalProperties = {
+    foo?: number;
+    bar?: boolean;
+    [key: string]: string | number | boolean | undefined;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * `Comment` or `VoiceComment`. The JSON object for adding voice comments to tickets is different. See [Adding voice comments to tickets](/documentation/ticketing/managing-tickets/adding-voice-comments-to-tickets)
+ */
+export type ModelFromZendesk = string;
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp1?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp1: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableProp2?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp2: string | null;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum with escaped name
+ */
+export type ModelWithEnumWithHyphen = {
+    /**
+     * Foo-Bar-Baz-Qux
+     */
+    'foo-bar-baz-qux'?: '3.0';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnly = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnly>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a deprecated model with a deprecated property
+ *
+ * @deprecated
+ */
+export type DeprecatedModel = {
+    /**
+     * This is a deprecated property
+     *
+     * @deprecated
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * Circle
+ */
+export type ModelCircle = {
+    kind: string;
+    radius?: number;
+};
+
+/**
+ * Square
+ */
+export type ModelSquare = {
+    kind: string;
+    sideLength?: number;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfDiscriminator = ({
+    kind: 'circle';
+} & ModelCircle) | ({
+    kind: 'square';
+} & ModelSquare);
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithAnyOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * This is a model with nested 'any of' property with a type null
+ */
+export type CompositionWithNestedAnyAndTypeNull = {
+    propA?: Array<ModelWithDictionary | null> | Array<ModelWithArray | null>;
+};
+
+export type _3eNum1Период = 'Bird' | 'Dog';
+
+export type ConstValue = 'ConstValue';
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithNestedAnyOfAndNull = {
+    /**
+     * Scopes
+     */
+    propA?: Array<_3eNum1Период | ConstValue> | null;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a model that contains a simple dictionary within composition
+ */
+export type CompositionWithOneOfAndSimpleDictionary = {
+    propA?: boolean | {
+        [key: string]: number;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of simple arrays within composition
+ */
+export type CompositionWithOneOfAndSimpleArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<boolean>;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of complex arrays (composited) within composition
+ */
+export type CompositionWithOneOfAndComplexArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<number | string>;
+    };
+};
+
+/**
+ * This is a model with one property with a 'all of' relationship
+ */
+export type CompositionWithAllOfAndNullable = {
+    propA?: ({
+        boolean?: boolean;
+    } & ModelWithEnum & ModelWithArray & ModelWithDictionary) | null;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a base model with two simple optional properties
+ */
+export type CompositionBaseModel = {
+    firstName?: string;
+    lastname?: string;
+};
+
+/**
+ * This is a model that extends the base model
+ */
+export type CompositionExtendedModel = CompositionBaseModel & {
+    age: number;
+    firstName: string;
+    lastname: string;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string | null;
+        } | null;
+    } | null;
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type File = {
+    /**
+     * Id
+     */
+    readonly id?: string;
+    /**
+     * Updated at
+     */
+    readonly updated_at?: string;
+    /**
+     * Created at
+     */
+    readonly created_at?: string;
+    /**
+     * Mime
+     */
+    mime: string;
+    /**
+     * File
+     */
+    readonly file?: string;
+};
+
+export type Default = {
+    name?: string;
+};
+
+export type Pageable = {
+    page?: number;
+    size?: number;
+    sort?: Array<string>;
+};
+
+/**
+ * This is a free-form object without additionalProperties.
+ */
+export type FreeFormObjectWithoutAdditionalProperties = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: true.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqTrue = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: {}.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqEmptyObject = {
+    [key: string]: unknown;
+};
+
+export type ModelWithConst = {
+    String?: 'String';
+    number?: 0;
+    null?: null;
+    withType?: 'Some string';
+};
+
+/**
+ * This is a model with one property and additionalProperties: true
+ */
+export type ModelWithAdditionalPropertiesEqTrue = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+    [key: string]: unknown | string | undefined;
+};
+
+export type NestedAnyOfArraysNullable = {
+    nullableArray?: Array<string | boolean> | null;
+};
+
+export type CompositionWithOneOfAndProperties = ({
+    foo: SimpleParameter;
+} | {
+    bar: NonAsciiStringæøåÆøÅöôêÊ字符串;
+}) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * An object that can be null
+ */
+export type NullableObject = {
+    foo?: string;
+} | null;
+
+/**
+ * Some % character
+ */
+export type CharactersInDescription = string;
+
+export type ModelWithNullableObject = {
+    data?: NullableObject;
+};
+
+export type ModelWithOneOfEnum = {
+    foo: 'Bar';
+} | {
+    foo: 'Baz';
+} | {
+    foo: 'Qux';
+} | {
+    content: string;
+    foo: 'Quux';
+} | {
+    content: [
+        string,
+        string
+    ];
+    foo: 'Corge';
+};
+
+export type ModelWithNestedArrayEnumsDataFoo = 'foo' | 'bar';
+
+export type ModelWithNestedArrayEnumsDataBar = 'baz' | 'qux';
+
+export type ModelWithNestedArrayEnumsData = {
+    foo?: Array<ModelWithNestedArrayEnumsDataFoo>;
+    bar?: Array<ModelWithNestedArrayEnumsDataBar>;
+};
+
+export type ModelWithNestedArrayEnums = {
+    array_strings?: Array<string>;
+    data?: ModelWithNestedArrayEnumsData;
+};
+
+export type ModelWithNestedCompositionEnums = {
+    foo?: ModelWithNestedArrayEnumsDataFoo;
+};
+
+export type ModelWithReadOnlyAndWriteOnly = {
+    foo: string;
+    readonly bar: string;
+};
+
+export type ModelWithConstantSizeArray = [
+    number,
+    number
+];
+
+export type ModelWithAnyOfConstantSizeArray = [
+    number | string,
+    number | string,
+    number | string
+];
+
+export type ModelWithPrefixItemsConstantSizeArray = [
+    ModelWithInteger,
+    number | string,
+    string
+];
+
+export type ModelWithAnyOfConstantSizeArrayNullable = [
+    number | null | string,
+    number | null | string,
+    number | null | string
+];
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions = [
+    number | Import,
+    number | Import
+];
+
+export type ModelWithAnyOfConstantSizeArrayAndIntersect = [
+    number & string,
+    number & string
+];
+
+export type ModelWithNumericEnumUnion = {
+    /**
+     * Период
+     */
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
+};
+
+/**
+ * Some description with `back ticks`
+ */
+export type ModelWithBackticksInDescription = {
+    /**
+     * The template `that` should be used for parsing and importing the contents of the CSV file.
+     *
+     * <br/><p>There is one placeholder currently supported:<ul>     <li><b>${x}</b> - refers to the n-th column in the CSV file, e.g. ${1}, ${2}, ...)</li></ul><p>Example of a correct JSON template:</p>
+     * <pre>
+     * [
+     * {
+     * "resourceType": "Asset",
+     * "identifier": {
+     * "name": "${1}",
+     * "domain": {
+     * "name": "${2}",
+     * "community": {
+     * "name": "Some Community"
+     * }
+     * }
+     * },
+     * "attributes" : {
+     * "00000000-0000-0000-0000-000000003115" : [ {
+     * "value" : "${3}"
+     * } ],
+     * "00000000-0000-0000-0000-000000000222" : [ {
+     * "value" : "${4}"
+     * } ]
+     * }
+     * }
+     * ]
+     * </pre>
+     */
+    template?: string;
+};
+
+export type ModelWithOneOfAndProperties = (SimpleParameter | NonAsciiStringæøåÆøÅöôêÊ字符串) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * Model used to test deduplication strategy (unused)
+ */
+export type ParameterSimpleParameterUnused = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse2 = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData2 = string;
+
+/**
+ * Model with restricted keyword name
+ */
+export type Import = string;
+
+export type SchemaWithFormRestrictedKeys = {
+    description?: string;
+    'x-enum-descriptions'?: string;
+    'x-enum-varnames'?: string;
+    'x-enumNames'?: string;
+    title?: string;
+    object?: {
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    };
+    array?: Array<{
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    }>;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1DeleteOptions = {
+    /**
+     * Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.
+     */
+    preconditions?: IoK8sApimachineryPkgApisMetaV1Preconditions;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1Preconditions = {
+    /**
+     * Specifies the target ResourceVersion
+     */
+    resourceVersion?: string;
+    /**
+     * Specifies the target UID.
+     */
+    uid?: string;
+};
+
+export type AdditionalPropertiesUnknownIssue = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue2 = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue3 = string & {
+    entries: {
+        [key: string]: AdditionalPropertiesUnknownIssue;
+    };
+};
+
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: number;
+};
+
+export type OneOfAllOfIssue = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBoolean = {
+    item?: boolean;
+    error?: string | null;
+    readonly hasError?: boolean;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemString = {
+    item?: string | null;
+    error?: string | null;
+    readonly hasError?: boolean;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnlyWritable = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnlyWritable>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type FileWritable = {
+    /**
+     * Mime
+     */
+    mime: string;
+};
+
+export type ModelWithReadOnlyAndWriteOnlyWritable = {
+    foo: string;
+    baz: string;
+};
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable = [
+    number | Import,
+    number | Import
+];
+
+export type AdditionalPropertiesUnknownIssueWritable = {
+    [key: string]: string | number;
+};
+
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
+    item?: boolean;
+    error?: string | null;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemStringWritable = {
+    item?: string | null;
+    error?: string | null;
+};
+
+/**
+ * This is a reusable parameter
+ */
+export type SimpleParameter = string;
+
+/**
+ * Parameter with illegal characters
+ */
+export type XFooBar = ModelWithString;
+
+/**
+ * A reusable request body
+ */
+export type SimpleRequestBody = ModelWithString;
+
+/**
+ * A reusable request body
+ */
+export type SimpleFormData = ModelWithString;
+
+export type ExportData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ImportData = {
+    body: ModelWithReadOnlyAndWriteOnlyWritable | ModelWithArrayReadOnlyAndWriteOnlyWritable;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type ImportResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+    /**
+     * Default success response
+     */
+    default: ModelWithReadOnlyAndWriteOnly;
+};
+
+export type ImportResponse = ImportResponses[keyof ImportResponses];
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ApiVVersionODataControllerCountData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple/$count';
+};
+
+export type ApiVVersionODataControllerCountResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+};
+
+export type ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponses[keyof ApiVVersionODataControllerCountResponses];
+
+export type GetApiVbyApiVersionSimpleOperationData = {
+    body?: never;
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/simple:operation';
+};
+
+export type GetApiVbyApiVersionSimpleOperationErrors = {
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type GetApiVbyApiVersionSimpleOperationError = GetApiVbyApiVersionSimpleOperationErrors[keyof GetApiVbyApiVersionSimpleOperationErrors];
+
+export type GetApiVbyApiVersionSimpleOperationResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+};
+
+export type GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponses[keyof GetApiVbyApiVersionSimpleOperationResponses];
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type DeleteFooData3 = {
+    body?: never;
+    headers: {
+        /**
+         * Parameter with illegal characters
+         */
+        'x-Foo-Bar': ModelWithString;
+    };
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+        /**
+         * bar in method
+         */
+        BarParam: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions';
+};
+
+export type DeprecatedCallData = {
+    body?: never;
+    headers: {
+        /**
+         * This parameter is deprecated
+         *
+         * @deprecated
+         */
+        parameter: DeprecatedModel | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/parameters/deprecated';
+};
+
+export type CallWithParametersData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: {
+        [key: string]: unknown;
+    } | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string | null;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        foo_ref_enum?: ModelWithNestedArrayEnumsDataFoo;
+        foo_all_of_enum: ModelWithNestedArrayEnumsDataFoo;
+        /**
+         * This is the parameter that goes into the query params
+         */
+        cursor: string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: ModelWithString | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type GetCallWithOptionalParamData = {
+    /**
+     * This is a required parameter
+     */
+    body: ModelWithOneOfEnum;
+    path?: never;
+    query?: {
+        /**
+         * This is an optional parameter
+         */
+        page?: number;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamData = {
+    /**
+     * This is an optional parameter
+     */
+    body?: {
+        offset?: number | null;
+    };
+    path?: never;
+    query: {
+        /**
+         * This is a required parameter
+         */
+        parameter: Pageable;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponses[keyof PostCallWithOptionalParamResponses];
+
+export type PostApiVbyApiVersionRequestBodyData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleRequestBody;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/requestBody';
+};
+
+export type PostApiVbyApiVersionFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleFormData;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/formData';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString?: string | null;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber?: number | null;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean?: boolean | null;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model with default value
+         */
+        parameterModel?: ModelWithString | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model that is optional with default value
+         */
+        parameterModel?: ModelWithString;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithNoContentResponseResponse = CallWithNoContentResponseResponses[keyof CallWithNoContentResponseResponses];
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    200: _400;
+};
+
+export type DummyAResponse = DummyAResponses[keyof DummyAResponses];
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type DummyBResponse = DummyBResponses[keyof DummyBResponses];
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    default: Import;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for 4XX errors
+     */
+    '4XX': DictionaryWithArray;
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: ModelWithBoolean & ModelWithInteger;
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithStringError;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string> | null;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string | null;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean | null;
+        /**
+         * This is an object parameter
+         */
+        parameterObject: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string> | null;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error' | null;
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type UploadFileData = {
+    body: Blob | File;
+    path: {
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query?: never;
+    url: '/api/v{api-version}/upload';
+};
+
+export type UploadFileResponses = {
+    200: boolean;
+};
+
+export type UploadFileResponse = UploadFileResponses[keyof UploadFileResponses];
+
+export type FileResponseData = {
+    body?: never;
+    path: {
+        id: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/file/{id}';
+};
+
+export type FileResponseResponses = {
+    /**
+     * Success
+     */
+    200: Blob | File;
+};
+
+export type FileResponseResponse = FileResponseResponses[keyof FileResponseResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * Parameter containing reference
+         */
+        parameterReference: ModelWithString;
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 `server` error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type MultipartResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type MultipartResponseResponses = {
+    /**
+     * OK
+     */
+    200: {
+        file?: Blob | File;
+        metadata?: {
+            foo?: string;
+            bar?: string;
+        };
+    };
+};
+
+export type MultipartResponseResponse = MultipartResponseResponses[keyof MultipartResponseResponses];
+
+export type MultipartRequestData = {
+    body?: {
+        content?: Blob | File;
+        data?: ModelWithString | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type ComplexParamsData = {
+    body?: {
+        readonly key: string | null;
+        name: string | null;
+        enabled?: boolean;
+        type: 'Monkey' | 'Horse' | 'Bird';
+        listOfModels?: Array<ModelWithString> | null;
+        listOfStrings?: Array<string> | null;
+        parameters: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+        readonly user?: {
+            readonly id?: number;
+            readonly name?: string | null;
+        };
+    };
+    path: {
+        id: number;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/complex/{id}';
+};
+
+export type ComplexParamsResponses = {
+    /**
+     * Success
+     */
+    200: ModelWithString;
+};
+
+export type ComplexParamsResponse = ComplexParamsResponses[keyof ComplexParamsResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: number;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: Array<NonAsciiStringæøåÆøÅöôêÊ字符串>;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PutWithFormUrlEncodedData = {
+    body: ArrayWithStrings;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
new file mode 100644
index 000000000..961114036
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/@tanstack/vue-query.gen.ts
@@ -0,0 +1,724 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type DefaultError, type InfiniteData, infiniteQueryOptions, queryOptions, type UseMutationOptions } from '@tanstack/vue-query';
+
+import { client } from '../client.gen';
+import { apiVVersionODataControllerCount, callToTestOrderOfParams, callWithDefaultOptionalParameters, callWithDefaultParameters, callWithDescriptions, callWithDuplicateResponses, callWithNoContentResponse, callWithParameters, callWithResponse, callWithResponseAndNoContentResponse, callWithResponses, callWithResultFromHeader, callWithWeirdParameterNames, collectionFormat, complexParams, complexTypes, deleteCallWithoutParametersAndResponse, deleteFoo, deprecatedCall, dummyA, dummyB, duplicateName, duplicateName2, duplicateName3, duplicateName4, export_, fileResponse, fooWow, getApiVbyApiVersionSimpleOperation, getCallWithOptionalParam, getCallWithoutParametersAndResponse, import_, multipartRequest, multipartResponse, nonAsciiæøåÆøÅöôêÊ字符串, type Options, patchApiVbyApiVersionNoTag, patchCallWithoutParametersAndResponse, postApiVbyApiVersionFormData, postApiVbyApiVersionRequestBody, postCallWithOptionalParam, postCallWithoutParametersAndResponse, putCallWithoutParametersAndResponse, putWithFormUrlEncoded, testErrorCode, types, uploadFile } from '../sdk.gen';
+import type { ApiVVersionODataControllerCountData, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesError, CallWithDuplicateResponsesResponse, CallWithNoContentResponseData, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseData, CallWithResponsesData, CallWithResponsesError, CallWithResponsesResponse, CallWithResultFromHeaderData, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponse, ComplexTypesData, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyBData, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FooWowData, GetApiVbyApiVersionSimpleOperationData, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, ImportData, ImportResponse, MultipartRequestData, MultipartResponseData, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Response, PatchApiVbyApiVersionNoTagData, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponse, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TypesData, UploadFileData, UploadFileResponse } from '../types.gen';
+
+export type QueryKey<TOptions extends Options> = [
+    Pick<TOptions, 'baseUrl' | 'body' | 'headers' | 'path' | 'query'> & {
+        _id: string;
+        _infinite?: boolean;
+        tags?: ReadonlyArray<string>;
+    }
+];
+
+const createQueryKey = <TOptions extends Options>(id: string, options?: TOptions, infinite?: boolean, tags?: ReadonlyArray<string>): [
+    QueryKey<TOptions>[0]
+] => {
+    const params: QueryKey<TOptions>[0] = { _id: id, baseUrl: options?.baseUrl || (options?.client ?? client).getConfig().baseUrl } as QueryKey<TOptions>[0];
+    if (infinite) {
+        params._infinite = infinite;
+    }
+    if (tags) {
+        params.tags = tags;
+    }
+    if (options?.body) {
+        params.body = options.body;
+    }
+    if (options?.headers) {
+        params.headers = options.headers;
+    }
+    if (options?.path) {
+        params.path = options.path;
+    }
+    if (options?.query) {
+        params.query = options.query;
+    }
+    return [
+        params
+    ];
+};
+
+export const exportQueryKey = (options?: Options<ExportData>) => createQueryKey('export', options);
+
+export const exportOptions = (options?: Options<ExportData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await export_({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: exportQueryKey(options)
+    });
+};
+
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchApiVbyApiVersionNoTagData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchApiVbyApiVersionNoTag({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<{data: ImportResponse, response: Response, request: Request }, DefaultError, Options<ImportData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await import_({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<FooWowData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await fooWow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const apiVVersionODataControllerCountQueryKey = (options?: Options<ApiVVersionODataControllerCountData>) => createQueryKey('apiVVersionODataControllerCount', options);
+
+export const apiVVersionODataControllerCountOptions = (options?: Options<ApiVVersionODataControllerCountData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await apiVVersionODataControllerCount({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: apiVVersionODataControllerCountQueryKey(options)
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperationQueryKey = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => createQueryKey('getApiVbyApiVersionSimpleOperation', options);
+
+export const getApiVbyApiVersionSimpleOperationOptions = (options: Options<GetApiVbyApiVersionSimpleOperationData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getApiVbyApiVersionSimpleOperation({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getApiVbyApiVersionSimpleOperationQueryKey(options)
+    });
+};
+
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithoutParametersAndResponseQueryKey = (options?: Options<GetCallWithoutParametersAndResponseData>) => createQueryKey('getCallWithoutParametersAndResponse', options);
+
+export const getCallWithoutParametersAndResponseOptions = (options?: Options<GetCallWithoutParametersAndResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithoutParametersAndResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithoutParametersAndResponseQueryKey(options)
+    });
+};
+
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PatchCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await patchCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutCallWithoutParametersAndResponseData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putCallWithoutParametersAndResponse({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeleteFooData3>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deleteFoo({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDescriptionsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDescriptions({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DeprecatedCallData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await deprecatedCall({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithWeirdParameterNamesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithWeirdParameterNames({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const getCallWithOptionalParamQueryKey = (options: Options<GetCallWithOptionalParamData>) => createQueryKey('getCallWithOptionalParam', options);
+
+export const getCallWithOptionalParamOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await getCallWithOptionalParam({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamQueryKey(options)
+    });
+};
+
+const createInfiniteParams = <K extends Pick<QueryKey<Options>[0], 'body' | 'headers' | 'path' | 'query'>>(queryKey: QueryKey<Options>, page: K) => {
+    const params = {
+        ...queryKey[0]
+    };
+    if (page.body) {
+        params.body = {
+            ...queryKey[0].body as any,
+            ...page.body as any
+        };
+    }
+    if (page.headers) {
+        params.headers = {
+            ...queryKey[0].headers,
+            ...page.headers
+        };
+    }
+    if (page.path) {
+        params.path = {
+            ...queryKey[0].path as any,
+            ...page.path as any
+        };
+    }
+    if (page.query) {
+        params.query = {
+            ...queryKey[0].query as any,
+            ...page.query as any
+        };
+    }
+    return params as unknown as typeof page;
+};
+
+export const getCallWithOptionalParamInfiniteQueryKey = (options: Options<GetCallWithOptionalParamData>): QueryKey<Options<GetCallWithOptionalParamData>> => createQueryKey('getCallWithOptionalParam', options, true);
+
+export const getCallWithOptionalParamInfiniteOptions = (options: Options<GetCallWithOptionalParamData>) => {
+    return infiniteQueryOptions<unknown, DefaultError, InfiniteData<unknown>, QueryKey<Options<GetCallWithOptionalParamData>>, number | Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+    // @ts-ignore
+    {
+        queryFn: async ({ pageParam, queryKey, signal }) => {
+            // @ts-ignore
+            const page: Pick<QueryKey<Options<GetCallWithOptionalParamData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+                query: {
+                    page: pageParam
+                }
+            };
+            const params = createInfiniteParams(queryKey, page);
+            return await getCallWithOptionalParam({
+                ...options,
+                ...params,
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: getCallWithOptionalParamInfiniteQueryKey(options)
+    });
+};
+
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<{data: PostCallWithOptionalParamResponse, response: Response, request: Request }, DefaultError, Options<PostCallWithOptionalParamData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postCallWithOptionalParam({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionRequestBodyData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionRequestBody({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PostApiVbyApiVersionFormDataData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await postApiVbyApiVersionFormData({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithDefaultParametersQueryKey = (options?: Options<CallWithDefaultParametersData>) => createQueryKey('callWithDefaultParameters', options);
+
+export const callWithDefaultParametersOptions = (options?: Options<CallWithDefaultParametersData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithDefaultParameters({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithDefaultParametersQueryKey(options)
+    });
+};
+
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithDefaultOptionalParametersData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDefaultOptionalParameters({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallToTestOrderOfParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callToTestOrderOfParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateNameData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName2QueryKey = (options?: Options<DuplicateName2Data>) => createQueryKey('duplicateName2', options);
+
+export const duplicateName2Options = (options?: Options<DuplicateName2Data>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await duplicateName2({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: duplicateName2QueryKey(options)
+    });
+};
+
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName3Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName3({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<DuplicateName4Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await duplicateName4({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithNoContentResponseQueryKey = (options?: Options<CallWithNoContentResponseData>) => createQueryKey('callWithNoContentResponse', options);
+
+export const callWithNoContentResponseOptions = (options?: Options<CallWithNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithNoContentResponseQueryKey(options)
+    });
+};
+
+export const callWithResponseAndNoContentResponseQueryKey = (options?: Options<CallWithResponseAndNoContentResponseData>) => createQueryKey('callWithResponseAndNoContentResponse', options);
+
+export const callWithResponseAndNoContentResponseOptions = (options?: Options<CallWithResponseAndNoContentResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponseAndNoContentResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseAndNoContentResponseQueryKey(options)
+    });
+};
+
+export const dummyAQueryKey = (options?: Options<DummyAData>) => createQueryKey('dummyA', options);
+
+export const dummyAOptions = (options?: Options<DummyAData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyA({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyAQueryKey(options)
+    });
+};
+
+export const dummyBQueryKey = (options?: Options<DummyBData>) => createQueryKey('dummyB', options);
+
+export const dummyBOptions = (options?: Options<DummyBData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await dummyB({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: dummyBQueryKey(options)
+    });
+};
+
+export const callWithResponseQueryKey = (options?: Options<CallWithResponseData>) => createQueryKey('callWithResponse', options);
+
+export const callWithResponseOptions = (options?: Options<CallWithResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await callWithResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: callWithResponseQueryKey(options)
+    });
+};
+
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, CallWithDuplicateResponsesError, Options<CallWithDuplicateResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithDuplicateResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, CallWithResponsesError, Options<CallWithResponsesData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResponses({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const collectionFormatQueryKey = (options: Options<CollectionFormatData>) => createQueryKey('collectionFormat', options);
+
+export const collectionFormatOptions = (options: Options<CollectionFormatData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await collectionFormat({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: collectionFormatQueryKey(options)
+    });
+};
+
+export const typesQueryKey = (options: Options<TypesData>) => createQueryKey('types', options);
+
+export const typesOptions = (options: Options<TypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await types({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: typesQueryKey(options)
+    });
+};
+
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<{data: UploadFileResponse, response: Response, request: Request }, DefaultError, Options<UploadFileData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await uploadFile({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const fileResponseQueryKey = (options: Options<FileResponseData>) => createQueryKey('fileResponse', options);
+
+export const fileResponseOptions = (options: Options<FileResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await fileResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: fileResponseQueryKey(options)
+    });
+};
+
+export const complexTypesQueryKey = (options: Options<ComplexTypesData>) => createQueryKey('complexTypes', options);
+
+export const complexTypesOptions = (options: Options<ComplexTypesData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await complexTypes({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: complexTypesQueryKey(options)
+    });
+};
+
+export const multipartResponseQueryKey = (options?: Options<MultipartResponseData>) => createQueryKey('multipartResponse', options);
+
+export const multipartResponseOptions = (options?: Options<MultipartResponseData>) => {
+    return queryOptions({
+        queryFn: async ({ queryKey, signal }) => {
+            return await multipartResponse({
+                ...options,
+                ...queryKey[0],
+                signal,
+                throwOnError: true
+            });
+        },
+        queryKey: multipartResponseQueryKey(options)
+    });
+};
+
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<MultipartRequestData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await multipartRequest({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<{data: ComplexParamsResponse, response: Response, request: Request }, DefaultError, Options<ComplexParamsData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await complexParams({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<CallWithResultFromHeaderData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await callWithResultFromHeader({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<TestErrorCodeData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await testErrorCode({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, DefaultError, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await nonAsciiæøåÆøÅöôêÊ字符串({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, DefaultError, Options<PutWithFormUrlEncodedData>> => {
+    return {
+        mutationFn: async (fnOptions) => {
+            return await putWithFormUrlEncoded({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+        }
+    };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
new file mode 100644
index 000000000..6b55ac80f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client.gen.ts
@@ -0,0 +1,18 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type ClientOptions, type Config, createClient, createConfig } from './client';
+import type { ClientOptions as ClientOptions2 } from './types.gen';
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
+
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:3000/base'
+}));
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
new file mode 100644
index 000000000..a439d2748
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/client.gen.ts
@@ -0,0 +1,268 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { createSseClient } from '../core/serverSentEvents.gen';
+import type { HttpMethod } from '../core/types.gen';
+import { getValidRequestBody } from '../core/utils.gen';
+import type {
+  Client,
+  Config,
+  RequestOptions,
+  ResolvedRequestOptions,
+} from './types.gen';
+import {
+  buildUrl,
+  createConfig,
+  createInterceptors,
+  getParseAs,
+  mergeConfigs,
+  mergeHeaders,
+  setAuthParams,
+} from './utils.gen';
+
+type ReqInit = Omit<RequestInit, 'body' | 'headers'> & {
+  body?: any;
+  headers: ReturnType<typeof mergeHeaders>;
+};
+
+export const createClient = (config: Config = {}): Client => {
+  let _config = mergeConfigs(createConfig(), config);
+
+  const getConfig = (): Config => ({ ..._config });
+
+  const setConfig = (config: Config): Config => {
+    _config = mergeConfigs(_config, config);
+    return getConfig();
+  };
+
+  const interceptors = createInterceptors<
+    Request,
+    Response,
+    unknown,
+    ResolvedRequestOptions
+  >();
+
+  const beforeRequest = async (options: RequestOptions) => {
+    const opts = {
+      ..._config,
+      ...options,
+      fetch: options.fetch ?? _config.fetch ?? globalThis.fetch,
+      headers: mergeHeaders(_config.headers, options.headers),
+      serializedBody: undefined,
+    };
+
+    if (opts.security) {
+      await setAuthParams({
+        ...opts,
+        security: opts.security,
+      });
+    }
+
+    if (opts.requestValidator) {
+      await opts.requestValidator(opts);
+    }
+
+    if (opts.body !== undefined && opts.bodySerializer) {
+      opts.serializedBody = opts.bodySerializer(opts.body);
+    }
+
+    // remove Content-Type header if body is empty to avoid sending invalid requests
+    if (opts.body === undefined || opts.serializedBody === '') {
+      opts.headers.delete('Content-Type');
+    }
+
+    const url = buildUrl(opts);
+
+    return { opts, url };
+  };
+
+  const request: Client['request'] = async (options) => {
+    // @ts-expect-error
+    const { opts, url } = await beforeRequest(options);
+    const requestInit: ReqInit = {
+      redirect: 'follow',
+      ...opts,
+      body: getValidRequestBody(opts),
+    };
+
+    let request = new Request(url, requestInit);
+
+    for (const fn of interceptors.request.fns) {
+      if (fn) {
+        request = await fn(request, opts);
+      }
+    }
+
+    // fetch must be assigned here, otherwise it would throw the error:
+    // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+    const _fetch = opts.fetch!;
+    let response = await _fetch(request);
+
+    for (const fn of interceptors.response.fns) {
+      if (fn) {
+        response = await fn(response, request, opts);
+      }
+    }
+
+    const result = {
+      request,
+      response,
+    };
+
+    if (response.ok) {
+      const parseAs =
+        (opts.parseAs === 'auto'
+          ? getParseAs(response.headers.get('Content-Type'))
+          : opts.parseAs) ?? 'json';
+
+      if (
+        response.status === 204 ||
+        response.headers.get('Content-Length') === '0'
+      ) {
+        let emptyData: any;
+        switch (parseAs) {
+          case 'arrayBuffer':
+          case 'blob':
+          case 'text':
+            emptyData = await response[parseAs]();
+            break;
+          case 'formData':
+            emptyData = new FormData();
+            break;
+          case 'stream':
+            emptyData = response.body;
+            break;
+          case 'json':
+          default:
+            emptyData = {};
+            break;
+        }
+        return opts.responseStyle === 'data'
+          ? emptyData
+          : {
+              data: emptyData,
+              ...result,
+            };
+      }
+
+      let data: any;
+      switch (parseAs) {
+        case 'arrayBuffer':
+        case 'blob':
+        case 'formData':
+        case 'json':
+        case 'text':
+          data = await response[parseAs]();
+          break;
+        case 'stream':
+          return opts.responseStyle === 'data'
+            ? response.body
+            : {
+                data: response.body,
+                ...result,
+              };
+      }
+
+      if (parseAs === 'json') {
+        if (opts.responseValidator) {
+          await opts.responseValidator(data);
+        }
+
+        if (opts.responseTransformer) {
+          data = await opts.responseTransformer(data);
+        }
+      }
+
+      return opts.responseStyle === 'data'
+        ? data
+        : {
+            data,
+            ...result,
+          };
+    }
+
+    const textError = await response.text();
+    let jsonError: unknown;
+
+    try {
+      jsonError = JSON.parse(textError);
+    } catch {
+      // noop
+    }
+
+    const error = jsonError ?? textError;
+    let finalError = error;
+
+    for (const fn of interceptors.error.fns) {
+      if (fn) {
+        finalError = (await fn(error, response, request, opts)) as string;
+      }
+    }
+
+    finalError = finalError || ({} as string);
+
+    if (opts.throwOnError) {
+      throw finalError;
+    }
+
+    // TODO: we probably want to return error and improve types
+    return opts.responseStyle === 'data'
+      ? undefined
+      : {
+          error: finalError,
+          ...result,
+        };
+  };
+
+  const makeMethodFn =
+    (method: Uppercase<HttpMethod>) => (options: RequestOptions) =>
+      request({ ...options, method });
+
+  const makeSseFn =
+    (method: Uppercase<HttpMethod>) => async (options: RequestOptions) => {
+      const { opts, url } = await beforeRequest(options);
+      return createSseClient({
+        ...opts,
+        body: opts.body as BodyInit | null | undefined,
+        headers: opts.headers as unknown as Record<string, string>,
+        method,
+        onRequest: async (url, init) => {
+          let request = new Request(url, init);
+          for (const fn of interceptors.request.fns) {
+            if (fn) {
+              request = await fn(request, opts);
+            }
+          }
+          return request;
+        },
+        url,
+      });
+    };
+
+  return {
+    buildUrl,
+    connect: makeMethodFn('CONNECT'),
+    delete: makeMethodFn('DELETE'),
+    get: makeMethodFn('GET'),
+    getConfig,
+    head: makeMethodFn('HEAD'),
+    interceptors,
+    options: makeMethodFn('OPTIONS'),
+    patch: makeMethodFn('PATCH'),
+    post: makeMethodFn('POST'),
+    put: makeMethodFn('PUT'),
+    request,
+    setConfig,
+    sse: {
+      connect: makeSseFn('CONNECT'),
+      delete: makeSseFn('DELETE'),
+      get: makeSseFn('GET'),
+      head: makeSseFn('HEAD'),
+      options: makeSseFn('OPTIONS'),
+      patch: makeSseFn('PATCH'),
+      post: makeSseFn('POST'),
+      put: makeSseFn('PUT'),
+      trace: makeSseFn('TRACE'),
+    },
+    trace: makeMethodFn('TRACE'),
+  } as Client;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
new file mode 100644
index 000000000..b295edeca
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/index.ts
@@ -0,0 +1,25 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type { Auth } from '../core/auth.gen';
+export type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+export {
+  formDataBodySerializer,
+  jsonBodySerializer,
+  urlSearchParamsBodySerializer,
+} from '../core/bodySerializer.gen';
+export { buildClientParams } from '../core/params.gen';
+export { serializeQueryKeyValue } from '../core/queryKeySerializer.gen';
+export { createClient } from './client.gen';
+export type {
+  Client,
+  ClientOptions,
+  Config,
+  CreateClientConfig,
+  Options,
+  RequestOptions,
+  RequestResult,
+  ResolvedRequestOptions,
+  ResponseStyle,
+  TDataShape,
+} from './types.gen';
+export { createConfig, mergeHeaders } from './utils.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
new file mode 100644
index 000000000..3660071f7
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/types.gen.ts
@@ -0,0 +1,241 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth } from '../core/auth.gen';
+import type {
+  ServerSentEventsOptions,
+  ServerSentEventsResult,
+} from '../core/serverSentEvents.gen';
+import type {
+  Client as CoreClient,
+  Config as CoreConfig,
+} from '../core/types.gen';
+import type { Middleware } from './utils.gen';
+
+export type ResponseStyle = 'data' | 'fields' | 'response';
+
+export interface Config<T extends ClientOptions = ClientOptions>
+  extends Omit<RequestInit, 'body' | 'headers' | 'method'>,
+    CoreConfig {
+  /**
+   * Base URL for all requests made by this client.
+   */
+  baseUrl?: T['baseUrl'];
+  /**
+   * Fetch API implementation. You can use this option to provide a custom
+   * fetch instance.
+   *
+   * @default globalThis.fetch
+   */
+  fetch?: typeof fetch;
+  /**
+   * Please don't use the Fetch client for Next.js applications. The `next`
+   * options won't have any effect.
+   *
+   * Install {@link https://www.npmjs.com/package/@hey-api/client-next `@hey-api/client-next`} instead.
+   */
+  next?: never;
+  /**
+   * Return the response data parsed in a specified format. By default, `auto`
+   * will infer the appropriate method from the `Content-Type` response header.
+   * You can override this behavior with any of the {@link Body} methods.
+   * Select `stream` if you don't want to parse response data at all.
+   *
+   * @default 'auto'
+   */
+  parseAs?:
+    | 'arrayBuffer'
+    | 'auto'
+    | 'blob'
+    | 'formData'
+    | 'json'
+    | 'stream'
+    | 'text';
+  /**
+   * Should we return only data or multiple fields (data, error, response, etc.)?
+   *
+   * @default 'fields'
+   */
+  responseStyle?: ResponseStyle;
+  /**
+   * Throw an error instead of returning it in the response?
+   *
+   * @default false
+   */
+  throwOnError?: T['throwOnError'];
+}
+
+export interface RequestOptions<
+  TData = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends Config<{
+      responseStyle: TResponseStyle;
+      throwOnError: ThrowOnError;
+    }>,
+    Pick<
+      ServerSentEventsOptions<TData>,
+      | 'onSseError'
+      | 'onSseEvent'
+      | 'sseDefaultRetryDelay'
+      | 'sseMaxRetryAttempts'
+      | 'sseMaxRetryDelay'
+    > {
+  /**
+   * Any body that you want to add to your request.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#body}
+   */
+  body?: unknown;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  /**
+   * Security mechanism(s) to use for the request.
+   */
+  security?: ReadonlyArray<Auth>;
+  url: Url;
+}
+
+export interface ResolvedRequestOptions<
+  TResponseStyle extends ResponseStyle = 'fields',
+  ThrowOnError extends boolean = boolean,
+  Url extends string = string,
+> extends RequestOptions<unknown, TResponseStyle, ThrowOnError, Url> {
+  serializedBody?: string;
+}
+
+export type RequestResult<
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = boolean,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = ThrowOnError extends true
+  ? Promise<
+      TResponseStyle extends 'data'
+        ? TData extends Record<string, unknown>
+          ? TData[keyof TData]
+          : TData
+        : {
+            data: TData extends Record<string, unknown>
+              ? TData[keyof TData]
+              : TData;
+            request: Request;
+            response: Response;
+          }
+    >
+  : Promise<
+      TResponseStyle extends 'data'
+        ?
+            | (TData extends Record<string, unknown>
+                ? TData[keyof TData]
+                : TData)
+            | undefined
+        : (
+            | {
+                data: TData extends Record<string, unknown>
+                  ? TData[keyof TData]
+                  : TData;
+                error: undefined;
+              }
+            | {
+                data: undefined;
+                error: TError extends Record<string, unknown>
+                  ? TError[keyof TError]
+                  : TError;
+              }
+          ) & {
+            request: Request;
+            response: Response;
+          }
+    >;
+
+export interface ClientOptions {
+  baseUrl?: string;
+  responseStyle?: ResponseStyle;
+  throwOnError?: boolean;
+}
+
+type MethodFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type SseFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'>,
+) => Promise<ServerSentEventsResult<TData, TError>>;
+
+type RequestFn = <
+  TData = unknown,
+  TError = unknown,
+  ThrowOnError extends boolean = false,
+  TResponseStyle extends ResponseStyle = 'fields',
+>(
+  options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
+    Pick<
+      Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>,
+      'method'
+    >,
+) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
+
+type BuildUrlFn = <
+  TData extends {
+    body?: unknown;
+    path?: Record<string, unknown>;
+    query?: Record<string, unknown>;
+    url: string;
+  },
+>(
+  options: TData & Options<TData>,
+) => string;
+
+export type Client = CoreClient<
+  RequestFn,
+  Config,
+  MethodFn,
+  BuildUrlFn,
+  SseFn
+> & {
+  interceptors: Middleware<Request, Response, unknown, ResolvedRequestOptions>;
+};
+
+/**
+ * The `createClientConfig()` function will be called on client initialization
+ * and the returned object will become the client's initial configuration.
+ *
+ * You may want to initialize your client this way instead of calling
+ * `setConfig()`. This is useful for example if you're using Next.js
+ * to ensure your client always has the correct values.
+ */
+export type CreateClientConfig<T extends ClientOptions = ClientOptions> = (
+  override?: Config<ClientOptions & T>,
+) => Config<Required<ClientOptions> & T>;
+
+export interface TDataShape {
+  body?: unknown;
+  headers?: unknown;
+  path?: unknown;
+  query?: unknown;
+  url: string;
+}
+
+type OmitKeys<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type Options<
+  TData extends TDataShape = TDataShape,
+  ThrowOnError extends boolean = boolean,
+  TResponse = unknown,
+  TResponseStyle extends ResponseStyle = 'fields',
+> = OmitKeys<
+  RequestOptions<TResponse, TResponseStyle, ThrowOnError>,
+  'body' | 'path' | 'query' | 'url'
+> &
+  ([TData] extends [never] ? unknown : Omit<TData, 'url'>);
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
new file mode 100644
index 000000000..4c48a9ee1
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/client/utils.gen.ts
@@ -0,0 +1,332 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { getAuthToken } from '../core/auth.gen';
+import type { QuerySerializerOptions } from '../core/bodySerializer.gen';
+import { jsonBodySerializer } from '../core/bodySerializer.gen';
+import {
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from '../core/pathSerializer.gen';
+import { getUrl } from '../core/utils.gen';
+import type { Client, ClientOptions, Config, RequestOptions } from './types.gen';
+
+export const createQuerySerializer = <T = unknown>({
+  parameters = {},
+  ...args
+}: QuerySerializerOptions = {}) => {
+  const querySerializer = (queryParams: T) => {
+    const search: string[] = [];
+    if (queryParams && typeof queryParams === 'object') {
+      for (const name in queryParams) {
+        const value = queryParams[name];
+
+        if (value === undefined || value === null) {
+          continue;
+        }
+
+        const options = parameters[name] || args;
+
+        if (Array.isArray(value)) {
+          const serializedArray = serializeArrayParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'form',
+            value,
+            ...options.array,
+          });
+          if (serializedArray) search.push(serializedArray);
+        } else if (typeof value === 'object') {
+          const serializedObject = serializeObjectParam({
+            allowReserved: options.allowReserved,
+            explode: true,
+            name,
+            style: 'deepObject',
+            value: value as Record<string, unknown>,
+            ...options.object,
+          });
+          if (serializedObject) search.push(serializedObject);
+        } else {
+          const serializedPrimitive = serializePrimitiveParam({
+            allowReserved: options.allowReserved,
+            name,
+            value: value as string,
+          });
+          if (serializedPrimitive) search.push(serializedPrimitive);
+        }
+      }
+    }
+    return search.join('&');
+  };
+  return querySerializer;
+};
+
+/**
+ * Infers parseAs value from provided Content-Type header.
+ */
+export const getParseAs = (
+  contentType: string | null,
+): Exclude<Config['parseAs'], 'auto'> => {
+  if (!contentType) {
+    // If no Content-Type header is provided, the best we can do is return the raw response body,
+    // which is effectively the same as the 'stream' option.
+    return 'stream';
+  }
+
+  const cleanContent = contentType.split(';')[0]?.trim();
+
+  if (!cleanContent) {
+    return;
+  }
+
+  if (
+    cleanContent.startsWith('application/json') ||
+    cleanContent.endsWith('+json')
+  ) {
+    return 'json';
+  }
+
+  if (cleanContent === 'multipart/form-data') {
+    return 'formData';
+  }
+
+  if (
+    ['application/', 'audio/', 'image/', 'video/'].some((type) =>
+      cleanContent.startsWith(type),
+    )
+  ) {
+    return 'blob';
+  }
+
+  if (cleanContent.startsWith('text/')) {
+    return 'text';
+  }
+
+  return;
+};
+
+const checkForExistence = (
+  options: Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  },
+  name?: string,
+): boolean => {
+  if (!name) {
+    return false;
+  }
+  if (
+    options.headers.has(name) ||
+    options.query?.[name] ||
+    options.headers.get('Cookie')?.includes(`${name}=`)
+  ) {
+    return true;
+  }
+  return false;
+};
+
+export const setAuthParams = async ({
+  security,
+  ...options
+}: Pick<Required<RequestOptions>, 'security'> &
+  Pick<RequestOptions, 'auth' | 'query'> & {
+    headers: Headers;
+  }) => {
+  for (const auth of security) {
+    if (checkForExistence(options, auth.name)) {
+      continue;
+    }
+
+    const token = await getAuthToken(auth, options.auth);
+
+    if (!token) {
+      continue;
+    }
+
+    const name = auth.name ?? 'Authorization';
+
+    switch (auth.in) {
+      case 'query':
+        if (!options.query) {
+          options.query = {};
+        }
+        options.query[name] = token;
+        break;
+      case 'cookie':
+        options.headers.append('Cookie', `${name}=${token}`);
+        break;
+      case 'header':
+      default:
+        options.headers.set(name, token);
+        break;
+    }
+  }
+};
+
+export const buildUrl: Client['buildUrl'] = (options) =>
+  getUrl({
+    baseUrl: options.baseUrl as string,
+    path: options.path,
+    query: options.query,
+    querySerializer:
+      typeof options.querySerializer === 'function'
+        ? options.querySerializer
+        : createQuerySerializer(options.querySerializer),
+    url: options.url,
+  });
+
+export const mergeConfigs = (a: Config, b: Config): Config => {
+  const config = { ...a, ...b };
+  if (config.baseUrl?.endsWith('/')) {
+    config.baseUrl = config.baseUrl.substring(0, config.baseUrl.length - 1);
+  }
+  config.headers = mergeHeaders(a.headers, b.headers);
+  return config;
+};
+
+const headersEntries = (headers: Headers): Array<[string, string]> => {
+  const entries: Array<[string, string]> = [];
+  headers.forEach((value, key) => {
+    entries.push([key, value]);
+  });
+  return entries;
+};
+
+export const mergeHeaders = (
+  ...headers: Array<Required<Config>['headers'] | undefined>
+): Headers => {
+  const mergedHeaders = new Headers();
+  for (const header of headers) {
+    if (!header) {
+      continue;
+    }
+
+    const iterator =
+      header instanceof Headers
+        ? headersEntries(header)
+        : Object.entries(header);
+
+    for (const [key, value] of iterator) {
+      if (value === null) {
+        mergedHeaders.delete(key);
+      } else if (Array.isArray(value)) {
+        for (const v of value) {
+          mergedHeaders.append(key, v as string);
+        }
+      } else if (value !== undefined) {
+        // assume object headers are meant to be JSON stringified, i.e. their
+        // content value in OpenAPI specification is 'application/json'
+        mergedHeaders.set(
+          key,
+          typeof value === 'object' ? JSON.stringify(value) : (value as string),
+        );
+      }
+    }
+  }
+  return mergedHeaders;
+};
+
+type ErrInterceptor<Err, Res, Req, Options> = (
+  error: Err,
+  response: Res,
+  request: Req,
+  options: Options,
+) => Err | Promise<Err>;
+
+type ReqInterceptor<Req, Options> = (
+  request: Req,
+  options: Options,
+) => Req | Promise<Req>;
+
+type ResInterceptor<Res, Req, Options> = (
+  response: Res,
+  request: Req,
+  options: Options,
+) => Res | Promise<Res>;
+
+class Interceptors<Interceptor> {
+  fns: Array<Interceptor | null> = [];
+
+  clear(): void {
+    this.fns = [];
+  }
+
+  eject(id: number | Interceptor): void {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = null;
+    }
+  }
+
+  exists(id: number | Interceptor): boolean {
+    const index = this.getInterceptorIndex(id);
+    return Boolean(this.fns[index]);
+  }
+
+  getInterceptorIndex(id: number | Interceptor): number {
+    if (typeof id === 'number') {
+      return this.fns[id] ? id : -1;
+    }
+    return this.fns.indexOf(id);
+  }
+
+  update(
+    id: number | Interceptor,
+    fn: Interceptor,
+  ): number | Interceptor | false {
+    const index = this.getInterceptorIndex(id);
+    if (this.fns[index]) {
+      this.fns[index] = fn;
+      return id;
+    }
+    return false;
+  }
+
+  use(fn: Interceptor): number {
+    this.fns.push(fn);
+    return this.fns.length - 1;
+  }
+}
+
+export interface Middleware<Req, Res, Err, Options> {
+  error: Interceptors<ErrInterceptor<Err, Res, Req, Options>>;
+  request: Interceptors<ReqInterceptor<Req, Options>>;
+  response: Interceptors<ResInterceptor<Res, Req, Options>>;
+}
+
+export const createInterceptors = <Req, Res, Err, Options>(): Middleware<
+  Req,
+  Res,
+  Err,
+  Options
+> => ({
+  error: new Interceptors<ErrInterceptor<Err, Res, Req, Options>>(),
+  request: new Interceptors<ReqInterceptor<Req, Options>>(),
+  response: new Interceptors<ResInterceptor<Res, Req, Options>>(),
+});
+
+const defaultQuerySerializer = createQuerySerializer({
+  allowReserved: false,
+  array: {
+    explode: true,
+    style: 'form',
+  },
+  object: {
+    explode: true,
+    style: 'deepObject',
+  },
+});
+
+const defaultHeaders = {
+  'Content-Type': 'application/json',
+};
+
+export const createConfig = <T extends ClientOptions = ClientOptions>(
+  override: Config<Omit<ClientOptions, keyof T> & T> = {},
+): Config<Omit<ClientOptions, keyof T> & T> => ({
+  ...jsonBodySerializer,
+  headers: defaultHeaders,
+  parseAs: 'auto',
+  querySerializer: defaultQuerySerializer,
+  ...override,
+});
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
new file mode 100644
index 000000000..f8a73266f
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/auth.gen.ts
@@ -0,0 +1,42 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type AuthToken = string | undefined;
+
+export interface Auth {
+  /**
+   * Which part of the request do we use to send the auth?
+   *
+   * @default 'header'
+   */
+  in?: 'header' | 'query' | 'cookie';
+  /**
+   * Header or query parameter name.
+   *
+   * @default 'Authorization'
+   */
+  name?: string;
+  scheme?: 'basic' | 'bearer';
+  type: 'apiKey' | 'http';
+}
+
+export const getAuthToken = async (
+  auth: Auth,
+  callback: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken,
+): Promise<string | undefined> => {
+  const token =
+    typeof callback === 'function' ? await callback(auth) : callback;
+
+  if (!token) {
+    return;
+  }
+
+  if (auth.scheme === 'bearer') {
+    return `Bearer ${token}`;
+  }
+
+  if (auth.scheme === 'basic') {
+    return `Basic ${btoa(token)}`;
+  }
+
+  return token;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
new file mode 100644
index 000000000..552b50f7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/bodySerializer.gen.ts
@@ -0,0 +1,100 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type {
+  ArrayStyle,
+  ObjectStyle,
+  SerializerOptions,
+} from './pathSerializer.gen';
+
+export type QuerySerializer = (query: Record<string, unknown>) => string;
+
+export type BodySerializer = (body: any) => any;
+
+type QuerySerializerOptionsObject = {
+  allowReserved?: boolean;
+  array?: Partial<SerializerOptions<ArrayStyle>>;
+  object?: Partial<SerializerOptions<ObjectStyle>>;
+};
+
+export type QuerySerializerOptions = QuerySerializerOptionsObject & {
+  /**
+   * Per-parameter serialization overrides. When provided, these settings
+   * override the global array/object settings for specific parameter names.
+   */
+  parameters?: Record<string, QuerySerializerOptionsObject>;
+};
+
+const serializeFormDataPair = (
+  data: FormData,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string' || value instanceof Blob) {
+    data.append(key, value);
+  } else if (value instanceof Date) {
+    data.append(key, value.toISOString());
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+const serializeUrlSearchParamsPair = (
+  data: URLSearchParams,
+  key: string,
+  value: unknown,
+): void => {
+  if (typeof value === 'string') {
+    data.append(key, value);
+  } else {
+    data.append(key, JSON.stringify(value));
+  }
+};
+
+export const formDataBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): FormData => {
+    const data = new FormData();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeFormDataPair(data, key, v));
+      } else {
+        serializeFormDataPair(data, key, value);
+      }
+    });
+
+    return data;
+  },
+};
+
+export const jsonBodySerializer = {
+  bodySerializer: <T>(body: T): string =>
+    JSON.stringify(body, (_key, value) =>
+      typeof value === 'bigint' ? value.toString() : value,
+    ),
+};
+
+export const urlSearchParamsBodySerializer = {
+  bodySerializer: <T extends Record<string, any> | Array<Record<string, any>>>(
+    body: T,
+  ): string => {
+    const data = new URLSearchParams();
+
+    Object.entries(body).forEach(([key, value]) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      if (Array.isArray(value)) {
+        value.forEach((v) => serializeUrlSearchParamsPair(data, key, v));
+      } else {
+        serializeUrlSearchParamsPair(data, key, value);
+      }
+    });
+
+    return data.toString();
+  },
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
new file mode 100644
index 000000000..602715c46
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/params.gen.ts
@@ -0,0 +1,176 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+type Slot = 'body' | 'headers' | 'path' | 'query';
+
+export type Field =
+  | {
+      in: Exclude<Slot, 'body'>;
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If omitted, we use the same value as `key`.
+       */
+      map?: string;
+    }
+  | {
+      in: Extract<Slot, 'body'>;
+      /**
+       * Key isn't required for bodies.
+       */
+      key?: string;
+      map?: string;
+    }
+  | {
+      /**
+       * Field name. This is the name we want the user to see and use.
+       */
+      key: string;
+      /**
+       * Field mapped name. This is the name we want to use in the request.
+       * If `in` is omitted, `map` aliases `key` to the transport layer.
+       */
+      map: Slot;
+    };
+
+export interface Fields {
+  allowExtra?: Partial<Record<Slot, boolean>>;
+  args?: ReadonlyArray<Field>;
+}
+
+export type FieldsConfig = ReadonlyArray<Field | Fields>;
+
+const extraPrefixesMap: Record<string, Slot> = {
+  $body_: 'body',
+  $headers_: 'headers',
+  $path_: 'path',
+  $query_: 'query',
+};
+const extraPrefixes = Object.entries(extraPrefixesMap);
+
+type KeyMap = Map<
+  string,
+  | {
+      in: Slot;
+      map?: string;
+    }
+  | {
+      in?: never;
+      map: Slot;
+    }
+>;
+
+const buildKeyMap = (fields: FieldsConfig, map?: KeyMap): KeyMap => {
+  if (!map) {
+    map = new Map();
+  }
+
+  for (const config of fields) {
+    if ('in' in config) {
+      if (config.key) {
+        map.set(config.key, {
+          in: config.in,
+          map: config.map,
+        });
+      }
+    } else if ('key' in config) {
+      map.set(config.key, {
+        map: config.map,
+      });
+    } else if (config.args) {
+      buildKeyMap(config.args, map);
+    }
+  }
+
+  return map;
+};
+
+interface Params {
+  body: unknown;
+  headers: Record<string, unknown>;
+  path: Record<string, unknown>;
+  query: Record<string, unknown>;
+}
+
+const stripEmptySlots = (params: Params) => {
+  for (const [slot, value] of Object.entries(params)) {
+    if (value && typeof value === 'object' && !Object.keys(value).length) {
+      delete params[slot as Slot];
+    }
+  }
+};
+
+export const buildClientParams = (
+  args: ReadonlyArray<unknown>,
+  fields: FieldsConfig,
+) => {
+  const params: Params = {
+    body: {},
+    headers: {},
+    path: {},
+    query: {},
+  };
+
+  const map = buildKeyMap(fields);
+
+  let config: FieldsConfig[number] | undefined;
+
+  for (const [index, arg] of args.entries()) {
+    if (fields[index]) {
+      config = fields[index];
+    }
+
+    if (!config) {
+      continue;
+    }
+
+    if ('in' in config) {
+      if (config.key) {
+        const field = map.get(config.key)!;
+        const name = field.map || config.key;
+        if (field.in) {
+          (params[field.in] as Record<string, unknown>)[name] = arg;
+        }
+      } else {
+        params.body = arg;
+      }
+    } else {
+      for (const [key, value] of Object.entries(arg ?? {})) {
+        const field = map.get(key);
+
+        if (field) {
+          if (field.in) {
+            const name = field.map || key;
+            (params[field.in] as Record<string, unknown>)[name] = value;
+          } else {
+            params[field.map] = value;
+          }
+        } else {
+          const extra = extraPrefixes.find(([prefix]) =>
+            key.startsWith(prefix),
+          );
+
+          if (extra) {
+            const [prefix, slot] = extra;
+            (params[slot] as Record<string, unknown>)[
+              key.slice(prefix.length)
+            ] = value;
+          } else if ('allowExtra' in config && config.allowExtra) {
+            for (const [slot, allowed] of Object.entries(config.allowExtra)) {
+              if (allowed) {
+                (params[slot as Slot] as Record<string, unknown>)[key] = value;
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  stripEmptySlots(params);
+
+  return params;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
new file mode 100644
index 000000000..8d9993104
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/pathSerializer.gen.ts
@@ -0,0 +1,181 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+interface SerializeOptions<T>
+  extends SerializePrimitiveOptions,
+    SerializerOptions<T> {}
+
+interface SerializePrimitiveOptions {
+  allowReserved?: boolean;
+  name: string;
+}
+
+export interface SerializerOptions<T> {
+  /**
+   * @default true
+   */
+  explode: boolean;
+  style: T;
+}
+
+export type ArrayStyle = 'form' | 'spaceDelimited' | 'pipeDelimited';
+export type ArraySeparatorStyle = ArrayStyle | MatrixStyle;
+type MatrixStyle = 'label' | 'matrix' | 'simple';
+export type ObjectStyle = 'form' | 'deepObject';
+type ObjectSeparatorStyle = ObjectStyle | MatrixStyle;
+
+interface SerializePrimitiveParam extends SerializePrimitiveOptions {
+  value: string;
+}
+
+export const separatorArrayExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const separatorArrayNoExplode = (style: ArraySeparatorStyle) => {
+  switch (style) {
+    case 'form':
+      return ',';
+    case 'pipeDelimited':
+      return '|';
+    case 'spaceDelimited':
+      return '%20';
+    default:
+      return ',';
+  }
+};
+
+export const separatorObjectExplode = (style: ObjectSeparatorStyle) => {
+  switch (style) {
+    case 'label':
+      return '.';
+    case 'matrix':
+      return ';';
+    case 'simple':
+      return ',';
+    default:
+      return '&';
+  }
+};
+
+export const serializeArrayParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+}: SerializeOptions<ArraySeparatorStyle> & {
+  value: unknown[];
+}) => {
+  if (!explode) {
+    const joinedValues = (
+      allowReserved ? value : value.map((v) => encodeURIComponent(v as string))
+    ).join(separatorArrayNoExplode(style));
+    switch (style) {
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      case 'simple':
+        return joinedValues;
+      default:
+        return `${name}=${joinedValues}`;
+    }
+  }
+
+  const separator = separatorArrayExplode(style);
+  const joinedValues = value
+    .map((v) => {
+      if (style === 'label' || style === 'simple') {
+        return allowReserved ? v : encodeURIComponent(v as string);
+      }
+
+      return serializePrimitiveParam({
+        allowReserved,
+        name,
+        value: v as string,
+      });
+    })
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
+
+export const serializePrimitiveParam = ({
+  allowReserved,
+  name,
+  value,
+}: SerializePrimitiveParam) => {
+  if (value === undefined || value === null) {
+    return '';
+  }
+
+  if (typeof value === 'object') {
+    throw new Error(
+      'Deeply-nested arrays/objects aren’t supported. Provide your own `querySerializer()` to handle these.',
+    );
+  }
+
+  return `${name}=${allowReserved ? value : encodeURIComponent(value)}`;
+};
+
+export const serializeObjectParam = ({
+  allowReserved,
+  explode,
+  name,
+  style,
+  value,
+  valueOnly,
+}: SerializeOptions<ObjectSeparatorStyle> & {
+  value: Record<string, unknown> | Date;
+  valueOnly?: boolean;
+}) => {
+  if (value instanceof Date) {
+    return valueOnly ? value.toISOString() : `${name}=${value.toISOString()}`;
+  }
+
+  if (style !== 'deepObject' && !explode) {
+    let values: string[] = [];
+    Object.entries(value).forEach(([key, v]) => {
+      values = [
+        ...values,
+        key,
+        allowReserved ? (v as string) : encodeURIComponent(v as string),
+      ];
+    });
+    const joinedValues = values.join(',');
+    switch (style) {
+      case 'form':
+        return `${name}=${joinedValues}`;
+      case 'label':
+        return `.${joinedValues}`;
+      case 'matrix':
+        return `;${name}=${joinedValues}`;
+      default:
+        return joinedValues;
+    }
+  }
+
+  const separator = separatorObjectExplode(style);
+  const joinedValues = Object.entries(value)
+    .map(([key, v]) =>
+      serializePrimitiveParam({
+        allowReserved,
+        name: style === 'deepObject' ? `${name}[${key}]` : key,
+        value: v as string,
+      }),
+    )
+    .join(separator);
+  return style === 'label' || style === 'matrix'
+    ? separator + joinedValues
+    : joinedValues;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
new file mode 100644
index 000000000..d3bb68396
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/queryKeySerializer.gen.ts
@@ -0,0 +1,136 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+/**
+ * JSON-friendly union that mirrors what Pinia Colada can hash.
+ */
+export type JsonValue =
+  | null
+  | string
+  | number
+  | boolean
+  | JsonValue[]
+  | { [key: string]: JsonValue };
+
+/**
+ * Replacer that converts non-JSON values (bigint, Date, etc.) to safe substitutes.
+ */
+export const queryKeyJsonReplacer = (_key: string, value: unknown) => {
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  return value;
+};
+
+/**
+ * Safely stringifies a value and parses it back into a JsonValue.
+ */
+export const stringifyToJsonValue = (input: unknown): JsonValue | undefined => {
+  try {
+    const json = JSON.stringify(input, queryKeyJsonReplacer);
+    if (json === undefined) {
+      return undefined;
+    }
+    return JSON.parse(json) as JsonValue;
+  } catch {
+    return undefined;
+  }
+};
+
+/**
+ * Detects plain objects (including objects with a null prototype).
+ */
+const isPlainObject = (value: unknown): value is Record<string, unknown> => {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value as object);
+  return prototype === Object.prototype || prototype === null;
+};
+
+/**
+ * Turns URLSearchParams into a sorted JSON object for deterministic keys.
+ */
+const serializeSearchParams = (params: URLSearchParams): JsonValue => {
+  const entries = Array.from(params.entries()).sort(([a], [b]) =>
+    a.localeCompare(b),
+  );
+  const result: Record<string, JsonValue> = {};
+
+  for (const [key, value] of entries) {
+    const existing = result[key];
+    if (existing === undefined) {
+      result[key] = value;
+      continue;
+    }
+
+    if (Array.isArray(existing)) {
+      (existing as string[]).push(value);
+    } else {
+      result[key] = [existing, value];
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Normalizes any accepted value into a JSON-friendly shape for query keys.
+ */
+export const serializeQueryKeyValue = (
+  value: unknown,
+): JsonValue | undefined => {
+  if (value === null) {
+    return null;
+  }
+
+  if (
+    typeof value === 'string' ||
+    typeof value === 'number' ||
+    typeof value === 'boolean'
+  ) {
+    return value;
+  }
+
+  if (
+    value === undefined ||
+    typeof value === 'function' ||
+    typeof value === 'symbol'
+  ) {
+    return undefined;
+  }
+
+  if (typeof value === 'bigint') {
+    return value.toString();
+  }
+
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+
+  if (Array.isArray(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  if (
+    typeof URLSearchParams !== 'undefined' &&
+    value instanceof URLSearchParams
+  ) {
+    return serializeSearchParams(value);
+  }
+
+  if (isPlainObject(value)) {
+    return stringifyToJsonValue(value);
+  }
+
+  return undefined;
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
new file mode 100644
index 000000000..f8fd78e28
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/serverSentEvents.gen.ts
@@ -0,0 +1,264 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Config } from './types.gen';
+
+export type ServerSentEventsOptions<TData = unknown> = Omit<
+  RequestInit,
+  'method'
+> &
+  Pick<Config, 'method' | 'responseTransformer' | 'responseValidator'> & {
+    /**
+     * Fetch API implementation. You can use this option to provide a custom
+     * fetch instance.
+     *
+     * @default globalThis.fetch
+     */
+    fetch?: typeof fetch;
+    /**
+     * Implementing clients can call request interceptors inside this hook.
+     */
+    onRequest?: (url: string, init: RequestInit) => Promise<Request>;
+    /**
+     * Callback invoked when a network or parsing error occurs during streaming.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param error The error that occurred.
+     */
+    onSseError?: (error: unknown) => void;
+    /**
+     * Callback invoked when an event is streamed from the server.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @param event Event streamed from the server.
+     * @returns Nothing (void).
+     */
+    onSseEvent?: (event: StreamEvent<TData>) => void;
+    serializedBody?: RequestInit['body'];
+    /**
+     * Default retry delay in milliseconds.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 3000
+     */
+    sseDefaultRetryDelay?: number;
+    /**
+     * Maximum number of retry attempts before giving up.
+     */
+    sseMaxRetryAttempts?: number;
+    /**
+     * Maximum retry delay in milliseconds.
+     *
+     * Applies only when exponential backoff is used.
+     *
+     * This option applies only if the endpoint returns a stream of events.
+     *
+     * @default 30000
+     */
+    sseMaxRetryDelay?: number;
+    /**
+     * Optional sleep function for retry backoff.
+     *
+     * Defaults to using `setTimeout`.
+     */
+    sseSleepFn?: (ms: number) => Promise<void>;
+    url: string;
+  };
+
+export interface StreamEvent<TData = unknown> {
+  data: TData;
+  event?: string;
+  id?: string;
+  retry?: number;
+}
+
+export type ServerSentEventsResult<
+  TData = unknown,
+  TReturn = void,
+  TNext = unknown,
+> = {
+  stream: AsyncGenerator<
+    TData extends Record<string, unknown> ? TData[keyof TData] : TData,
+    TReturn,
+    TNext
+  >;
+};
+
+export const createSseClient = <TData = unknown>({
+  onRequest,
+  onSseError,
+  onSseEvent,
+  responseTransformer,
+  responseValidator,
+  sseDefaultRetryDelay,
+  sseMaxRetryAttempts,
+  sseMaxRetryDelay,
+  sseSleepFn,
+  url,
+  ...options
+}: ServerSentEventsOptions): ServerSentEventsResult<TData> => {
+  let lastEventId: string | undefined;
+
+  const sleep =
+    sseSleepFn ??
+    ((ms: number) => new Promise((resolve) => setTimeout(resolve, ms)));
+
+  const createStream = async function* () {
+    let retryDelay: number = sseDefaultRetryDelay ?? 3000;
+    let attempt = 0;
+    const signal = options.signal ?? new AbortController().signal;
+
+    while (true) {
+      if (signal.aborted) break;
+
+      attempt++;
+
+      const headers =
+        options.headers instanceof Headers
+          ? options.headers
+          : new Headers(options.headers as Record<string, string> | undefined);
+
+      if (lastEventId !== undefined) {
+        headers.set('Last-Event-ID', lastEventId);
+      }
+
+      try {
+        const requestInit: RequestInit = {
+          redirect: 'follow',
+          ...options,
+          body: options.serializedBody,
+          headers,
+          signal,
+        };
+        let request = new Request(url, requestInit);
+        if (onRequest) {
+          request = await onRequest(url, requestInit);
+        }
+        // fetch must be assigned here, otherwise it would throw the error:
+        // TypeError: Failed to execute 'fetch' on 'Window': Illegal invocation
+        const _fetch = options.fetch ?? globalThis.fetch;
+        const response = await _fetch(request);
+
+        if (!response.ok)
+          throw new Error(
+            `SSE failed: ${response.status} ${response.statusText}`,
+          );
+
+        if (!response.body) throw new Error('No body in SSE response');
+
+        const reader = response.body
+          .pipeThrough(new TextDecoderStream())
+          .getReader();
+
+        let buffer = '';
+
+        const abortHandler = () => {
+          try {
+            reader.cancel();
+          } catch {
+            // noop
+          }
+        };
+
+        signal.addEventListener('abort', abortHandler);
+
+        try {
+          while (true) {
+            const { done, value } = await reader.read();
+            if (done) break;
+            buffer += value;
+
+            const chunks = buffer.split('\n\n');
+            buffer = chunks.pop() ?? '';
+
+            for (const chunk of chunks) {
+              const lines = chunk.split('\n');
+              const dataLines: Array<string> = [];
+              let eventName: string | undefined;
+
+              for (const line of lines) {
+                if (line.startsWith('data:')) {
+                  dataLines.push(line.replace(/^data:\s*/, ''));
+                } else if (line.startsWith('event:')) {
+                  eventName = line.replace(/^event:\s*/, '');
+                } else if (line.startsWith('id:')) {
+                  lastEventId = line.replace(/^id:\s*/, '');
+                } else if (line.startsWith('retry:')) {
+                  const parsed = Number.parseInt(
+                    line.replace(/^retry:\s*/, ''),
+                    10,
+                  );
+                  if (!Number.isNaN(parsed)) {
+                    retryDelay = parsed;
+                  }
+                }
+              }
+
+              let data: unknown;
+              let parsedJson = false;
+
+              if (dataLines.length) {
+                const rawData = dataLines.join('\n');
+                try {
+                  data = JSON.parse(rawData);
+                  parsedJson = true;
+                } catch {
+                  data = rawData;
+                }
+              }
+
+              if (parsedJson) {
+                if (responseValidator) {
+                  await responseValidator(data);
+                }
+
+                if (responseTransformer) {
+                  data = await responseTransformer(data);
+                }
+              }
+
+              onSseEvent?.({
+                data,
+                event: eventName,
+                id: lastEventId,
+                retry: retryDelay,
+              });
+
+              if (dataLines.length) {
+                yield data as any;
+              }
+            }
+          }
+        } finally {
+          signal.removeEventListener('abort', abortHandler);
+          reader.releaseLock();
+        }
+
+        break; // exit loop on normal completion
+      } catch (error) {
+        // connection failed or aborted; retry after delay
+        onSseError?.(error);
+
+        if (
+          sseMaxRetryAttempts !== undefined &&
+          attempt >= sseMaxRetryAttempts
+        ) {
+          break; // stop after firing error
+        }
+
+        // exponential backoff: double retry each attempt, cap at 30s
+        const backoff = Math.min(
+          retryDelay * 2 ** (attempt - 1),
+          sseMaxRetryDelay ?? 30000,
+        );
+        await sleep(backoff);
+      }
+    }
+  };
+
+  const stream = createStream();
+
+  return { stream };
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
new file mode 100644
index 000000000..643c070c9
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/types.gen.ts
@@ -0,0 +1,118 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { Auth, AuthToken } from './auth.gen';
+import type {
+  BodySerializer,
+  QuerySerializer,
+  QuerySerializerOptions,
+} from './bodySerializer.gen';
+
+export type HttpMethod =
+  | 'connect'
+  | 'delete'
+  | 'get'
+  | 'head'
+  | 'options'
+  | 'patch'
+  | 'post'
+  | 'put'
+  | 'trace';
+
+export type Client<
+  RequestFn = never,
+  Config = unknown,
+  MethodFn = never,
+  BuildUrlFn = never,
+  SseFn = never,
+> = {
+  /**
+   * Returns the final request URL.
+   */
+  buildUrl: BuildUrlFn;
+  getConfig: () => Config;
+  request: RequestFn;
+  setConfig: (config: Config) => Config;
+} & {
+  [K in HttpMethod]: MethodFn;
+} & ([SseFn] extends [never]
+    ? { sse?: never }
+    : { sse: { [K in HttpMethod]: SseFn } });
+
+export interface Config {
+  /**
+   * Auth token or a function returning auth token. The resolved value will be
+   * added to the request payload as defined by its `security` array.
+   */
+  auth?: ((auth: Auth) => Promise<AuthToken> | AuthToken) | AuthToken;
+  /**
+   * A function for serializing request body parameter. By default,
+   * {@link JSON.stringify()} will be used.
+   */
+  bodySerializer?: BodySerializer | null;
+  /**
+   * An object containing any HTTP headers that you want to pre-populate your
+   * `Headers` object with.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/Headers/Headers#init See more}
+   */
+  headers?:
+    | RequestInit['headers']
+    | Record<
+        string,
+        | string
+        | number
+        | boolean
+        | (string | number | boolean)[]
+        | null
+        | undefined
+        | unknown
+      >;
+  /**
+   * The request method.
+   *
+   * {@link https://developer.mozilla.org/docs/Web/API/fetch#method See more}
+   */
+  method?: Uppercase<HttpMethod>;
+  /**
+   * A function for serializing request query parameters. By default, arrays
+   * will be exploded in form style, objects will be exploded in deepObject
+   * style, and reserved characters are percent-encoded.
+   *
+   * This method will have no effect if the native `paramsSerializer()` Axios
+   * API function is used.
+   *
+   * {@link https://swagger.io/docs/specification/serialization/#query View examples}
+   */
+  querySerializer?: QuerySerializer | QuerySerializerOptions;
+  /**
+   * A function validating request data. This is useful if you want to ensure
+   * the request conforms to the desired shape, so it can be safely sent to
+   * the server.
+   */
+  requestValidator?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function transforming response data before it's returned. This is useful
+   * for post-processing data, e.g. converting ISO strings into Date objects.
+   */
+  responseTransformer?: (data: unknown) => Promise<unknown>;
+  /**
+   * A function validating response data. This is useful if you want to ensure
+   * the response conforms to the desired shape, so it can be safely passed to
+   * the transformers and returned to the user.
+   */
+  responseValidator?: (data: unknown) => Promise<unknown>;
+}
+
+type IsExactlyNeverOrNeverUndefined<T> = [T] extends [never]
+  ? true
+  : [T] extends [never | undefined]
+    ? [undefined] extends [T]
+      ? false
+      : true
+    : false;
+
+export type OmitNever<T extends Record<string, unknown>> = {
+  [K in keyof T as IsExactlyNeverOrNeverUndefined<T[K]> extends true
+    ? never
+    : K]: T[K];
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
new file mode 100644
index 000000000..0b5389d08
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/core/utils.gen.ts
@@ -0,0 +1,143 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import type { BodySerializer, QuerySerializer } from './bodySerializer.gen';
+import {
+  type ArraySeparatorStyle,
+  serializeArrayParam,
+  serializeObjectParam,
+  serializePrimitiveParam,
+} from './pathSerializer.gen';
+
+export interface PathSerializer {
+  path: Record<string, unknown>;
+  url: string;
+}
+
+export const PATH_PARAM_RE = /\{[^{}]+\}/g;
+
+export const defaultPathSerializer = ({ path, url: _url }: PathSerializer) => {
+  let url = _url;
+  const matches = _url.match(PATH_PARAM_RE);
+  if (matches) {
+    for (const match of matches) {
+      let explode = false;
+      let name = match.substring(1, match.length - 1);
+      let style: ArraySeparatorStyle = 'simple';
+
+      if (name.endsWith('*')) {
+        explode = true;
+        name = name.substring(0, name.length - 1);
+      }
+
+      if (name.startsWith('.')) {
+        name = name.substring(1);
+        style = 'label';
+      } else if (name.startsWith(';')) {
+        name = name.substring(1);
+        style = 'matrix';
+      }
+
+      const value = path[name];
+
+      if (value === undefined || value === null) {
+        continue;
+      }
+
+      if (Array.isArray(value)) {
+        url = url.replace(
+          match,
+          serializeArrayParam({ explode, name, style, value }),
+        );
+        continue;
+      }
+
+      if (typeof value === 'object') {
+        url = url.replace(
+          match,
+          serializeObjectParam({
+            explode,
+            name,
+            style,
+            value: value as Record<string, unknown>,
+            valueOnly: true,
+          }),
+        );
+        continue;
+      }
+
+      if (style === 'matrix') {
+        url = url.replace(
+          match,
+          `;${serializePrimitiveParam({
+            name,
+            value: value as string,
+          })}`,
+        );
+        continue;
+      }
+
+      const replaceValue = encodeURIComponent(
+        style === 'label' ? `.${value as string}` : (value as string),
+      );
+      url = url.replace(match, replaceValue);
+    }
+  }
+  return url;
+};
+
+export const getUrl = ({
+  baseUrl,
+  path,
+  query,
+  querySerializer,
+  url: _url,
+}: {
+  baseUrl?: string;
+  path?: Record<string, unknown>;
+  query?: Record<string, unknown>;
+  querySerializer: QuerySerializer;
+  url: string;
+}) => {
+  const pathUrl = _url.startsWith('/') ? _url : `/${_url}`;
+  let url = (baseUrl ?? '') + pathUrl;
+  if (path) {
+    url = defaultPathSerializer({ path, url });
+  }
+  let search = query ? querySerializer(query) : '';
+  if (search.startsWith('?')) {
+    search = search.substring(1);
+  }
+  if (search) {
+    url += `?${search}`;
+  }
+  return url;
+};
+
+export function getValidRequestBody(options: {
+  body?: unknown;
+  bodySerializer?: BodySerializer | null;
+  serializedBody?: unknown;
+}) {
+  const hasBody = options.body !== undefined;
+  const isSerializedBody = hasBody && options.bodySerializer;
+
+  if (isSerializedBody) {
+    if ('serializedBody' in options) {
+      const hasSerializedBody =
+        options.serializedBody !== undefined && options.serializedBody !== '';
+
+      return hasSerializedBody ? options.serializedBody : null;
+    }
+
+    // not all clients implement a serializedBody property (i.e. client-axios)
+    return options.body !== '' ? options.body : null;
+  }
+
+  // plain/text body
+  if (hasBody) {
+    return options.body;
+  }
+
+  // no body was provided
+  return undefined;
+}
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
new file mode 100644
index 000000000..c352c1047
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/index.ts
@@ -0,0 +1,4 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type * from './types.gen';
+export * from './sdk.gen';
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
new file mode 100644
index 000000000..4166f8b7c
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/sdk.gen.ts
@@ -0,0 +1,418 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { type Client, formDataBodySerializer, type Options as Options2, type TDataShape, urlSearchParamsBodySerializer } from './client';
+import { client } from './client.gen';
+import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCountResponses, CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData, CallWithDefaultParametersData, CallWithDescriptionsData, CallWithDuplicateResponsesData, CallWithDuplicateResponsesErrors, CallWithDuplicateResponsesResponses, CallWithNoContentResponseData, CallWithNoContentResponseResponses, CallWithParametersData, CallWithResponseAndNoContentResponseData, CallWithResponseAndNoContentResponseResponses, CallWithResponseData, CallWithResponseResponses, CallWithResponsesData, CallWithResponsesErrors, CallWithResponsesResponses, CallWithResultFromHeaderData, CallWithResultFromHeaderErrors, CallWithResultFromHeaderResponses, CallWithWeirdParameterNamesData, CollectionFormatData, ComplexParamsData, ComplexParamsResponses, ComplexTypesData, ComplexTypesErrors, ComplexTypesResponses, DeleteCallWithoutParametersAndResponseData, DeleteFooData3, DeprecatedCallData, DummyAData, DummyAResponses, DummyBData, DummyBResponses, DuplicateName2Data, DuplicateName3Data, DuplicateName4Data, DuplicateNameData, ExportData, FileResponseData, FileResponseResponses, FooWowData, FooWowResponses, GetApiVbyApiVersionSimpleOperationData, GetApiVbyApiVersionSimpleOperationErrors, GetApiVbyApiVersionSimpleOperationResponses, GetCallWithOptionalParamData, GetCallWithoutParametersAndResponseData, HeadCallWithoutParametersAndResponseData, ImportData, ImportResponses, MultipartRequestData, MultipartResponseData, MultipartResponseResponses, NonAsciiæøåÆøÅöôêÊ字符串Data, NonAsciiæøåÆøÅöôêÊ字符串Responses, OptionsCallWithoutParametersAndResponseData, PatchApiVbyApiVersionNoTagData, PatchApiVbyApiVersionNoTagResponses, PatchCallWithoutParametersAndResponseData, PostApiVbyApiVersionFormDataData, PostApiVbyApiVersionRequestBodyData, PostCallWithOptionalParamData, PostCallWithOptionalParamResponses, PostCallWithoutParametersAndResponseData, PutCallWithoutParametersAndResponseData, PutWithFormUrlEncodedData, TestErrorCodeData, TestErrorCodeErrors, TestErrorCodeResponses, TypesData, TypesResponses, UploadFileData, UploadFileResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
+    /**
+     * You can provide a client instance returned by `createClient()` instead of
+     * individual options. This might be also useful if you want to implement a
+     * custom client.
+     */
+    client?: Client;
+    /**
+     * You can pass arbitrary values through the `meta` object. This can be
+     * used to access values that aren't defined as part of the SDK function.
+     */
+    meta?: Record<string, unknown>;
+};
+
+export const export_ = <ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const patchApiVbyApiVersionNoTag = <ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<PatchApiVbyApiVersionNoTagResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const import_ = <ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>) => {
+    return (options.client ?? client).post<ImportResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const fooWow = <ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>) => {
+    return (options?.client ?? client).put<FooWowResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no+tag',
+        ...options
+    });
+};
+
+export const apiVVersionODataControllerCount = <ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>) => {
+    return (options?.client ?? client).get<ApiVVersionODataControllerCountResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple/$count',
+        ...options
+    });
+};
+
+export const getApiVbyApiVersionSimpleOperation = <ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>) => {
+    return (options.client ?? client).get<GetApiVbyApiVersionSimpleOperationResponses, GetApiVbyApiVersionSimpleOperationErrors, ThrowOnError>({
+        url: '/api/v{api-version}/simple:operation',
+        ...options
+    });
+};
+
+export const deleteCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const getCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const headCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).head<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const optionsCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).options<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const patchCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).patch<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const postCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const putCallWithoutParametersAndResponse = <ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/simple',
+        ...options
+    });
+};
+
+export const deleteFoo = <ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>) => {
+    return (options.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
+        ...options
+    });
+};
+
+export const callWithDescriptions = <ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/descriptions',
+        ...options
+    });
+};
+
+/**
+ * @deprecated
+ */
+export const deprecatedCall = <ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/deprecated',
+        ...options
+    });
+};
+
+export const callWithParameters = <ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameterPath}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithWeirdParameterNames = <ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>) => {
+    return (options.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const getCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postCallWithOptionalParam = <ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>) => {
+    return (options.client ?? client).post<PostCallWithOptionalParamResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/parameters',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionRequestBody = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/requestBody',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json',
+            ...options?.headers
+        }
+    });
+};
+
+export const postApiVbyApiVersionFormData = <ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/formData',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const callWithDefaultParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callWithDefaultOptionalParameters = <ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const callToTestOrderOfParams = <ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/defaults',
+        ...options
+    });
+};
+
+export const duplicateName = <ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>) => {
+    return (options?.client ?? client).delete<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName2 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>) => {
+    return (options?.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName3 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const duplicateName4 = <ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>) => {
+    return (options?.client ?? client).put<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/duplicate',
+        ...options
+    });
+};
+
+export const callWithNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/no-content',
+        ...options
+    });
+};
+
+export const callWithResponseAndNoContentResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseAndNoContentResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/response-and-no-content',
+        ...options
+    });
+};
+
+export const dummyA = <ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyAResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/a',
+        ...options
+    });
+};
+
+export const dummyB = <ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>) => {
+    return (options?.client ?? client).get<DummyBResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multiple-tags/b',
+        ...options
+    });
+};
+
+export const callWithResponse = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<CallWithResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithDuplicateResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithDuplicateResponsesResponses, CallWithDuplicateResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const callWithResponses = <ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>) => {
+    return (options?.client ?? client).put<CallWithResponsesResponses, CallWithResponsesErrors, ThrowOnError>({
+        url: '/api/v{api-version}/response',
+        ...options
+    });
+};
+
+export const collectionFormat = <ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>) => {
+    return (options.client ?? client).get<unknown, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/collectionFormat',
+        ...options
+    });
+};
+
+export const types = <ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<TypesResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/types',
+        ...options
+    });
+};
+
+export const uploadFile = <ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>) => {
+    return (options.client ?? client).post<UploadFileResponses, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/upload',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
+
+export const fileResponse = <ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>) => {
+    return (options.client ?? client).get<FileResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/file/{id}',
+        ...options
+    });
+};
+
+export const complexTypes = <ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>) => {
+    return (options.client ?? client).get<ComplexTypesResponses, ComplexTypesErrors, ThrowOnError>({
+        querySerializer: {
+            parameters: {
+                parameterObject: {
+                    object: {
+                        style: 'form'
+                    }
+                }
+            }
+        },
+        url: '/api/v{api-version}/complex',
+        ...options
+    });
+};
+
+export const multipartResponse = <ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>) => {
+    return (options?.client ?? client).get<MultipartResponseResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/multipart',
+        ...options
+    });
+};
+
+export const multipartRequest = <ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>) => {
+    return (options?.client ?? client).post<unknown, unknown, ThrowOnError>({
+        ...formDataBodySerializer,
+        url: '/api/v{api-version}/multipart',
+        ...options,
+        headers: {
+            'Content-Type': null,
+            ...options?.headers
+        }
+    });
+};
+
+export const complexParams = <ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>) => {
+    return (options.client ?? client).put<ComplexParamsResponses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/complex/{id}',
+        ...options,
+        headers: {
+            'Content-Type': 'application/json-patch+json',
+            ...options.headers
+        }
+    });
+};
+
+export const callWithResultFromHeader = <ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>) => {
+    return (options?.client ?? client).post<CallWithResultFromHeaderResponses, CallWithResultFromHeaderErrors, ThrowOnError>({
+        url: '/api/v{api-version}/header',
+        ...options
+    });
+};
+
+export const testErrorCode = <ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>) => {
+    return (options.client ?? client).post<TestErrorCodeResponses, TestErrorCodeErrors, ThrowOnError>({
+        url: '/api/v{api-version}/error',
+        ...options
+    });
+};
+
+export const nonAsciiæøåÆøÅöôêÊ字符串 = <ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>) => {
+    return (options.client ?? client).post<NonAsciiæøåÆøÅöôêÊ字符串Responses, unknown, ThrowOnError>({
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options
+    });
+};
+
+/**
+ * Login User
+ */
+export const putWithFormUrlEncoded = <ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>) => {
+    return (options.client ?? client).put<unknown, unknown, ThrowOnError>({
+        ...urlSearchParamsBodySerializer,
+        url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
+        ...options,
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+            ...options.headers
+        }
+    });
+};
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
new file mode 100644
index 000000000..3cdf939bb
--- /dev/null
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@tanstack/vue-query/fetch-vue-response-style/types.gen.ts
@@ -0,0 +1,2091 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+export type ClientOptions = {
+    baseUrl: 'http://localhost:3000/base' | (string & {});
+};
+
+/**
+ * Model with number-only name
+ */
+export type _400 = string;
+
+/**
+ * External ref to shared model (A)
+ */
+export type ExternalRefA = ExternalSharedExternalSharedModel;
+
+/**
+ * External ref to shared model (B)
+ */
+export type ExternalRefB = ExternalSharedExternalSharedModel;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CamelCaseCommentWithBreaks = number;
+
+/**
+ * Testing multiline comments in string: First line
+ * Second line
+ *
+ * Fourth line
+ */
+export type CommentWithBreaks = number;
+
+/**
+ * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+ */
+export type CommentWithBackticks = number;
+
+/**
+ * Testing backticks and quotes in string: `backticks`, 'quotes', "double quotes" and ```multiple backticks``` should work
+ */
+export type CommentWithBackticksAndQuotes = number;
+
+/**
+ * Testing slashes in string: \backwards\\\ and /forwards/// should work
+ */
+export type CommentWithSlashes = number;
+
+/**
+ * Testing expression placeholders in string: ${expression} should work
+ */
+export type CommentWithExpressionPlaceholders = number;
+
+/**
+ * Testing quotes in string: 'single quote''' and "double quotes""" should work
+ */
+export type CommentWithQuotes = number;
+
+/**
+ * Testing reserved characters in string: * inline * and ** inline ** should work
+ */
+export type CommentWithReservedCharacters = number;
+
+/**
+ * This is a simple number
+ */
+export type SimpleInteger = number;
+
+/**
+ * This is a simple boolean
+ */
+export type SimpleBoolean = boolean;
+
+/**
+ * This is a simple string
+ */
+export type SimpleString = string;
+
+/**
+ * A string with non-ascii (unicode) characters valid in typescript identifiers (æøåÆØÅöÔèÈ字符串)
+ */
+export type NonAsciiStringæøåÆøÅöôêÊ字符串 = string;
+
+/**
+ * This is a simple file
+ */
+export type SimpleFile = Blob | File;
+
+/**
+ * This is a simple reference
+ */
+export type SimpleReference = ModelWithString;
+
+/**
+ * This is a simple string
+ */
+export type SimpleStringWithPattern = string | null;
+
+/**
+ * This is a simple enum with strings
+ */
+export type EnumWithStrings = 'Success' | 'Warning' | 'Error' | "'Single Quote'" | '"Double Quotes"' | 'Non-ascii: øæåôöØÆÅÔÖ字符串';
+
+export type EnumWithReplacedCharacters = "'Single Quote'" | '"Double Quotes"' | 'øæåôöØÆÅÔÖ字符串' | 3.1 | '';
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithNumbers = 1 | 2 | 3 | 1.1 | 1.2 | 1.3 | 100 | 200 | 300 | -100 | -200 | -300 | -1.1 | -1.2 | -1.3;
+
+/**
+ * Success=1,Warning=2,Error=3
+ */
+export type EnumFromDescription = number;
+
+/**
+ * This is a simple enum with numbers
+ */
+export type EnumWithExtensions = 200 | 400 | 500;
+
+export type EnumWithXEnumNames = 0 | 1 | 2;
+
+/**
+ * This is a simple array with numbers
+ */
+export type ArrayWithNumbers = Array<number>;
+
+/**
+ * This is a simple array with booleans
+ */
+export type ArrayWithBooleans = Array<boolean>;
+
+/**
+ * This is a simple array with strings
+ */
+export type ArrayWithStrings = Array<string>;
+
+/**
+ * This is a simple array with references
+ */
+export type ArrayWithReferences = Array<ModelWithString>;
+
+/**
+ * This is a simple array containing an array
+ */
+export type ArrayWithArray = Array<Array<ModelWithString>>;
+
+/**
+ * This is a simple array with properties
+ */
+export type ArrayWithProperties = Array<{
+    '16x16'?: CamelCaseCommentWithBreaks;
+    bar?: string;
+}>;
+
+/**
+ * This is a simple array with any of properties
+ */
+export type ArrayWithAnyOfProperties = Array<{
+    foo?: string;
+} | {
+    bar?: string;
+}>;
+
+export type AnyOfAnyAndNull = {
+    data?: unknown | null;
+};
+
+/**
+ * This is a simple array with any of properties
+ */
+export type AnyOfArrays = {
+    results?: Array<{
+        foo?: string;
+    } | {
+        bar?: string;
+    }>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithString = {
+    [key: string]: string;
+};
+
+export type DictionaryWithPropertiesAndAdditionalProperties = {
+    foo?: number;
+    bar?: boolean;
+    [key: string]: string | number | boolean | undefined;
+};
+
+/**
+ * This is a string reference
+ */
+export type DictionaryWithReference = {
+    [key: string]: ModelWithString;
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithArray = {
+    [key: string]: Array<ModelWithString>;
+};
+
+/**
+ * This is a string dictionary
+ */
+export type DictionaryWithDictionary = {
+    [key: string]: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a complex dictionary
+ */
+export type DictionaryWithProperties = {
+    [key: string]: {
+        foo?: string;
+        bar?: string;
+    };
+};
+
+/**
+ * This is a model with one number property
+ */
+export type ModelWithInteger = {
+    /**
+     * This is a simple number property
+     */
+    prop?: number;
+};
+
+/**
+ * This is a model with one boolean property
+ */
+export type ModelWithBoolean = {
+    /**
+     * This is a simple boolean property
+     */
+    prop?: boolean;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithString = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithStringError = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+};
+
+/**
+ * `Comment` or `VoiceComment`. The JSON object for adding voice comments to tickets is different. See [Adding voice comments to tickets](/documentation/ticketing/managing-tickets/adding-voice-comments-to-tickets)
+ */
+export type ModelFromZendesk = string;
+
+/**
+ * This is a model with one string property
+ */
+export type ModelWithNullableString = {
+    /**
+     * This is a simple string property
+     */
+    nullableProp1?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp1: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableProp2?: string | null;
+    /**
+     * This is a simple string property
+     */
+    nullableRequiredProp2: string | null;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnum = {
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+    /**
+     * These are the HTTP error code enums
+     */
+    statusCode?: '100' | '200 FOO' | '300 FOO_BAR' | '400 foo-bar' | '500 foo.bar' | '600 foo&bar';
+    /**
+     * Simple boolean enum
+     */
+    bool?: true;
+};
+
+/**
+ * This is a model with one enum with escaped name
+ */
+export type ModelWithEnumWithHyphen = {
+    /**
+     * Foo-Bar-Baz-Qux
+     */
+    'foo-bar-baz-qux'?: '3.0';
+};
+
+/**
+ * This is a model with one enum
+ */
+export type ModelWithEnumFromDescription = {
+    /**
+     * Success=1,Warning=2,Error=3
+     */
+    test?: number;
+};
+
+/**
+ * This is a model with nested enums
+ */
+export type ModelWithNestedEnums = {
+    dictionaryWithEnum?: {
+        [key: string]: 'Success' | 'Warning' | 'Error';
+    };
+    dictionaryWithEnumFromDescription?: {
+        [key: string]: number;
+    };
+    arrayWithEnum?: Array<'Success' | 'Warning' | 'Error'>;
+    arrayWithDescription?: Array<number>;
+    /**
+     * This is a simple enum with strings
+     */
+    'foo_bar-enum'?: 'Success' | 'Warning' | 'Error' | 'ØÆÅ字符串';
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReference = {
+    prop?: ModelWithProperties;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnly = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnly>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArray = {
+    prop?: Array<ModelWithString>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one property containing a dictionary
+ */
+export type ModelWithDictionary = {
+    prop?: {
+        [key: string]: string;
+    };
+};
+
+/**
+ * This is a deprecated model with a deprecated property
+ *
+ * @deprecated
+ */
+export type DeprecatedModel = {
+    /**
+     * This is a deprecated property
+     *
+     * @deprecated
+     */
+    prop?: string;
+};
+
+/**
+ * This is a model with one property containing a circular reference
+ */
+export type ModelWithCircularReference = {
+    prop?: ModelWithCircularReference;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * Circle
+ */
+export type ModelCircle = {
+    kind: string;
+    radius?: number;
+};
+
+/**
+ * Square
+ */
+export type ModelSquare = {
+    kind: string;
+    sideLength?: number;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship where the options are not $ref
+ */
+export type CompositionWithOneOfDiscriminator = ({
+    kind: 'circle';
+} & ModelCircle) | ({
+    kind: 'square';
+} & ModelSquare);
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOf = {
+    propA?: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithAnyOfAnonymous = {
+    propA?: {
+        propA?: string;
+    } | string | number;
+};
+
+/**
+ * This is a model with nested 'any of' property with a type null
+ */
+export type CompositionWithNestedAnyAndTypeNull = {
+    propA?: Array<ModelWithDictionary | null> | Array<ModelWithArray | null>;
+};
+
+export type _3eNum1Период = 'Bird' | 'Dog';
+
+export type ConstValue = 'ConstValue';
+
+/**
+ * This is a model with one property with a 'any of' relationship where the options are not $ref
+ */
+export type CompositionWithNestedAnyOfAndNull = {
+    /**
+     * Scopes
+     */
+    propA?: Array<_3eNum1Период | ConstValue> | null;
+};
+
+/**
+ * This is a model with one property with a 'one of' relationship
+ */
+export type CompositionWithOneOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a model that contains a simple dictionary within composition
+ */
+export type CompositionWithOneOfAndSimpleDictionary = {
+    propA?: boolean | {
+        [key: string]: number;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of simple arrays within composition
+ */
+export type CompositionWithOneOfAndSimpleArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<boolean>;
+    };
+};
+
+/**
+ * This is a model that contains a dictionary of complex arrays (composited) within composition
+ */
+export type CompositionWithOneOfAndComplexArrayDictionary = {
+    propA?: boolean | {
+        [key: string]: Array<number | string>;
+    };
+};
+
+/**
+ * This is a model with one property with a 'all of' relationship
+ */
+export type CompositionWithAllOfAndNullable = {
+    propA?: ({
+        boolean?: boolean;
+    } & ModelWithEnum & ModelWithArray & ModelWithDictionary) | null;
+};
+
+/**
+ * This is a model with one property with a 'any of' relationship
+ */
+export type CompositionWithAnyOfAndNullable = {
+    propA?: {
+        boolean?: boolean;
+    } | ModelWithEnum | ModelWithArray | ModelWithDictionary | null;
+};
+
+/**
+ * This is a base model with two simple optional properties
+ */
+export type CompositionBaseModel = {
+    firstName?: string;
+    lastname?: string;
+};
+
+/**
+ * This is a model that extends the base model
+ */
+export type CompositionExtendedModel = CompositionBaseModel & {
+    age: number;
+    firstName: string;
+    lastname: string;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithProperties = {
+    required: string;
+    readonly requiredAndReadOnly: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+    readonly '@namespace.string'?: string;
+    readonly '@namespace.integer'?: number;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithNestedProperties = {
+    readonly first: {
+        readonly second: {
+            readonly third: string | null;
+        } | null;
+    } | null;
+};
+
+/**
+ * This is a model with duplicated properties
+ */
+export type ModelWithDuplicateProperties = {
+    prop?: ModelWithString;
+};
+
+/**
+ * This is a model with ordered properties
+ */
+export type ModelWithOrderedProperties = {
+    zebra?: string;
+    apple?: string;
+    hawaii?: string;
+};
+
+/**
+ * This is a model with duplicated imports
+ */
+export type ModelWithDuplicateImports = {
+    propA?: ModelWithString;
+    propB?: ModelWithString;
+    propC?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtends = ModelWithString & {
+    propExtendsA?: string;
+    propExtendsB?: ModelWithString;
+};
+
+/**
+ * This is a model that extends another model
+ */
+export type ModelThatExtendsExtends = ModelWithString & ModelThatExtends & {
+    propExtendsC?: string;
+    propExtendsD?: ModelWithString;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPattern = {
+    key: string;
+    name: string;
+    readonly enabled?: boolean;
+    readonly modified?: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type File = {
+    /**
+     * Id
+     */
+    readonly id?: string;
+    /**
+     * Updated at
+     */
+    readonly updated_at?: string;
+    /**
+     * Created at
+     */
+    readonly created_at?: string;
+    /**
+     * Mime
+     */
+    mime: string;
+    /**
+     * File
+     */
+    readonly file?: string;
+};
+
+export type Default = {
+    name?: string;
+};
+
+export type Pageable = {
+    page?: number;
+    size?: number;
+    sort?: Array<string>;
+};
+
+/**
+ * This is a free-form object without additionalProperties.
+ */
+export type FreeFormObjectWithoutAdditionalProperties = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: true.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqTrue = {
+    [key: string]: unknown;
+};
+
+/**
+ * This is a free-form object with additionalProperties: {}.
+ */
+export type FreeFormObjectWithAdditionalPropertiesEqEmptyObject = {
+    [key: string]: unknown;
+};
+
+export type ModelWithConst = {
+    String?: 'String';
+    number?: 0;
+    null?: null;
+    withType?: 'Some string';
+};
+
+/**
+ * This is a model with one property and additionalProperties: true
+ */
+export type ModelWithAdditionalPropertiesEqTrue = {
+    /**
+     * This is a simple string property
+     */
+    prop?: string;
+    [key: string]: unknown | string | undefined;
+};
+
+export type NestedAnyOfArraysNullable = {
+    nullableArray?: Array<string | boolean> | null;
+};
+
+export type CompositionWithOneOfAndProperties = ({
+    foo: SimpleParameter;
+} | {
+    bar: NonAsciiStringæøåÆøÅöôêÊ字符串;
+}) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * An object that can be null
+ */
+export type NullableObject = {
+    foo?: string;
+} | null;
+
+/**
+ * Some % character
+ */
+export type CharactersInDescription = string;
+
+export type ModelWithNullableObject = {
+    data?: NullableObject;
+};
+
+export type ModelWithOneOfEnum = {
+    foo: 'Bar';
+} | {
+    foo: 'Baz';
+} | {
+    foo: 'Qux';
+} | {
+    content: string;
+    foo: 'Quux';
+} | {
+    content: [
+        string,
+        string
+    ];
+    foo: 'Corge';
+};
+
+export type ModelWithNestedArrayEnumsDataFoo = 'foo' | 'bar';
+
+export type ModelWithNestedArrayEnumsDataBar = 'baz' | 'qux';
+
+export type ModelWithNestedArrayEnumsData = {
+    foo?: Array<ModelWithNestedArrayEnumsDataFoo>;
+    bar?: Array<ModelWithNestedArrayEnumsDataBar>;
+};
+
+export type ModelWithNestedArrayEnums = {
+    array_strings?: Array<string>;
+    data?: ModelWithNestedArrayEnumsData;
+};
+
+export type ModelWithNestedCompositionEnums = {
+    foo?: ModelWithNestedArrayEnumsDataFoo;
+};
+
+export type ModelWithReadOnlyAndWriteOnly = {
+    foo: string;
+    readonly bar: string;
+};
+
+export type ModelWithConstantSizeArray = [
+    number,
+    number
+];
+
+export type ModelWithAnyOfConstantSizeArray = [
+    number | string,
+    number | string,
+    number | string
+];
+
+export type ModelWithPrefixItemsConstantSizeArray = [
+    ModelWithInteger,
+    number | string,
+    string
+];
+
+export type ModelWithAnyOfConstantSizeArrayNullable = [
+    number | null | string,
+    number | null | string,
+    number | null | string
+];
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptions = [
+    number | Import,
+    number | Import
+];
+
+export type ModelWithAnyOfConstantSizeArrayAndIntersect = [
+    number & string,
+    number & string
+];
+
+export type ModelWithNumericEnumUnion = {
+    /**
+     * Период
+     */
+    value?: -10 | -1 | 0 | 1 | 3 | 6 | 12;
+};
+
+/**
+ * Some description with `back ticks`
+ */
+export type ModelWithBackticksInDescription = {
+    /**
+     * The template `that` should be used for parsing and importing the contents of the CSV file.
+     *
+     * <br/><p>There is one placeholder currently supported:<ul>     <li><b>${x}</b> - refers to the n-th column in the CSV file, e.g. ${1}, ${2}, ...)</li></ul><p>Example of a correct JSON template:</p>
+     * <pre>
+     * [
+     * {
+     * "resourceType": "Asset",
+     * "identifier": {
+     * "name": "${1}",
+     * "domain": {
+     * "name": "${2}",
+     * "community": {
+     * "name": "Some Community"
+     * }
+     * }
+     * },
+     * "attributes" : {
+     * "00000000-0000-0000-0000-000000003115" : [ {
+     * "value" : "${3}"
+     * } ],
+     * "00000000-0000-0000-0000-000000000222" : [ {
+     * "value" : "${4}"
+     * } ]
+     * }
+     * }
+     * ]
+     * </pre>
+     */
+    template?: string;
+};
+
+export type ModelWithOneOfAndProperties = (SimpleParameter | NonAsciiStringæøåÆøÅöôêÊ字符串) & {
+    baz: number | null;
+    qux: number;
+};
+
+/**
+ * Model used to test deduplication strategy (unused)
+ */
+export type ParameterSimpleParameterUnused = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type PostServiceWithEmptyTagResponse2 = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData = string;
+
+/**
+ * Model used to test deduplication strategy
+ */
+export type DeleteFooData2 = string;
+
+/**
+ * Model with restricted keyword name
+ */
+export type Import = string;
+
+export type SchemaWithFormRestrictedKeys = {
+    description?: string;
+    'x-enum-descriptions'?: string;
+    'x-enum-varnames'?: string;
+    'x-enumNames'?: string;
+    title?: string;
+    object?: {
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    };
+    array?: Array<{
+        description?: string;
+        'x-enum-descriptions'?: string;
+        'x-enum-varnames'?: string;
+        'x-enumNames'?: string;
+        title?: string;
+    }>;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1DeleteOptions = {
+    /**
+     * Must be fulfilled before a deletion is carried out. If not possible, a 409 Conflict status will be returned.
+     */
+    preconditions?: IoK8sApimachineryPkgApisMetaV1Preconditions;
+};
+
+/**
+ * This schema was giving PascalCase transformations a hard time
+ */
+export type IoK8sApimachineryPkgApisMetaV1Preconditions = {
+    /**
+     * Specifies the target ResourceVersion
+     */
+    resourceVersion?: string;
+    /**
+     * Specifies the target UID.
+     */
+    uid?: string;
+};
+
+export type AdditionalPropertiesUnknownIssue = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue2 = {
+    [key: string]: string | number;
+};
+
+export type AdditionalPropertiesUnknownIssue3 = string & {
+    entries: {
+        [key: string]: AdditionalPropertiesUnknownIssue;
+    };
+};
+
+export type AdditionalPropertiesIntegerIssue = {
+    value: number;
+    [key: string]: number;
+};
+
+export type OneOfAllOfIssue = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBoolean = {
+    item?: boolean;
+    error?: string | null;
+    readonly hasError?: boolean;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemString = {
+    item?: string | null;
+    error?: string | null;
+    readonly hasError?: boolean;
+};
+
+export type ExternalSharedExternalSharedModel = {
+    id: string;
+    name?: string;
+};
+
+/**
+ * This is a model with one property containing a reference
+ */
+export type ModelWithReferenceWritable = {
+    prop?: ModelWithPropertiesWritable;
+};
+
+/**
+ * This is a model with one property containing an array
+ */
+export type ModelWithArrayReadOnlyAndWriteOnlyWritable = {
+    prop?: Array<ModelWithReadOnlyAndWriteOnlyWritable>;
+    propWithFile?: Array<Blob | File>;
+    propWithNumber?: Array<number>;
+};
+
+/**
+ * This is a model with one nested property
+ */
+export type ModelWithPropertiesWritable = {
+    required: string;
+    requiredAndNullable: string | null;
+    string?: string;
+    number?: number;
+    boolean?: boolean;
+    reference?: ModelWithString;
+    'property with space'?: string;
+    default?: string;
+    try?: string;
+};
+
+/**
+ * This is a model that contains a some patterns
+ */
+export type ModelWithPatternWritable = {
+    key: string;
+    name: string;
+    id?: string;
+    text?: string;
+    patternWithSingleQuotes?: string;
+    patternWithNewline?: string;
+    patternWithBacktick?: string;
+};
+
+export type FileWritable = {
+    /**
+     * Mime
+     */
+    mime: string;
+};
+
+export type ModelWithReadOnlyAndWriteOnlyWritable = {
+    foo: string;
+    baz: string;
+};
+
+export type ModelWithAnyOfConstantSizeArrayWithNSizeAndOptionsWritable = [
+    number | Import,
+    number | Import
+];
+
+export type AdditionalPropertiesUnknownIssueWritable = {
+    [key: string]: string | number;
+};
+
+export type OneOfAllOfIssueWritable = ((ConstValue | GenericSchemaDuplicateIssue1SystemBoolean) & _3eNum1Период) | GenericSchemaDuplicateIssue1SystemString;
+
+export type GenericSchemaDuplicateIssue1SystemBooleanWritable = {
+    item?: boolean;
+    error?: string | null;
+    data?: {
+        [key: string]: never;
+    };
+};
+
+export type GenericSchemaDuplicateIssue1SystemStringWritable = {
+    item?: string | null;
+    error?: string | null;
+};
+
+/**
+ * This is a reusable parameter
+ */
+export type SimpleParameter = string;
+
+/**
+ * Parameter with illegal characters
+ */
+export type XFooBar = ModelWithString;
+
+/**
+ * A reusable request body
+ */
+export type SimpleRequestBody = ModelWithString;
+
+/**
+ * A reusable request body
+ */
+export type SimpleFormData = ModelWithString;
+
+export type ExportData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type PatchApiVbyApiVersionNoTagResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ImportData = {
+    body: ModelWithReadOnlyAndWriteOnlyWritable | ModelWithArrayReadOnlyAndWriteOnlyWritable;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type ImportResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+    /**
+     * Default success response
+     */
+    default: ModelWithReadOnlyAndWriteOnly;
+};
+
+export type ImportResponse = ImportResponses[keyof ImportResponses];
+
+export type FooWowData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no+tag';
+};
+
+export type FooWowResponses = {
+    /**
+     * OK
+     */
+    default: unknown;
+};
+
+export type ApiVVersionODataControllerCountData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple/$count';
+};
+
+export type ApiVVersionODataControllerCountResponses = {
+    /**
+     * Success
+     */
+    200: ModelFromZendesk;
+};
+
+export type ApiVVersionODataControllerCountResponse = ApiVVersionODataControllerCountResponses[keyof ApiVVersionODataControllerCountResponses];
+
+export type GetApiVbyApiVersionSimpleOperationData = {
+    body?: never;
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/simple:operation';
+};
+
+export type GetApiVbyApiVersionSimpleOperationErrors = {
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type GetApiVbyApiVersionSimpleOperationError = GetApiVbyApiVersionSimpleOperationErrors[keyof GetApiVbyApiVersionSimpleOperationErrors];
+
+export type GetApiVbyApiVersionSimpleOperationResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+};
+
+export type GetApiVbyApiVersionSimpleOperationResponse = GetApiVbyApiVersionSimpleOperationResponses[keyof GetApiVbyApiVersionSimpleOperationResponses];
+
+export type DeleteCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type GetCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type HeadCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type OptionsCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PatchCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PostCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type PutCallWithoutParametersAndResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/simple';
+};
+
+export type DeleteFooData3 = {
+    body?: never;
+    headers: {
+        /**
+         * Parameter with illegal characters
+         */
+        'x-Foo-Bar': ModelWithString;
+    };
+    path: {
+        /**
+         * foo in method
+         */
+        foo_param: string;
+        /**
+         * bar in method
+         */
+        BarParam: string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}';
+};
+
+export type CallWithDescriptionsData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Testing multiline comments in string: First line
+         * Second line
+         *
+         * Fourth line
+         */
+        parameterWithBreaks?: string;
+        /**
+         * Testing backticks in string: `backticks` and ```multiple backticks``` should work
+         */
+        parameterWithBackticks?: string;
+        /**
+         * Testing slashes in string: \backwards\\\ and /forwards/// should work
+         */
+        parameterWithSlashes?: string;
+        /**
+         * Testing expression placeholders in string: ${expression} should work
+         */
+        parameterWithExpressionPlaceholders?: string;
+        /**
+         * Testing quotes in string: 'single quote''' and "double quotes""" should work
+         */
+        parameterWithQuotes?: string;
+        /**
+         * Testing reserved characters in string: * inline * and ** inline ** should work
+         */
+        parameterWithReservedCharacters?: string;
+    };
+    url: '/api/v{api-version}/descriptions';
+};
+
+export type DeprecatedCallData = {
+    body?: never;
+    headers: {
+        /**
+         * This parameter is deprecated
+         *
+         * @deprecated
+         */
+        parameter: DeprecatedModel | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/parameters/deprecated';
+};
+
+export type CallWithParametersData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: {
+        [key: string]: unknown;
+    } | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the header
+         */
+        parameterHeader: string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        parameterPath: string | null;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        foo_ref_enum?: ModelWithNestedArrayEnumsDataFoo;
+        foo_all_of_enum: ModelWithNestedArrayEnumsDataFoo;
+        /**
+         * This is the parameter that goes into the query params
+         */
+        cursor: string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameterPath}';
+};
+
+export type CallWithWeirdParameterNamesData = {
+    /**
+     * This is the parameter that goes into the body
+     */
+    body: ModelWithString | null;
+    headers: {
+        /**
+         * This is the parameter that goes into the request header
+         */
+        'parameter.header': string | null;
+    };
+    path: {
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter.path.1'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'parameter-path-2'?: string;
+        /**
+         * This is the parameter that goes into the path
+         */
+        'PARAMETER-PATH-3'?: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query: {
+        /**
+         * This is the parameter with a reserved keyword
+         */
+        default?: string;
+        /**
+         * This is the parameter that goes into the request query params
+         */
+        'parameter-query': string | null;
+    };
+    url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}';
+};
+
+export type GetCallWithOptionalParamData = {
+    /**
+     * This is a required parameter
+     */
+    body: ModelWithOneOfEnum;
+    path?: never;
+    query?: {
+        /**
+         * This is an optional parameter
+         */
+        page?: number;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamData = {
+    /**
+     * This is an optional parameter
+     */
+    body?: {
+        offset?: number | null;
+    };
+    path?: never;
+    query: {
+        /**
+         * This is a required parameter
+         */
+        parameter: Pageable;
+    };
+    url: '/api/v{api-version}/parameters';
+};
+
+export type PostCallWithOptionalParamResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type PostCallWithOptionalParamResponse = PostCallWithOptionalParamResponses[keyof PostCallWithOptionalParamResponses];
+
+export type PostApiVbyApiVersionRequestBodyData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleRequestBody;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/requestBody';
+};
+
+export type PostApiVbyApiVersionFormDataData = {
+    /**
+     * A reusable request body
+     */
+    body?: SimpleFormData;
+    path?: never;
+    query?: {
+        /**
+         * This is a reusable parameter
+         */
+        parameter?: string;
+    };
+    url: '/api/v{api-version}/formData';
+};
+
+export type CallWithDefaultParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string with default value
+         */
+        parameterString?: string | null;
+        /**
+         * This is a simple number with default value
+         */
+        parameterNumber?: number | null;
+        /**
+         * This is a simple boolean with default value
+         */
+        parameterBoolean?: boolean | null;
+        /**
+         * This is a simple enum with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model with default value
+         */
+        parameterModel?: ModelWithString | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallWithDefaultOptionalParametersData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * This is a simple string that is optional with default value
+         */
+        parameterString?: string;
+        /**
+         * This is a simple number that is optional with default value
+         */
+        parameterNumber?: number;
+        /**
+         * This is a simple boolean that is optional with default value
+         */
+        parameterBoolean?: boolean;
+        /**
+         * This is a simple enum that is optional with default value
+         */
+        parameterEnum?: 'Success' | 'Warning' | 'Error';
+        /**
+         * This is a simple model that is optional with default value
+         */
+        parameterModel?: ModelWithString;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type CallToTestOrderOfParamsData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is a optional string with default
+         */
+        parameterOptionalStringWithDefault?: string;
+        /**
+         * This is a optional string with empty default
+         */
+        parameterOptionalStringWithEmptyDefault?: string;
+        /**
+         * This is a optional string with no default
+         */
+        parameterOptionalStringWithNoDefault?: string;
+        /**
+         * This is a string with default
+         */
+        parameterStringWithDefault: string;
+        /**
+         * This is a string with empty default
+         */
+        parameterStringWithEmptyDefault: string;
+        /**
+         * This is a string with no default
+         */
+        parameterStringWithNoDefault: string;
+        /**
+         * This is a string that can be null with no default
+         */
+        parameterStringNullableWithNoDefault?: string | null;
+        /**
+         * This is a string that can be null with default
+         */
+        parameterStringNullableWithDefault?: string | null;
+    };
+    url: '/api/v{api-version}/defaults';
+};
+
+export type DuplicateNameData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName2Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName3Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type DuplicateName4Data = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/duplicate';
+};
+
+export type CallWithNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/no-content';
+};
+
+export type CallWithNoContentResponseResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithNoContentResponseResponse = CallWithNoContentResponseResponses[keyof CallWithNoContentResponseResponses];
+
+export type CallWithResponseAndNoContentResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/response-and-no-content';
+};
+
+export type CallWithResponseAndNoContentResponseResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type CallWithResponseAndNoContentResponseResponse = CallWithResponseAndNoContentResponseResponses[keyof CallWithResponseAndNoContentResponseResponses];
+
+export type DummyAData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/a';
+};
+
+export type DummyAResponses = {
+    200: _400;
+};
+
+export type DummyAResponse = DummyAResponses[keyof DummyAResponses];
+
+export type DummyBData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multiple-tags/b';
+};
+
+export type DummyBResponses = {
+    /**
+     * Success
+     */
+    204: void;
+};
+
+export type DummyBResponse = DummyBResponses[keyof DummyBResponses];
+
+export type CallWithResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponseResponses = {
+    default: Import;
+};
+
+export type CallWithResponseResponse = CallWithResponseResponses[keyof CallWithResponseResponses];
+
+export type CallWithDuplicateResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithDuplicateResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for 4XX errors
+     */
+    '4XX': DictionaryWithArray;
+    /**
+     * Default error response
+     */
+    default: ModelWithBoolean;
+};
+
+export type CallWithDuplicateResponsesError = CallWithDuplicateResponsesErrors[keyof CallWithDuplicateResponsesErrors];
+
+export type CallWithDuplicateResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: ModelWithBoolean & ModelWithInteger;
+    /**
+     * Message for 201 response
+     */
+    201: ModelWithString;
+    /**
+     * Message for 202 response
+     */
+    202: ModelWithString;
+};
+
+export type CallWithDuplicateResponsesResponse = CallWithDuplicateResponsesResponses[keyof CallWithDuplicateResponsesResponses];
+
+export type CallWithResponsesData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/response';
+};
+
+export type CallWithResponsesErrors = {
+    /**
+     * Message for 500 error
+     */
+    500: ModelWithStringError;
+    /**
+     * Message for 501 error
+     */
+    501: ModelWithStringError;
+    /**
+     * Message for 502 error
+     */
+    502: ModelWithStringError;
+    /**
+     * Message for default response
+     */
+    default: ModelWithStringError;
+};
+
+export type CallWithResponsesError = CallWithResponsesErrors[keyof CallWithResponsesErrors];
+
+export type CallWithResponsesResponses = {
+    /**
+     * Message for 200 response
+     */
+    200: {
+        readonly '@namespace.string'?: string;
+        readonly '@namespace.integer'?: number;
+        readonly value?: Array<ModelWithString>;
+    };
+    /**
+     * Message for 201 response
+     */
+    201: ModelThatExtends;
+    /**
+     * Message for 202 response
+     */
+    202: ModelThatExtendsExtends;
+};
+
+export type CallWithResponsesResponse = CallWithResponsesResponses[keyof CallWithResponsesResponses];
+
+export type CollectionFormatData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * This is an array parameter that is sent as csv format (comma-separated values)
+         */
+        parameterArrayCSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as ssv format (space-separated values)
+         */
+        parameterArraySSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as tsv format (tab-separated values)
+         */
+        parameterArrayTSV: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as pipes format (pipe-separated values)
+         */
+        parameterArrayPipes: Array<string> | null;
+        /**
+         * This is an array parameter that is sent as multi format (multiple parameter instances)
+         */
+        parameterArrayMulti: Array<string> | null;
+    };
+    url: '/api/v{api-version}/collectionFormat';
+};
+
+export type TypesData = {
+    body?: never;
+    path?: {
+        /**
+         * This is a number parameter
+         */
+        id?: number;
+    };
+    query: {
+        /**
+         * This is a number parameter
+         */
+        parameterNumber: number;
+        /**
+         * This is a string parameter
+         */
+        parameterString: string | null;
+        /**
+         * This is a boolean parameter
+         */
+        parameterBoolean: boolean | null;
+        /**
+         * This is an object parameter
+         */
+        parameterObject: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an array parameter
+         */
+        parameterArray: Array<string> | null;
+        /**
+         * This is a dictionary parameter
+         */
+        parameterDictionary: {
+            [key: string]: unknown;
+        } | null;
+        /**
+         * This is an enum parameter
+         */
+        parameterEnum: 'Success' | 'Warning' | 'Error' | null;
+    };
+    url: '/api/v{api-version}/types';
+};
+
+export type TypesResponses = {
+    /**
+     * Response is a simple number
+     */
+    200: number;
+    /**
+     * Response is a simple string
+     */
+    201: string;
+    /**
+     * Response is a simple boolean
+     */
+    202: boolean;
+    /**
+     * Response is a simple object
+     */
+    203: {
+        [key: string]: unknown;
+    };
+};
+
+export type TypesResponse = TypesResponses[keyof TypesResponses];
+
+export type UploadFileData = {
+    body: Blob | File;
+    path: {
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string | null;
+    };
+    query?: never;
+    url: '/api/v{api-version}/upload';
+};
+
+export type UploadFileResponses = {
+    200: boolean;
+};
+
+export type UploadFileResponse = UploadFileResponses[keyof UploadFileResponses];
+
+export type FileResponseData = {
+    body?: never;
+    path: {
+        id: string;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/file/{id}';
+};
+
+export type FileResponseResponses = {
+    /**
+     * Success
+     */
+    200: Blob | File;
+};
+
+export type FileResponseResponse = FileResponseResponses[keyof FileResponseResponses];
+
+export type ComplexTypesData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Parameter containing object
+         */
+        parameterObject: {
+            first?: {
+                second?: {
+                    third?: string;
+                };
+            };
+        };
+        /**
+         * Parameter containing reference
+         */
+        parameterReference: ModelWithString;
+    };
+    url: '/api/v{api-version}/complex';
+};
+
+export type ComplexTypesErrors = {
+    /**
+     * 400 `server` error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type ComplexTypesResponses = {
+    /**
+     * Successful response
+     */
+    200: Array<ModelWithString>;
+};
+
+export type ComplexTypesResponse = ComplexTypesResponses[keyof ComplexTypesResponses];
+
+export type MultipartResponseData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type MultipartResponseResponses = {
+    /**
+     * OK
+     */
+    200: {
+        file?: Blob | File;
+        metadata?: {
+            foo?: string;
+            bar?: string;
+        };
+    };
+};
+
+export type MultipartResponseResponse = MultipartResponseResponses[keyof MultipartResponseResponses];
+
+export type MultipartRequestData = {
+    body?: {
+        content?: Blob | File;
+        data?: ModelWithString | null;
+    };
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/multipart';
+};
+
+export type ComplexParamsData = {
+    body?: {
+        readonly key: string | null;
+        name: string | null;
+        enabled?: boolean;
+        type: 'Monkey' | 'Horse' | 'Bird';
+        listOfModels?: Array<ModelWithString> | null;
+        listOfStrings?: Array<string> | null;
+        parameters: ModelWithString | ModelWithEnum | ModelWithArray | ModelWithDictionary;
+        readonly user?: {
+            readonly id?: number;
+            readonly name?: string | null;
+        };
+    };
+    path: {
+        id: number;
+        /**
+         * api-version should be required in standalone clients
+         */
+        'api-version': string;
+    };
+    query?: never;
+    url: '/api/v{api-version}/complex/{id}';
+};
+
+export type ComplexParamsResponses = {
+    /**
+     * Success
+     */
+    200: ModelWithString;
+};
+
+export type ComplexParamsResponse = ComplexParamsResponses[keyof ComplexParamsResponses];
+
+export type CallWithResultFromHeaderData = {
+    body?: never;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/header';
+};
+
+export type CallWithResultFromHeaderErrors = {
+    /**
+     * 400 server error
+     */
+    400: unknown;
+    /**
+     * 500 server error
+     */
+    500: unknown;
+};
+
+export type CallWithResultFromHeaderResponses = {
+    /**
+     * Successful response
+     */
+    200: unknown;
+};
+
+export type TestErrorCodeData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Status code to return
+         */
+        status: number;
+    };
+    url: '/api/v{api-version}/error';
+};
+
+export type TestErrorCodeErrors = {
+    /**
+     * Custom message: Internal Server Error
+     */
+    500: unknown;
+    /**
+     * Custom message: Not Implemented
+     */
+    501: unknown;
+    /**
+     * Custom message: Bad Gateway
+     */
+    502: unknown;
+    /**
+     * Custom message: Service Unavailable
+     */
+    503: unknown;
+};
+
+export type TestErrorCodeResponses = {
+    /**
+     * Custom message: Successful response
+     */
+    200: unknown;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Data = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Dummy input param
+         */
+        nonAsciiParamæøåÆØÅöôêÊ: number;
+    };
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Responses = {
+    /**
+     * Successful response
+     */
+    200: Array<NonAsciiStringæøåÆøÅöôêÊ字符串>;
+};
+
+export type NonAsciiæøåÆøÅöôêÊ字符串Response = NonAsciiæøåÆøÅöôêÊ字符串Responses[keyof NonAsciiæøåÆøÅöôêÊ字符串Responses];
+
+export type PutWithFormUrlEncodedData = {
+    body: ArrayWithStrings;
+    path?: never;
+    query?: never;
+    url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串';
+};
diff --git a/packages/openapi-ts-tests/main/test/plugins.test.ts b/packages/openapi-ts-tests/main/test/plugins.test.ts
index 509b9d489..e1dab3d69 100644
--- a/packages/openapi-ts-tests/main/test/plugins.test.ts
+++ b/packages/openapi-ts-tests/main/test/plugins.test.ts
@@ -520,6 +520,51 @@ for (const version of versions) {
         }),
         description: 'generate Fetch API client with Pinia Colada plugin',
       },
+      {
+        config: createConfig({
+          output: 'fetch-response-style',
+          plugins: [
+            '@tanstack/react-query',
+            '@hey-api/client-fetch',
+            {
+              name: '@hey-api/sdk',
+              responseStyle: 'response',
+            },
+          ],
+        }),
+        description:
+          'generate Fetch API client with TanStack React Query plugin using responseStyle: response',
+      },
+      {
+        config: createConfig({
+          output: 'fetch-pinia-response-style',
+          plugins: [
+            '@pinia/colada',
+            '@hey-api/client-fetch',
+            {
+              name: '@hey-api/sdk',
+              responseStyle: 'response',
+            },
+          ],
+        }),
+        description:
+          'generate Fetch API client with Pinia Colada plugin using responseStyle: response',
+      },
+      {
+        config: createConfig({
+          output: 'fetch-vue-response-style',
+          plugins: [
+            '@tanstack/vue-query',
+            '@hey-api/client-fetch',
+            {
+              name: '@hey-api/sdk',
+              responseStyle: 'response',
+            },
+          ],
+        }),
+        description:
+          'generate Fetch API client with TanStack Vue Query plugin using responseStyle: response',
+      },
       {
         config: createConfig({
           input: 'sdk-instance.yaml',

From 7a7147fbb51e428508adf035570775568376d8c2 Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Thu, 6 Nov 2025 13:12:53 +0300
Subject: [PATCH 12/13] fix: proper mutation typing for pina

---
 .../@pinia/colada.gen.ts                      | 40 ++++++-------
 .../@pinia/colada.gen.ts                      | 58 +++++++++----------
 .../@pinia/colada.gen.ts                      | 58 +++++++++----------
 .../plugins/@pinia/colada/mutationOptions.ts  |  5 +-
 4 files changed, 79 insertions(+), 82 deletions(-)

diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
index 3e5d1bb0f..d82253120 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
@@ -57,7 +57,7 @@ export const serviceWithEmptyTagQuery = defineQueryOptions((options?: Options<Se
     }
 }));
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await patchApiVbyApiVersionNoTag({
@@ -69,7 +69,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
     };
 };
 
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => {
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<FooWowData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await fooWow({
@@ -81,7 +81,7 @@ export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutat
     };
 };
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deleteCallWithoutParametersAndResponse({
@@ -106,7 +106,7 @@ export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((opti
     }
 }));
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await patchCallWithoutParametersAndResponse({
@@ -118,7 +118,7 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
     };
 };
 
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => {
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postCallWithoutParametersAndResponse({
@@ -130,7 +130,7 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
     };
 };
 
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => {
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PutCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await putCallWithoutParametersAndResponse({
@@ -142,7 +142,7 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
     };
 };
 
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => {
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithDescriptionsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDescriptions({
@@ -154,7 +154,7 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
     };
 };
 
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => {
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithParametersData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithParameters({
@@ -166,7 +166,7 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
     };
 };
 
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => {
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithWeirdParameterNamesData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithWeirdParameterNames({
@@ -191,7 +191,7 @@ export const callWithDefaultParametersQuery = defineQueryOptions((options: Optio
     }
 }));
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => {
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithDefaultOptionalParametersData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDefaultOptionalParameters({
@@ -203,7 +203,7 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
     };
 };
 
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => {
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallToTestOrderOfParamsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callToTestOrderOfParams({
@@ -215,7 +215,7 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
     };
 };
 
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => {
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateNameData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName({
@@ -240,7 +240,7 @@ export const duplicateName2Query = defineQueryOptions((options?: Options<Duplica
     }
 }));
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => {
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateName3Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName3({
@@ -252,7 +252,7 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
     };
 };
 
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => {
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateName4Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName4({
@@ -329,7 +329,7 @@ export const callWithResponseQuery = defineQueryOptions((options?: Options<CallW
     }
 }));
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDuplicateResponses({
@@ -341,7 +341,7 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
     };
 };
 
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => {
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, Options<CallWithResponsesData>, CallWithResponsesError> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithResponses({
@@ -392,7 +392,7 @@ export const complexTypesQuery = defineQueryOptions((options: Options<ComplexTyp
     }
 }));
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => {
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithResultFromHeaderData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithResultFromHeader({
@@ -404,7 +404,7 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
     };
 };
 
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => {
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<TestErrorCodeData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await testErrorCode({
@@ -416,7 +416,7 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
     };
 };
 
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await nonAsciiæøåÆøÅöôêÊ字符串({
@@ -433,7 +433,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
  *
  * Body should not be unknown
  */
-export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<PostApiVbyApiVersionBodyResponse, Options<PostApiVbyApiVersionBodyData>, PostApiVbyApiVersionBodyError> => {
+export const postApiVbyApiVersionBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionBodyData>>): UseMutationOptions<{data: PostApiVbyApiVersionBodyResponse, response: Response, request: Request }, Options<PostApiVbyApiVersionBodyData>, PostApiVbyApiVersionBodyError> => {
     return {
         mutation: async (fnOptions) => {
             return await postApiVbyApiVersionBody({
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
index 15ee607eb..a9eb15b77 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
@@ -57,7 +57,7 @@ export const exportQuery = defineQueryOptions((options?: Options<ExportData>) =>
     }
 }));
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await patchApiVbyApiVersionNoTag({
@@ -69,7 +69,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
     };
 };
 
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, Options<ImportData>, Error> => {
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<{data: ImportResponse, response: Response, request: Request }, Options<ImportData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await import_({
@@ -81,7 +81,7 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
     };
 };
 
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => {
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<FooWowData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await fooWow({
@@ -119,7 +119,7 @@ export const getApiVbyApiVersionSimpleOperationQuery = defineQueryOptions((optio
     }
 }));
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deleteCallWithoutParametersAndResponse({
@@ -144,7 +144,7 @@ export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((opti
     }
 }));
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await patchCallWithoutParametersAndResponse({
@@ -156,7 +156,7 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
     };
 };
 
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => {
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postCallWithoutParametersAndResponse({
@@ -168,7 +168,7 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
     };
 };
 
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => {
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PutCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await putCallWithoutParametersAndResponse({
@@ -180,7 +180,7 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
     };
 };
 
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, Options<DeleteFooData3>, Error> => {
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeleteFooData3>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deleteFoo({
@@ -192,7 +192,7 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
     };
 };
 
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => {
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithDescriptionsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDescriptions({
@@ -207,7 +207,7 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, Options<DeprecatedCallData>, Error> => {
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeprecatedCallData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deprecatedCall({
@@ -219,7 +219,7 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
     };
 };
 
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => {
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithParametersData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithParameters({
@@ -231,7 +231,7 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
     };
 };
 
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => {
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithWeirdParameterNamesData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithWeirdParameterNames({
@@ -256,7 +256,7 @@ export const getCallWithOptionalParamQuery = defineQueryOptions((options: Option
     }
 }));
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, Options<PostCallWithOptionalParamData>, Error> => {
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<{data: PostCallWithOptionalParamResponse, response: Response, request: Request }, Options<PostCallWithOptionalParamData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postCallWithOptionalParam({
@@ -268,7 +268,7 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
     };
 };
 
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionRequestBodyData>, Error> => {
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostApiVbyApiVersionRequestBodyData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postApiVbyApiVersionRequestBody({
@@ -280,7 +280,7 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
     };
 };
 
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionFormDataData>, Error> => {
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostApiVbyApiVersionFormDataData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postApiVbyApiVersionFormData({
@@ -305,7 +305,7 @@ export const callWithDefaultParametersQuery = defineQueryOptions((options?: Opti
     }
 }));
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => {
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithDefaultOptionalParametersData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDefaultOptionalParameters({
@@ -317,7 +317,7 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
     };
 };
 
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => {
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallToTestOrderOfParamsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callToTestOrderOfParams({
@@ -329,7 +329,7 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
     };
 };
 
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => {
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateNameData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName({
@@ -354,7 +354,7 @@ export const duplicateName2Query = defineQueryOptions((options?: Options<Duplica
     }
 }));
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => {
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateName3Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName3({
@@ -366,7 +366,7 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
     };
 };
 
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => {
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateName4Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName4({
@@ -443,7 +443,7 @@ export const callWithResponseQuery = defineQueryOptions((options?: Options<CallW
     }
 }));
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDuplicateResponses({
@@ -455,7 +455,7 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
     };
 };
 
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => {
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, Options<CallWithResponsesData>, CallWithResponsesError> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithResponses({
@@ -493,7 +493,7 @@ export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
     }
 }));
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, Options<UploadFileData>, Error> => {
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<{data: UploadFileResponse, response: Response, request: Request }, Options<UploadFileData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await uploadFile({
@@ -544,7 +544,7 @@ export const multipartResponseQuery = defineQueryOptions((options?: Options<Mult
     }
 }));
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, Options<MultipartRequestData>, Error> => {
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<MultipartRequestData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await multipartRequest({
@@ -556,7 +556,7 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
     };
 };
 
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, Options<ComplexParamsData>, Error> => {
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<{data: ComplexParamsResponse, response: Response, request: Request }, Options<ComplexParamsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await complexParams({
@@ -568,7 +568,7 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
     };
 };
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => {
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithResultFromHeaderData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithResultFromHeader({
@@ -580,7 +580,7 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
     };
 };
 
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => {
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<TestErrorCodeData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await testErrorCode({
@@ -592,7 +592,7 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
     };
 };
 
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await nonAsciiæøåÆøÅöôêÊ字符串({
@@ -607,7 +607,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, Options<PutWithFormUrlEncodedData>, Error> => {
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PutWithFormUrlEncodedData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await putWithFormUrlEncoded({
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
index 15ee607eb..a9eb15b77 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@pinia/colada/fetch-pinia-response-style/@pinia/colada.gen.ts
@@ -57,7 +57,7 @@ export const exportQuery = defineQueryOptions((options?: Options<ExportData>) =>
     }
 }));
 
-export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<unknown, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
+export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<PatchApiVbyApiVersionNoTagData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PatchApiVbyApiVersionNoTagData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await patchApiVbyApiVersionNoTag({
@@ -69,7 +69,7 @@ export const patchApiVbyApiVersionNoTagMutation = (options?: Partial<Options<Pat
     };
 };
 
-export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<ImportResponse, Options<ImportData>, Error> => {
+export const importMutation = (options?: Partial<Options<ImportData>>): UseMutationOptions<{data: ImportResponse, response: Response, request: Request }, Options<ImportData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await import_({
@@ -81,7 +81,7 @@ export const importMutation = (options?: Partial<Options<ImportData>>): UseMutat
     };
 };
 
-export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<unknown, Options<FooWowData>, Error> => {
+export const fooWowMutation = (options?: Partial<Options<FooWowData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<FooWowData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await fooWow({
@@ -119,7 +119,7 @@ export const getApiVbyApiVersionSimpleOperationQuery = defineQueryOptions((optio
     }
 }));
 
-export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
+export const deleteCallWithoutParametersAndResponseMutation = (options?: Partial<Options<DeleteCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeleteCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deleteCallWithoutParametersAndResponse({
@@ -144,7 +144,7 @@ export const getCallWithoutParametersAndResponseQuery = defineQueryOptions((opti
     }
 }));
 
-export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
+export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PatchCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PatchCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await patchCallWithoutParametersAndResponse({
@@ -156,7 +156,7 @@ export const patchCallWithoutParametersAndResponseMutation = (options?: Partial<
     };
 };
 
-export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PostCallWithoutParametersAndResponseData>, Error> => {
+export const postCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PostCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postCallWithoutParametersAndResponse({
@@ -168,7 +168,7 @@ export const postCallWithoutParametersAndResponseMutation = (options?: Partial<O
     };
 };
 
-export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<unknown, Options<PutCallWithoutParametersAndResponseData>, Error> => {
+export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Options<PutCallWithoutParametersAndResponseData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PutCallWithoutParametersAndResponseData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await putCallWithoutParametersAndResponse({
@@ -180,7 +180,7 @@ export const putCallWithoutParametersAndResponseMutation = (options?: Partial<Op
     };
 };
 
-export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<unknown, Options<DeleteFooData3>, Error> => {
+export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeleteFooData3>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deleteFoo({
@@ -192,7 +192,7 @@ export const deleteFooMutation = (options?: Partial<Options<DeleteFooData3>>): U
     };
 };
 
-export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<unknown, Options<CallWithDescriptionsData>, Error> => {
+export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithDescriptionsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithDescriptionsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDescriptions({
@@ -207,7 +207,7 @@ export const callWithDescriptionsMutation = (options?: Partial<Options<CallWithD
 /**
  * @deprecated
  */
-export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<unknown, Options<DeprecatedCallData>, Error> => {
+export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DeprecatedCallData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await deprecatedCall({
@@ -219,7 +219,7 @@ export const deprecatedCallMutation = (options?: Partial<Options<DeprecatedCallD
     };
 };
 
-export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<unknown, Options<CallWithParametersData>, Error> => {
+export const callWithParametersMutation = (options?: Partial<Options<CallWithParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithParametersData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithParameters({
@@ -231,7 +231,7 @@ export const callWithParametersMutation = (options?: Partial<Options<CallWithPar
     };
 };
 
-export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<unknown, Options<CallWithWeirdParameterNamesData>, Error> => {
+export const callWithWeirdParameterNamesMutation = (options?: Partial<Options<CallWithWeirdParameterNamesData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithWeirdParameterNamesData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithWeirdParameterNames({
@@ -256,7 +256,7 @@ export const getCallWithOptionalParamQuery = defineQueryOptions((options: Option
     }
 }));
 
-export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<PostCallWithOptionalParamResponse, Options<PostCallWithOptionalParamData>, Error> => {
+export const postCallWithOptionalParamMutation = (options?: Partial<Options<PostCallWithOptionalParamData>>): UseMutationOptions<{data: PostCallWithOptionalParamResponse, response: Response, request: Request }, Options<PostCallWithOptionalParamData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postCallWithOptionalParam({
@@ -268,7 +268,7 @@ export const postCallWithOptionalParamMutation = (options?: Partial<Options<Post
     };
 };
 
-export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionRequestBodyData>, Error> => {
+export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Options<PostApiVbyApiVersionRequestBodyData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostApiVbyApiVersionRequestBodyData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postApiVbyApiVersionRequestBody({
@@ -280,7 +280,7 @@ export const postApiVbyApiVersionRequestBodyMutation = (options?: Partial<Option
     };
 };
 
-export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<unknown, Options<PostApiVbyApiVersionFormDataData>, Error> => {
+export const postApiVbyApiVersionFormDataMutation = (options?: Partial<Options<PostApiVbyApiVersionFormDataData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PostApiVbyApiVersionFormDataData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await postApiVbyApiVersionFormData({
@@ -305,7 +305,7 @@ export const callWithDefaultParametersQuery = defineQueryOptions((options?: Opti
     }
 }));
 
-export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<unknown, Options<CallWithDefaultOptionalParametersData>, Error> => {
+export const callWithDefaultOptionalParametersMutation = (options?: Partial<Options<CallWithDefaultOptionalParametersData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithDefaultOptionalParametersData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDefaultOptionalParameters({
@@ -317,7 +317,7 @@ export const callWithDefaultOptionalParametersMutation = (options?: Partial<Opti
     };
 };
 
-export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<unknown, Options<CallToTestOrderOfParamsData>, Error> => {
+export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallToTestOrderOfParamsData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallToTestOrderOfParamsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callToTestOrderOfParams({
@@ -329,7 +329,7 @@ export const callToTestOrderOfParamsMutation = (options?: Partial<Options<CallTo
     };
 };
 
-export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<unknown, Options<DuplicateNameData>, Error> => {
+export const duplicateNameMutation = (options?: Partial<Options<DuplicateNameData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateNameData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName({
@@ -354,7 +354,7 @@ export const duplicateName2Query = defineQueryOptions((options?: Options<Duplica
     }
 }));
 
-export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<unknown, Options<DuplicateName3Data>, Error> => {
+export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateName3Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName3({
@@ -366,7 +366,7 @@ export const duplicateName3Mutation = (options?: Partial<Options<DuplicateName3D
     };
 };
 
-export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<unknown, Options<DuplicateName4Data>, Error> => {
+export const duplicateName4Mutation = (options?: Partial<Options<DuplicateName4Data>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<DuplicateName4Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await duplicateName4({
@@ -443,7 +443,7 @@ export const callWithResponseQuery = defineQueryOptions((options?: Options<CallW
     }
 }));
 
-export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<CallWithDuplicateResponsesResponse, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
+export const callWithDuplicateResponsesMutation = (options?: Partial<Options<CallWithDuplicateResponsesData>>): UseMutationOptions<{data: CallWithDuplicateResponsesResponse, response: Response, request: Request }, Options<CallWithDuplicateResponsesData>, CallWithDuplicateResponsesError> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithDuplicateResponses({
@@ -455,7 +455,7 @@ export const callWithDuplicateResponsesMutation = (options?: Partial<Options<Cal
     };
 };
 
-export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<CallWithResponsesResponse, Options<CallWithResponsesData>, CallWithResponsesError> => {
+export const callWithResponsesMutation = (options?: Partial<Options<CallWithResponsesData>>): UseMutationOptions<{data: CallWithResponsesResponse, response: Response, request: Request }, Options<CallWithResponsesData>, CallWithResponsesError> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithResponses({
@@ -493,7 +493,7 @@ export const typesQuery = defineQueryOptions((options: Options<TypesData>) => ({
     }
 }));
 
-export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<UploadFileResponse, Options<UploadFileData>, Error> => {
+export const uploadFileMutation = (options?: Partial<Options<UploadFileData>>): UseMutationOptions<{data: UploadFileResponse, response: Response, request: Request }, Options<UploadFileData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await uploadFile({
@@ -544,7 +544,7 @@ export const multipartResponseQuery = defineQueryOptions((options?: Options<Mult
     }
 }));
 
-export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<unknown, Options<MultipartRequestData>, Error> => {
+export const multipartRequestMutation = (options?: Partial<Options<MultipartRequestData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<MultipartRequestData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await multipartRequest({
@@ -556,7 +556,7 @@ export const multipartRequestMutation = (options?: Partial<Options<MultipartRequ
     };
 };
 
-export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<ComplexParamsResponse, Options<ComplexParamsData>, Error> => {
+export const complexParamsMutation = (options?: Partial<Options<ComplexParamsData>>): UseMutationOptions<{data: ComplexParamsResponse, response: Response, request: Request }, Options<ComplexParamsData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await complexParams({
@@ -568,7 +568,7 @@ export const complexParamsMutation = (options?: Partial<Options<ComplexParamsDat
     };
 };
 
-export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<unknown, Options<CallWithResultFromHeaderData>, Error> => {
+export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallWithResultFromHeaderData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<CallWithResultFromHeaderData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await callWithResultFromHeader({
@@ -580,7 +580,7 @@ export const callWithResultFromHeaderMutation = (options?: Partial<Options<CallW
     };
 };
 
-export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<unknown, Options<TestErrorCodeData>, Error> => {
+export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<TestErrorCodeData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await testErrorCode({
@@ -592,7 +592,7 @@ export const testErrorCodeMutation = (options?: Partial<Options<TestErrorCodeDat
     };
 };
 
-export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
+export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<Options<NonAsciiæøåÆøÅöôêÊ字符串Data>>): UseMutationOptions<{data: NonAsciiæøåÆøÅöôêÊ字符串Response, response: Response, request: Request }, Options<NonAsciiæøåÆøÅöôêÊ字符串Data>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await nonAsciiæøåÆøÅöôêÊ字符串({
@@ -607,7 +607,7 @@ export const nonAsciiæøåÆøÅöôêÊ字符串Mutation = (options?: Partial<
 /**
  * Login User
  */
-export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<unknown, Options<PutWithFormUrlEncodedData>, Error> => {
+export const putWithFormUrlEncodedMutation = (options?: Partial<Options<PutWithFormUrlEncodedData>>): UseMutationOptions<{data: unknown, response: Response, request: Request }, Options<PutWithFormUrlEncodedData>, Error> => {
     return {
         mutation: async (fnOptions) => {
             return await putWithFormUrlEncoded({
diff --git a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
index ea6f8c45b..1cec89192 100644
--- a/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
+++ b/packages/openapi-ts/src/plugins/@pinia/colada/mutationOptions.ts
@@ -32,10 +32,7 @@ export const createMutationOptions = ({
     typeData,
   });
   // TODO: better types syntax
-  const mutationType = isNuxtClient
-    ? `${symbolMutationOptionsType.placeholder}<${typeResponse}, ${strippedTypeData}, ${typeError}>`
-    : `${symbolMutationOptionsType.placeholder}<${typeResponse}, ${typeData}, ${typeError}>`;
-
+  const mutationType = `${symbolMutationOptionsType.placeholder}<${plugin.getPluginOrThrow('@hey-api/sdk').config.responseStyle === 'response' ? `{data: ${typeResponse}, response: Response, request: Request }` : typeResponse}, ${isNuxtClient ? strippedTypeData : typeData}, ${typeError}>`;
   const fnOptions = 'fnOptions';
 
   const awaitSdkExpression = tsc.awaitExpression({

From 69f219fdbc11b341b3d3e7f2e62e36789b15150c Mon Sep 17 00:00:00 2001
From: Ahmet Can Buyukyilmaz <ahmet.buyukyilmaz@canonical.com>
Date: Thu, 6 Nov 2025 13:22:25 +0300
Subject: [PATCH 13/13] chore: update changeset

---
 .changeset/tall-donuts-boil.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .changeset/tall-donuts-boil.md

diff --git a/.changeset/tall-donuts-boil.md b/.changeset/tall-donuts-boil.md
new file mode 100644
index 000000000..63d5ea286
--- /dev/null
+++ b/.changeset/tall-donuts-boil.md
@@ -0,0 +1,17 @@
+---
+"@hey-api/openapi-ts": minor
+"@example/openapi-ts-angular-common": patch
+"@example/openapi-ts-angular": patch
+"@example/openapi-ts-fastify": patch
+"@example/openapi-ts-fetch": patch
+"@example/openapi-ts-ofetch": patch
+"@example/openapi-ts-openai": patch
+"@example/openapi-ts-pinia-colada": patch
+"@example/openapi-ts-tanstack-angular-query-experimental": patch
+"@example/openapi-ts-tanstack-react-query": patch
+"@example/openapi-ts-tanstack-svelte-query": patch
+"@example/openapi-ts-tanstack-vue-query": patch
+"@test/openapi-ts": patch
+---
+
+feat: Support 'response' return for openapi-ts plugins