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 54a9dfe62..7c868ed2c 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
@@ -170,11 +170,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
-- 
2.51.2


From 8c624d9b269775138145e93107ceb13f4f366dbc Mon Sep 17 00:00:00 2001
From: Nikita Perepelitsa <nikitaperepel@gmail.com>
Date: Thu, 5 Feb 2026 23:47:36 +0100
Subject: [PATCH 2/7] dev: add generic type parameter for requestOptions

---
 .../src/plugins/@hey-api/client-angular/bundle/client.ts       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/client.ts b/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/client.ts
index fdcdf833a..b74f3ecbd 100644
--- a/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/client.ts
+++ b/packages/openapi-ts/src/plugins/@hey-api/client-angular/bundle/client.ts
@@ -53,10 +53,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
-- 
2.51.2


From 4b7b08319137fb4112a5f420386663b953e69306 Mon Sep 17 00:00:00 2001
From: Nikita Perepelitsa <nikitaperepel@gmail.com>
Date: Wed, 11 Feb 2026 22:25:03 +0100
Subject: [PATCH 3/7] dev: add response type

---
 .../src/plugins/@angular/common/shared/node.ts       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/openapi-ts/src/plugins/@angular/common/shared/node.ts b/packages/openapi-ts/src/plugins/@angular/common/shared/node.ts
index e2c902c0f..3188ce280 100644
--- a/packages/openapi-ts/src/plugins/@angular/common/shared/node.ts
+++ b/packages/openapi-ts/src/plugins/@angular/common/shared/node.ts
@@ -219,6 +219,12 @@ function implementHttpRequestFn<T extends ReturnType<typeof $.func | typeof $.me
     role: 'data',
     tool: 'typescript',
   });
+  const symbolResponseType = plugin.querySymbol({
+    category: 'type',
+    resource: 'operation',
+    resourceId: operation.id,
+    role: 'response',
+  });
 
   return node
     .param('options', (p) =>
@@ -229,7 +235,7 @@ function implementHttpRequestFn<T extends ReturnType<typeof $.func | typeof $.me
       ),
     )
     .generic('ThrowOnError', (g) => g.extends('boolean').default(false))
-    .returns($.type(symbolHttpRequest).generic('unknown'))
+    .returns($.type(symbolHttpRequest).generic(symbolResponseType ?? 'unknown'))
     .do(
       $.return(
         $('options')
@@ -243,7 +249,9 @@ function implementHttpRequestFn<T extends ReturnType<typeof $.func | typeof $.me
               .prop('method', $.literal(operation.method.toUpperCase()))
               .prop('url', $.literal(operation.path))
               .spread('options'),
-          ),
+          )
+          .generic(symbolResponseType ?? 'unknown')
+          .generic('ThrowOnError'),
       ),
     ) as T;
 }
-- 
2.51.2


From b5f5df98ce1d48b9bcf9f08685b5bd2de0996a30 Mon Sep 17 00:00:00 2001
From: Nikita Perepelitsa <nikitaperepel@gmail.com>
Date: Wed, 11 Feb 2026 23:02:32 +0100
Subject: [PATCH 4/7] dev: update examples

---
 .../src/client/@angular/common.gen.ts         | 66 +++++++++----------
 .../src/client/client/client.gen.ts           |  3 +-
 .../src/client/client/types.gen.ts            |  5 +-
 .../src/client/client/client.gen.ts           |  3 +-
 .../src/client/client/types.gen.ts            |  5 +-
 .../src/client/client/client.gen.ts           |  3 +-
 .../src/client/client/types.gen.ts            |  5 +-
 7 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts b/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts
index e9c93eedb..5c20740f0 100644
--- a/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts
+++ b/examples/openapi-ts-angular-common/src/client/@angular/common.gen.ts
@@ -48,8 +48,8 @@ import type {
  */
 export const addPetRequest = <ThrowOnError extends boolean = false>(
   options: Options<AddPetData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<AddPetResponse> =>
+  (options?.client ?? client).requestOptions<AddPetResponse, ThrowOnError>({
     method: 'POST',
     responseStyle: 'data',
     url: '/pet',
@@ -63,8 +63,8 @@ export const addPetRequest = <ThrowOnError extends boolean = false>(
  */
 export const updatePetRequest = <ThrowOnError extends boolean = false>(
   options: Options<UpdatePetData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<UpdatePetResponse> =>
+  (options?.client ?? client).requestOptions<UpdatePetResponse, ThrowOnError>({
     method: 'PUT',
     responseStyle: 'data',
     url: '/pet',
@@ -78,8 +78,8 @@ export const updatePetRequest = <ThrowOnError extends boolean = false>(
  */
 export const findPetsByStatusRequest = <ThrowOnError extends boolean = false>(
   options: Options<FindPetsByStatusData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<FindPetsByStatusResponse> =>
+  (options?.client ?? client).requestOptions<FindPetsByStatusResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/pet/findByStatus',
@@ -93,8 +93,8 @@ export const findPetsByStatusRequest = <ThrowOnError extends boolean = false>(
  */
 export const findPetsByTagsRequest = <ThrowOnError extends boolean = false>(
   options: Options<FindPetsByTagsData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<FindPetsByTagsResponse> =>
+  (options?.client ?? client).requestOptions<FindPetsByTagsResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/pet/findByTags',
@@ -109,7 +109,7 @@ export const findPetsByTagsRequest = <ThrowOnError extends boolean = false>(
 export const deletePetRequest = <ThrowOnError extends boolean = false>(
   options: Options<DeletePetData, ThrowOnError>,
 ): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+  (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
     method: 'DELETE',
     responseStyle: 'data',
     url: '/pet/{petId}',
@@ -123,8 +123,8 @@ export const deletePetRequest = <ThrowOnError extends boolean = false>(
  */
 export const getPetByIdRequest = <ThrowOnError extends boolean = false>(
   options: Options<GetPetByIdData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<GetPetByIdResponse> =>
+  (options?.client ?? client).requestOptions<GetPetByIdResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/pet/{petId}',
@@ -138,8 +138,8 @@ export const getPetByIdRequest = <ThrowOnError extends boolean = false>(
  */
 export const updatePetWithFormRequest = <ThrowOnError extends boolean = false>(
   options: Options<UpdatePetWithFormData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<UpdatePetWithFormResponse> =>
+  (options?.client ?? client).requestOptions<UpdatePetWithFormResponse, ThrowOnError>({
     method: 'POST',
     responseStyle: 'data',
     url: '/pet/{petId}',
@@ -153,8 +153,8 @@ export const updatePetWithFormRequest = <ThrowOnError extends boolean = false>(
  */
 export const uploadFileRequest = <ThrowOnError extends boolean = false>(
   options: Options<UploadFileData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<UploadFileResponse> =>
+  (options?.client ?? client).requestOptions<UploadFileResponse, ThrowOnError>({
     method: 'POST',
     responseStyle: 'data',
     url: '/pet/{petId}/uploadImage',
@@ -168,8 +168,8 @@ export const uploadFileRequest = <ThrowOnError extends boolean = false>(
  */
 export const getInventoryRequest = <ThrowOnError extends boolean = false>(
   options?: Options<GetInventoryData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<GetInventoryResponse> =>
+  (options?.client ?? client).requestOptions<GetInventoryResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/store/inventory',
@@ -183,8 +183,8 @@ export const getInventoryRequest = <ThrowOnError extends boolean = false>(
  */
 export const placeOrderRequest = <ThrowOnError extends boolean = false>(
   options?: Options<PlaceOrderData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<PlaceOrderResponse> =>
+  (options?.client ?? client).requestOptions<PlaceOrderResponse, ThrowOnError>({
     method: 'POST',
     responseStyle: 'data',
     url: '/store/order',
@@ -199,7 +199,7 @@ export const placeOrderRequest = <ThrowOnError extends boolean = false>(
 export const deleteOrderRequest = <ThrowOnError extends boolean = false>(
   options: Options<DeleteOrderData, ThrowOnError>,
 ): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+  (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
     method: 'DELETE',
     responseStyle: 'data',
     url: '/store/order/{orderId}',
@@ -213,8 +213,8 @@ export const deleteOrderRequest = <ThrowOnError extends boolean = false>(
  */
 export const getOrderByIdRequest = <ThrowOnError extends boolean = false>(
   options: Options<GetOrderByIdData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<GetOrderByIdResponse> =>
+  (options?.client ?? client).requestOptions<GetOrderByIdResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/store/order/{orderId}',
@@ -228,8 +228,8 @@ export const getOrderByIdRequest = <ThrowOnError extends boolean = false>(
  */
 export const createUserRequest = <ThrowOnError extends boolean = false>(
   options?: Options<CreateUserData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<CreateUserResponse> =>
+  (options?.client ?? client).requestOptions<CreateUserResponse, ThrowOnError>({
     method: 'POST',
     responseStyle: 'data',
     url: '/user',
@@ -243,8 +243,8 @@ export const createUserRequest = <ThrowOnError extends boolean = false>(
  */
 export const createUsersWithListInputRequest = <ThrowOnError extends boolean = false>(
   options?: Options<CreateUsersWithListInputData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<CreateUsersWithListInputResponse> =>
+  (options?.client ?? client).requestOptions<CreateUsersWithListInputResponse, ThrowOnError>({
     method: 'POST',
     responseStyle: 'data',
     url: '/user/createWithList',
@@ -258,8 +258,8 @@ export const createUsersWithListInputRequest = <ThrowOnError extends boolean = f
  */
 export const loginUserRequest = <ThrowOnError extends boolean = false>(
   options?: Options<LoginUserData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<LoginUserResponse> =>
+  (options?.client ?? client).requestOptions<LoginUserResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/user/login',
@@ -274,7 +274,7 @@ export const loginUserRequest = <ThrowOnError extends boolean = false>(
 export const logoutUserRequest = <ThrowOnError extends boolean = false>(
   options?: Options<LogoutUserData, ThrowOnError>,
 ): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+  (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/user/logout',
@@ -289,7 +289,7 @@ export const logoutUserRequest = <ThrowOnError extends boolean = false>(
 export const deleteUserRequest = <ThrowOnError extends boolean = false>(
   options: Options<DeleteUserData, ThrowOnError>,
 ): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+  (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
     method: 'DELETE',
     responseStyle: 'data',
     url: '/user/{username}',
@@ -303,8 +303,8 @@ export const deleteUserRequest = <ThrowOnError extends boolean = false>(
  */
 export const getUserByNameRequest = <ThrowOnError extends boolean = false>(
   options: Options<GetUserByNameData, ThrowOnError>,
-): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+): HttpRequest<GetUserByNameResponse> =>
+  (options?.client ?? client).requestOptions<GetUserByNameResponse, ThrowOnError>({
     method: 'GET',
     responseStyle: 'data',
     url: '/user/{username}',
@@ -319,7 +319,7 @@ export const getUserByNameRequest = <ThrowOnError extends boolean = false>(
 export const updateUserRequest = <ThrowOnError extends boolean = false>(
   options: Options<UpdateUserData, ThrowOnError>,
 ): HttpRequest<unknown> =>
-  (options?.client ?? client).requestOptions({
+  (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
     method: 'PUT',
     responseStyle: 'data',
     url: '/user/{username}',
diff --git a/examples/openapi-ts-angular-common/src/client/client/client.gen.ts b/examples/openapi-ts-angular-common/src/client/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/examples/openapi-ts-angular-common/src/client/client/client.gen.ts
+++ b/examples/openapi-ts-angular-common/src/client/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 18bc780ef..7f990dfe7 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
@@ -169,11 +169,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/examples/openapi-ts-angular/src/client/client/client.gen.ts b/examples/openapi-ts-angular/src/client/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/examples/openapi-ts-angular/src/client/client/client.gen.ts
+++ b/examples/openapi-ts-angular/src/client/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 18bc780ef..7f990dfe7 100644
--- a/examples/openapi-ts-angular/src/client/client/types.gen.ts
+++ b/examples/openapi-ts-angular/src/client/client/types.gen.ts
@@ -169,11 +169,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts
+++ b/examples/openapi-ts-tanstack-angular-query-experimental/src/client/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 18bc780ef..7f990dfe7 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
@@ -169,11 +169,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
-- 
2.51.2


From 5245c3ac2c52d302962121abffc3cc8f47010b0d Mon Sep 17 00:00:00 2001
From: Nikita Perepelitsa <nikitaperepel@gmail.com>
Date: Wed, 11 Feb 2026 23:31:40 +0100
Subject: [PATCH 5/7] dev: update snapshots

---
 .../default-class/@angular/common.gen.ts      |  94 +++++------
 .../common/default-class/client/client.gen.ts |   3 +-
 .../common/default-class/client/types.gen.ts  |   5 +-
 .../common/default/client/client.gen.ts       |   3 +-
 .../common/default/client/types.gen.ts        |   5 +-
 .../default-class/@angular/common.gen.ts      | 148 ++++++++---------
 .../common/default-class/client/client.gen.ts |   3 +-
 .../common/default-class/client/types.gen.ts  |   5 +-
 .../common/default/client/client.gen.ts       |   3 +-
 .../common/default/client/types.gen.ts        |   5 +-
 .../base-url-false/client/client.gen.ts       |   3 +-
 .../base-url-false/client/types.gen.ts        |   5 +-
 .../base-url-number/client/client.gen.ts      |   3 +-
 .../base-url-number/client/types.gen.ts       |   5 +-
 .../base-url-strict/client/client.gen.ts      |   3 +-
 .../base-url-strict/client/types.gen.ts       |   5 +-
 .../base-url-string/client/client.gen.ts      |   3 +-
 .../base-url-string/client/types.gen.ts       |   5 +-
 .../clean-false/client/client.gen.ts          |   3 +-
 .../clean-false/client/types.gen.ts           |   5 +-
 .../default/client/client.gen.ts              |   3 +-
 .../default/client/types.gen.ts               |   5 +-
 .../client/client.gen.ts                      |   3 +-
 .../client/types.gen.ts                       |   5 +-
 .../sdk-client-optional/client/client.gen.ts  |   3 +-
 .../sdk-client-optional/client/types.gen.ts   |   5 +-
 .../sdk-client-required/client/client.gen.ts  |   3 +-
 .../sdk-client-required/client/types.gen.ts   |   5 +-
 .../tsconfig-node16-sdk/client/client.gen.ts  |   3 +-
 .../tsconfig-node16-sdk/client/types.gen.ts   |   5 +-
 .../client/client.gen.ts                      |   3 +-
 .../tsconfig-nodenext-sdk/client/types.gen.ts |   5 +-
 .../default-class/@angular/common.gen.ts      | 150 +++++++++---------
 .../common/default-class/client/client.gen.ts |   3 +-
 .../common/default-class/client/types.gen.ts  |   5 +-
 .../common/default/client/client.gen.ts       |   3 +-
 .../common/default/client/types.gen.ts        |   5 +-
 .../3.1.x/sse-angular/client/client.gen.ts    |   3 +-
 .../3.1.x/sse-angular/client/types.gen.ts     |   5 +-
 39 files changed, 286 insertions(+), 250 deletions(-)

diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
index a99955c54..a1cfdba69 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
@@ -10,7 +10,7 @@ import type { CallToTestOrderOfParamsData, CallWithDefaultOptionalParametersData
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceRequests {
     public serviceWithEmptyTag<ThrowOnError extends boolean = false>(options?: Options<ServiceWithEmptyTagData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/no+tag',
@@ -19,7 +19,7 @@ export class DefaultServiceRequests {
     }
     
     public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PATCH',
             url: '/api/v{api-version}/no+tag',
@@ -28,7 +28,7 @@ export class DefaultServiceRequests {
     }
     
     public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/no+tag',
@@ -41,8 +41,8 @@ export class DefaultServiceRequests {
      *
      * Body should not be unknown
      */
-    public postApiVbyApiVersionBody<ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public postApiVbyApiVersionBody<ThrowOnError extends boolean = false>(options: Options<PostApiVbyApiVersionBodyData, ThrowOnError>): HttpRequest<PostApiVbyApiVersionBodyResponse> {
+        return (options?.client ?? client).requestOptions<PostApiVbyApiVersionBodyResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/body',
@@ -54,7 +54,7 @@ export class DefaultServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceRequests {
     public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/simple',
@@ -63,7 +63,7 @@ export class SimpleServiceRequests {
     }
     
     public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple',
@@ -72,7 +72,7 @@ export class SimpleServiceRequests {
     }
     
     public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'HEAD',
             url: '/api/v{api-version}/simple',
@@ -81,7 +81,7 @@ export class SimpleServiceRequests {
     }
     
     public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'OPTIONS',
             url: '/api/v{api-version}/simple',
@@ -90,7 +90,7 @@ export class SimpleServiceRequests {
     }
     
     public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PATCH',
             url: '/api/v{api-version}/simple',
@@ -99,7 +99,7 @@ export class SimpleServiceRequests {
     }
     
     public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/simple',
@@ -108,7 +108,7 @@ export class SimpleServiceRequests {
     }
     
     public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/simple',
@@ -120,7 +120,7 @@ export class SimpleServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceRequests {
     public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/descriptions/',
@@ -132,7 +132,7 @@ export class DescriptionsServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceRequests {
     public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/{parameterPath}',
@@ -141,7 +141,7 @@ export class ParametersServiceRequests {
     }
     
     public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
@@ -153,7 +153,7 @@ export class ParametersServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceRequests {
     public callWithDefaultParameters<ThrowOnError extends boolean = false>(options: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/defaults',
@@ -162,7 +162,7 @@ export class DefaultsServiceRequests {
     }
     
     public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/defaults',
@@ -171,7 +171,7 @@ export class DefaultsServiceRequests {
     }
     
     public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/defaults',
@@ -183,7 +183,7 @@ export class DefaultsServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceRequests {
     public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/duplicate',
@@ -192,7 +192,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/duplicate',
@@ -201,7 +201,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/duplicate',
@@ -210,7 +210,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/duplicate',
@@ -222,7 +222,7 @@ export class DuplicateServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests {
     public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/no-content',
@@ -230,8 +230,8 @@ export class NoContentServiceRequests {
         });
     }
     
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<CallWithResponseAndNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseAndNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/response-and-no-content',
@@ -242,8 +242,8 @@ export class NoContentServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceRequests {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<CallWithResponseAndNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseAndNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/response-and-no-content',
@@ -251,8 +251,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<CallWithResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/response',
@@ -260,8 +260,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<CallWithDuplicateResponsesResponse> {
+        return (options?.client ?? client).requestOptions<CallWithDuplicateResponsesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/response',
@@ -269,8 +269,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<CallWithResponsesResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponsesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/response',
@@ -282,7 +282,7 @@ export class ResponseServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceRequests {
     public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/a',
@@ -291,7 +291,7 @@ export class MultipleTags1ServiceRequests {
     }
     
     public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -303,7 +303,7 @@ export class MultipleTags1ServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceRequests {
     public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/a',
@@ -312,7 +312,7 @@ export class MultipleTags2ServiceRequests {
     }
     
     public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -324,7 +324,7 @@ export class MultipleTags2ServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceRequests {
     public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -336,7 +336,7 @@ export class MultipleTags3ServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceRequests {
     public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/collectionFormat',
@@ -347,8 +347,8 @@ export class CollectionFormatServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceRequests {
-    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<TypesResponse> {
+        return (options?.client ?? client).requestOptions<TypesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/types',
@@ -359,8 +359,8 @@ export class TypesServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceRequests {
-    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<ComplexTypesResponse> {
+        return (options?.client ?? client).requestOptions<ComplexTypesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/complex',
@@ -372,7 +372,7 @@ export class ComplexServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceRequests {
     public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/header',
@@ -384,7 +384,7 @@ export class HeaderServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceRequests {
     public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/error',
@@ -395,8 +395,8 @@ export class ErrorServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<NonAsciiæøåÆøÅöôêÊ字符串Response> {
+        return (options?.client ?? client).requestOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default-class/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/2.0.x/plugins/@angular/common/default/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
index 523113b04..e0a271e62 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/@angular/common.gen.ts
@@ -10,7 +10,7 @@ import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCou
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceRequests {
     public export<ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/no+tag',
@@ -19,7 +19,7 @@ export class DefaultServiceRequests {
     }
     
     public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PATCH',
             url: '/api/v{api-version}/no+tag',
@@ -27,8 +27,8 @@ export class DefaultServiceRequests {
         });
     }
     
-    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<ImportResponse> {
+        return (options?.client ?? client).requestOptions<ImportResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/no+tag',
@@ -37,7 +37,7 @@ export class DefaultServiceRequests {
     }
     
     public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/no+tag',
@@ -45,8 +45,8 @@ export class DefaultServiceRequests {
         });
     }
     
-    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<GetApiVbyApiVersionSimpleOperationResponse> {
+        return (options?.client ?? client).requestOptions<GetApiVbyApiVersionSimpleOperationResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple:operation',
@@ -56,8 +56,8 @@ export class DefaultServiceRequests {
 }
 
 export class ODataControllerService {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<ApiVVersionODataControllerCountResponse> {
+        return (options?.client ?? client).requestOptions<ApiVVersionODataControllerCountResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple/$count',
@@ -83,7 +83,7 @@ export class ApiService {
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceRequests {
     public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/simple',
@@ -92,7 +92,7 @@ export class SimpleServiceRequests {
     }
     
     public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple',
@@ -101,7 +101,7 @@ export class SimpleServiceRequests {
     }
     
     public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'HEAD',
             url: '/api/v{api-version}/simple',
@@ -110,7 +110,7 @@ export class SimpleServiceRequests {
     }
     
     public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'OPTIONS',
             url: '/api/v{api-version}/simple',
@@ -119,7 +119,7 @@ export class SimpleServiceRequests {
     }
     
     public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PATCH',
             url: '/api/v{api-version}/simple',
@@ -128,7 +128,7 @@ export class SimpleServiceRequests {
     }
     
     public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/simple',
@@ -137,7 +137,7 @@ export class SimpleServiceRequests {
     }
     
     public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/simple',
@@ -154,7 +154,7 @@ export class SimpleServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceRequests {
     public deleteFoo<ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
@@ -163,7 +163,7 @@ export class ParametersServiceRequests {
     }
     
     public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/{parameterPath}',
@@ -172,7 +172,7 @@ export class ParametersServiceRequests {
     }
     
     public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
@@ -181,7 +181,7 @@ export class ParametersServiceRequests {
     }
     
     public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/parameters',
@@ -189,8 +189,8 @@ export class ParametersServiceRequests {
         });
     }
     
-    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<PostCallWithOptionalParamResponse> {
+        return (options?.client ?? client).requestOptions<PostCallWithOptionalParamResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters',
@@ -202,7 +202,7 @@ export class ParametersServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceRequests {
     public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/descriptions',
@@ -217,7 +217,7 @@ export class DeprecatedServiceRequests {
      * @deprecated
      */
     public deprecatedCall<ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/deprecated',
@@ -229,7 +229,7 @@ export class DeprecatedServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class RequestBodyServiceRequests {
     public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/requestBody',
@@ -241,7 +241,7 @@ export class RequestBodyServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class FormDataServiceRequests {
     public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/formData',
@@ -253,7 +253,7 @@ export class FormDataServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceRequests {
     public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/defaults',
@@ -262,7 +262,7 @@ export class DefaultsServiceRequests {
     }
     
     public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/defaults',
@@ -271,7 +271,7 @@ export class DefaultsServiceRequests {
     }
     
     public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/defaults',
@@ -283,7 +283,7 @@ export class DefaultsServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceRequests {
     public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/duplicate',
@@ -292,7 +292,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/duplicate',
@@ -301,7 +301,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/duplicate',
@@ -310,7 +310,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/duplicate',
@@ -321,8 +321,8 @@ export class DuplicateServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<CallWithNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/no-content',
@@ -330,8 +330,8 @@ export class NoContentServiceRequests {
         });
     }
     
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<CallWithResponseAndNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseAndNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/response-and-no-content',
@@ -342,8 +342,8 @@ export class NoContentServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceRequests {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<CallWithResponseAndNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseAndNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/response-and-no-content',
@@ -351,8 +351,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<CallWithResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/response',
@@ -360,8 +360,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<CallWithDuplicateResponsesResponse> {
+        return (options?.client ?? client).requestOptions<CallWithDuplicateResponsesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/response',
@@ -369,8 +369,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<CallWithResponsesResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponsesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/response',
@@ -381,8 +381,8 @@ export class ResponseServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<DummyAResponse> {
+        return (options?.client ?? client).requestOptions<DummyAResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/a',
@@ -390,8 +390,8 @@ export class MultipleTags1ServiceRequests {
         });
     }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<DummyBResponse> {
+        return (options?.client ?? client).requestOptions<DummyBResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -402,8 +402,8 @@ export class MultipleTags1ServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<DummyAResponse> {
+        return (options?.client ?? client).requestOptions<DummyAResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/a',
@@ -411,8 +411,8 @@ export class MultipleTags2ServiceRequests {
         });
     }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<DummyBResponse> {
+        return (options?.client ?? client).requestOptions<DummyBResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -423,8 +423,8 @@ export class MultipleTags2ServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceRequests {
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<DummyBResponse> {
+        return (options?.client ?? client).requestOptions<DummyBResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -436,7 +436,7 @@ export class MultipleTags3ServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceRequests {
     public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/collectionFormat',
@@ -447,8 +447,8 @@ export class CollectionFormatServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceRequests {
-    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<TypesResponse> {
+        return (options?.client ?? client).requestOptions<TypesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/types',
@@ -459,8 +459,8 @@ export class TypesServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class UploadServiceRequests {
-    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<UploadFileResponse> {
+        return (options?.client ?? client).requestOptions<UploadFileResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/upload',
@@ -471,8 +471,8 @@ export class UploadServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class FileResponseServiceRequests {
-    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<FileResponseResponse> {
+        return (options?.client ?? client).requestOptions<FileResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/file/{id}',
@@ -483,8 +483,8 @@ export class FileResponseServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceRequests {
-    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<ComplexTypesResponse> {
+        return (options?.client ?? client).requestOptions<ComplexTypesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/complex',
@@ -492,8 +492,8 @@ export class ComplexServiceRequests {
         });
     }
     
-    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<ComplexParamsResponse> {
+        return (options?.client ?? client).requestOptions<ComplexParamsResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/complex/{id}',
@@ -504,8 +504,8 @@ export class ComplexServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipartServiceRequests {
-    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<MultipartResponseResponse> {
+        return (options?.client ?? client).requestOptions<MultipartResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multipart',
@@ -514,7 +514,7 @@ export class MultipartServiceRequests {
     }
     
     public multipartRequest<ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/multipart',
@@ -526,7 +526,7 @@ export class MultipartServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceRequests {
     public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/header',
@@ -538,7 +538,7 @@ export class HeaderServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceRequests {
     public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/error',
@@ -549,8 +549,8 @@ export class ErrorServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<NonAsciiæøåÆøÅöôêÊ字符串Response> {
+        return (options?.client ?? client).requestOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
@@ -562,7 +562,7 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
      * Login User
      */
     public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default-class/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.0.x/plugins/@angular/common/default/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-false/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-number/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-strict/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/base-url-string/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/clean-false/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/default/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts
index 558d5079c..8b5a30288 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/types.gen.ts
index 20c4ef23f..eb61e3389 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/import-file-extension-ts/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-optional/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/types.gen.ts
index 7fa18d06e..c8e693fc9 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/sdk-client-required/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts
index 95a241f34..50f8d3e6a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/types.gen.ts
index 882bba0ae..19fdbd53f 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-node16-sdk/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts
index 95a241f34..50f8d3e6a 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/types.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/types.gen.ts
index 882bba0ae..19fdbd53f 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/types.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/clients/@hey-api/client-angular/tsconfig-nodenext-sdk/client/types.gen.ts
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts
index ae2a5963b..f16759283 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/@angular/common.gen.ts
@@ -10,7 +10,7 @@ import type { ApiVVersionODataControllerCountData, ApiVVersionODataControllerCou
 @Injectable({ providedIn: 'root' })
 export class DefaultServiceRequests {
     public export<ThrowOnError extends boolean = false>(options?: Options<ExportData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/no+tag',
@@ -19,7 +19,7 @@ export class DefaultServiceRequests {
     }
     
     public patchApiVbyApiVersionNoTag<ThrowOnError extends boolean = false>(options?: Options<PatchApiVbyApiVersionNoTagData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PATCH',
             url: '/api/v{api-version}/no+tag',
@@ -27,8 +27,8 @@ export class DefaultServiceRequests {
         });
     }
     
-    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public import<ThrowOnError extends boolean = false>(options: Options<ImportData, ThrowOnError>): HttpRequest<ImportResponse> {
+        return (options?.client ?? client).requestOptions<ImportResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/no+tag',
@@ -37,7 +37,7 @@ export class DefaultServiceRequests {
     }
     
     public fooWow<ThrowOnError extends boolean = false>(options?: Options<FooWowData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/no+tag',
@@ -45,8 +45,8 @@ export class DefaultServiceRequests {
         });
     }
     
-    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public getApiVbyApiVersionSimpleOperation<ThrowOnError extends boolean = false>(options: Options<GetApiVbyApiVersionSimpleOperationData, ThrowOnError>): HttpRequest<GetApiVbyApiVersionSimpleOperationResponse> {
+        return (options?.client ?? client).requestOptions<GetApiVbyApiVersionSimpleOperationResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple:operation',
@@ -56,8 +56,8 @@ export class DefaultServiceRequests {
 }
 
 export class ODataControllerService {
-    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public count<ThrowOnError extends boolean = false>(options?: Options<ApiVVersionODataControllerCountData, ThrowOnError>): HttpRequest<ApiVVersionODataControllerCountResponse> {
+        return (options?.client ?? client).requestOptions<ApiVVersionODataControllerCountResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple/$count',
@@ -83,7 +83,7 @@ export class ApiService {
 @Injectable({ providedIn: 'root' })
 export class SimpleServiceRequests {
     public deleteCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<DeleteCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/simple',
@@ -92,7 +92,7 @@ export class SimpleServiceRequests {
     }
     
     public getCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<GetCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/simple',
@@ -101,7 +101,7 @@ export class SimpleServiceRequests {
     }
     
     public headCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<HeadCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'HEAD',
             url: '/api/v{api-version}/simple',
@@ -110,7 +110,7 @@ export class SimpleServiceRequests {
     }
     
     public optionsCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<OptionsCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'OPTIONS',
             url: '/api/v{api-version}/simple',
@@ -119,7 +119,7 @@ export class SimpleServiceRequests {
     }
     
     public patchCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PatchCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PATCH',
             url: '/api/v{api-version}/simple',
@@ -128,7 +128,7 @@ export class SimpleServiceRequests {
     }
     
     public postCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PostCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/simple',
@@ -137,7 +137,7 @@ export class SimpleServiceRequests {
     }
     
     public putCallWithoutParametersAndResponse<ThrowOnError extends boolean = false>(options?: Options<PutCallWithoutParametersAndResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/simple',
@@ -154,7 +154,7 @@ export class SimpleServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class ParametersServiceRequests {
     public deleteFoo<ThrowOnError extends boolean = false>(options: Options<DeleteFooData3, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/foo/{foo_param}/bar/{BarParam}',
@@ -163,7 +163,7 @@ export class ParametersServiceRequests {
     }
     
     public callWithParameters<ThrowOnError extends boolean = false>(options: Options<CallWithParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/{parameterPath}',
@@ -172,7 +172,7 @@ export class ParametersServiceRequests {
     }
     
     public callWithWeirdParameterNames<ThrowOnError extends boolean = false>(options: Options<CallWithWeirdParameterNamesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/{parameter.path.1}/{parameter-path-2}/{PARAMETER-PATH-3}',
@@ -181,7 +181,7 @@ export class ParametersServiceRequests {
     }
     
     public getCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<GetCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/parameters',
@@ -189,8 +189,8 @@ export class ParametersServiceRequests {
         });
     }
     
-    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public postCallWithOptionalParam<ThrowOnError extends boolean = false>(options: Options<PostCallWithOptionalParamData, ThrowOnError>): HttpRequest<PostCallWithOptionalParamResponse> {
+        return (options?.client ?? client).requestOptions<PostCallWithOptionalParamResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters',
@@ -202,7 +202,7 @@ export class ParametersServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DescriptionsServiceRequests {
     public callWithDescriptions<ThrowOnError extends boolean = false>(options?: Options<CallWithDescriptionsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/descriptions',
@@ -217,7 +217,7 @@ export class DeprecatedServiceRequests {
      * @deprecated
      */
     public deprecatedCall<ThrowOnError extends boolean = false>(options: Options<DeprecatedCallData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/parameters/deprecated',
@@ -229,7 +229,7 @@ export class DeprecatedServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class RequestBodyServiceRequests {
     public postApiVbyApiVersionRequestBody<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionRequestBodyData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/requestBody',
@@ -241,7 +241,7 @@ export class RequestBodyServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class FormDataServiceRequests {
     public postApiVbyApiVersionFormData<ThrowOnError extends boolean = false>(options?: Options<PostApiVbyApiVersionFormDataData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/formData',
@@ -253,7 +253,7 @@ export class FormDataServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DefaultsServiceRequests {
     public callWithDefaultParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/defaults',
@@ -262,7 +262,7 @@ export class DefaultsServiceRequests {
     }
     
     public callWithDefaultOptionalParameters<ThrowOnError extends boolean = false>(options?: Options<CallWithDefaultOptionalParametersData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/defaults',
@@ -271,7 +271,7 @@ export class DefaultsServiceRequests {
     }
     
     public callToTestOrderOfParams<ThrowOnError extends boolean = false>(options: Options<CallToTestOrderOfParamsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/defaults',
@@ -283,7 +283,7 @@ export class DefaultsServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class DuplicateServiceRequests {
     public duplicateName<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/duplicate',
@@ -292,7 +292,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName2<ThrowOnError extends boolean = false>(options?: Options<DuplicateNameData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'DELETE',
             url: '/api/v{api-version}/duplicate',
@@ -301,7 +301,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName22<ThrowOnError extends boolean = false>(options?: Options<DuplicateName2Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/duplicate',
@@ -310,7 +310,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName3<ThrowOnError extends boolean = false>(options?: Options<DuplicateName3Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/duplicate',
@@ -319,7 +319,7 @@ export class DuplicateServiceRequests {
     }
     
     public duplicateName4<ThrowOnError extends boolean = false>(options?: Options<DuplicateName4Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/duplicate',
@@ -330,8 +330,8 @@ export class DuplicateServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests {
-    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithNoContentResponseData, ThrowOnError>): HttpRequest<CallWithNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/no-content',
@@ -342,8 +342,8 @@ export class NoContentServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class ResponseServiceRequests {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<CallWithResponseAndNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseAndNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/response-and-no-content',
@@ -351,8 +351,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseData, ThrowOnError>): HttpRequest<CallWithResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/response',
@@ -360,8 +360,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithDuplicateResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithDuplicateResponsesData, ThrowOnError>): HttpRequest<CallWithDuplicateResponsesResponse> {
+        return (options?.client ?? client).requestOptions<CallWithDuplicateResponsesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/response',
@@ -369,8 +369,8 @@ export class ResponseServiceRequests {
         });
     }
     
-    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponses<ThrowOnError extends boolean = false>(options?: Options<CallWithResponsesData, ThrowOnError>): HttpRequest<CallWithResponsesResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponsesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/response',
@@ -381,8 +381,8 @@ export class ResponseServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class NoContentServiceRequests2 {
-    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public callWithResponseAndNoContentResponse<ThrowOnError extends boolean = false>(options?: Options<CallWithResponseAndNoContentResponseData, ThrowOnError>): HttpRequest<CallWithResponseAndNoContentResponseResponse> {
+        return (options?.client ?? client).requestOptions<CallWithResponseAndNoContentResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/response-and-no-content',
@@ -393,8 +393,8 @@ export class NoContentServiceRequests2 {
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags1ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<DummyAResponse> {
+        return (options?.client ?? client).requestOptions<DummyAResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/a',
@@ -402,8 +402,8 @@ export class MultipleTags1ServiceRequests {
         });
     }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<DummyBResponse> {
+        return (options?.client ?? client).requestOptions<DummyBResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -414,8 +414,8 @@ export class MultipleTags1ServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags2ServiceRequests {
-    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyA<ThrowOnError extends boolean = false>(options?: Options<DummyAData, ThrowOnError>): HttpRequest<DummyAResponse> {
+        return (options?.client ?? client).requestOptions<DummyAResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/a',
@@ -423,8 +423,8 @@ export class MultipleTags2ServiceRequests {
         });
     }
     
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<DummyBResponse> {
+        return (options?.client ?? client).requestOptions<DummyBResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -435,8 +435,8 @@ export class MultipleTags2ServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipleTags3ServiceRequests {
-    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public dummyB<ThrowOnError extends boolean = false>(options?: Options<DummyBData, ThrowOnError>): HttpRequest<DummyBResponse> {
+        return (options?.client ?? client).requestOptions<DummyBResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multiple-tags/b',
@@ -448,7 +448,7 @@ export class MultipleTags3ServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class CollectionFormatServiceRequests {
     public collectionFormat<ThrowOnError extends boolean = false>(options: Options<CollectionFormatData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/collectionFormat',
@@ -459,8 +459,8 @@ export class CollectionFormatServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class TypesServiceRequests {
-    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public types<ThrowOnError extends boolean = false>(options: Options<TypesData, ThrowOnError>): HttpRequest<TypesResponse> {
+        return (options?.client ?? client).requestOptions<TypesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/types',
@@ -471,8 +471,8 @@ export class TypesServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class UploadServiceRequests {
-    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public uploadFile<ThrowOnError extends boolean = false>(options: Options<UploadFileData, ThrowOnError>): HttpRequest<UploadFileResponse> {
+        return (options?.client ?? client).requestOptions<UploadFileResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/upload',
@@ -483,8 +483,8 @@ export class UploadServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class FileResponseServiceRequests {
-    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public fileResponse<ThrowOnError extends boolean = false>(options: Options<FileResponseData, ThrowOnError>): HttpRequest<FileResponseResponse> {
+        return (options?.client ?? client).requestOptions<FileResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/file/{id}',
@@ -495,8 +495,8 @@ export class FileResponseServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class ComplexServiceRequests {
-    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public complexTypes<ThrowOnError extends boolean = false>(options: Options<ComplexTypesData, ThrowOnError>): HttpRequest<ComplexTypesResponse> {
+        return (options?.client ?? client).requestOptions<ComplexTypesResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/complex',
@@ -504,8 +504,8 @@ export class ComplexServiceRequests {
         });
     }
     
-    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public complexParams<ThrowOnError extends boolean = false>(options: Options<ComplexParamsData, ThrowOnError>): HttpRequest<ComplexParamsResponse> {
+        return (options?.client ?? client).requestOptions<ComplexParamsResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/complex/{id}',
@@ -516,8 +516,8 @@ export class ComplexServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class MultipartServiceRequests {
-    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public multipartResponse<ThrowOnError extends boolean = false>(options?: Options<MultipartResponseData, ThrowOnError>): HttpRequest<MultipartResponseResponse> {
+        return (options?.client ?? client).requestOptions<MultipartResponseResponse, ThrowOnError>({
             responseStyle: 'data',
             method: 'GET',
             url: '/api/v{api-version}/multipart',
@@ -526,7 +526,7 @@ export class MultipartServiceRequests {
     }
     
     public multipartRequest<ThrowOnError extends boolean = false>(options?: Options<MultipartRequestData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/multipart',
@@ -538,7 +538,7 @@ export class MultipartServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class HeaderServiceRequests {
     public callWithResultFromHeader<ThrowOnError extends boolean = false>(options?: Options<CallWithResultFromHeaderData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/header',
@@ -550,7 +550,7 @@ export class HeaderServiceRequests {
 @Injectable({ providedIn: 'root' })
 export class ErrorServiceRequests {
     public testErrorCode<ThrowOnError extends boolean = false>(options: Options<TestErrorCodeData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/error',
@@ -561,8 +561,8 @@ export class ErrorServiceRequests {
 
 @Injectable({ providedIn: 'root' })
 export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
-    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+    public nonAsciiæøåÆøÅöôêÊ字符串<ThrowOnError extends boolean = false>(options: Options<NonAsciiæøåÆøÅöôêÊ字符串Data, ThrowOnError>): HttpRequest<NonAsciiæøåÆøÅöôêÊ字符串Response> {
+        return (options?.client ?? client).requestOptions<NonAsciiæøåÆøÅöôêÊ字符串Response, ThrowOnError>({
             responseStyle: 'data',
             method: 'POST',
             url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
@@ -574,7 +574,7 @@ export class NonAsciiÆøåÆøÅöôêÊServiceRequests {
      * Login User
      */
     public putWithFormUrlEncoded<ThrowOnError extends boolean = false>(options: Options<PutWithFormUrlEncodedData, ThrowOnError>): HttpRequest<unknown> {
-        return (options?.client ?? client).requestOptions({
+        return (options?.client ?? client).requestOptions<unknown, ThrowOnError>({
             responseStyle: 'data',
             method: 'PUT',
             url: '/api/v{api-version}/non-ascii-æøåÆØÅöôêÊ字符串',
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default-class/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/plugins/@angular/common/default/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
diff --git a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts
index b38335c7e..c94b142cb 100644
--- a/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts
+++ b/packages/openapi-ts-tests/main/test/__snapshots__/3.1.x/sse-angular/client/client.gen.ts
@@ -55,10 +55,11 @@ export const createClient = (config: Config = {}): Client => {
   >();
 
   const requestOptions = <
+    TData = unknown,
     ThrowOnError extends boolean = false,
     TResponseStyle extends ResponseStyle = 'fields',
   >(
-    options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
+    options: RequestOptions<TData, TResponseStyle, ThrowOnError>,
   ) => {
     const opts = {
       ..._config,
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 7fa18d06e..c8e693fc9 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
@@ -172,11 +172,12 @@ type RequestFn = <
 ) => RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
 
 type RequestOptionsFn = <
+  T,
   ThrowOnError extends boolean = false,
   TResponseStyle extends ResponseStyle = 'fields',
 >(
-  options: RequestOptions<unknown, TResponseStyle, ThrowOnError>,
-) => HttpRequest<unknown>;
+  options: RequestOptions<T, TResponseStyle, ThrowOnError>,
+) => HttpRequest<T>;
 
 type BuildUrlFn = <
   TData extends {
-- 
2.51.2


From ad9061df733b61190f3f2ddb9d74873c09bf4204 Mon Sep 17 00:00:00 2001
From: Nikita Perepelitsa <nikitaperepel@gmail.com>
Date: Thu, 12 Feb 2026 01:01:23 +0100
Subject: [PATCH 6/7] dev: add test

---
 .../openapi-ts/src/__tests__/index.test.ts    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/packages/openapi-ts/src/__tests__/index.test.ts b/packages/openapi-ts/src/__tests__/index.test.ts
index ccde3fb1f..18a386ded 100644
--- a/packages/openapi-ts/src/__tests__/index.test.ts
+++ b/packages/openapi-ts/src/__tests__/index.test.ts
@@ -285,4 +285,44 @@ describe('createClient', () => {
     const results = await createClient(config);
     expect(results).toHaveLength(4);
   });
+
+  it('executes @angular/common HttpRequest builder path', async () => {
+    const results = await createClient({
+      dryRun: true,
+      input: {
+        info: { title: 'angular-common-test', version: '1.0.0' },
+        openapi: '3.1.0',
+        paths: {
+          '/pets': {
+            get: {
+              operationId: 'listPets',
+              responses: {
+                200: {
+                  content: {
+                    'application/json': {
+                      schema: {
+                        items: { type: 'string' },
+                        type: 'array',
+                      },
+                    },
+                  },
+                  description: 'ok',
+                },
+              },
+            },
+          },
+        },
+      },
+      logs: { level: 'silent' },
+      output: 'out',
+      plugins: [
+        '@hey-api/typescript',
+        '@hey-api/sdk',
+        '@angular/common',
+        '@hey-api/client-angular',
+      ],
+    });
+
+    expect(results.length).toBeGreaterThanOrEqual(1);
+  });
 });
-- 
2.51.2


From a94f50fef84f2387b9ca686ff47370030007e7a2 Mon Sep 17 00:00:00 2001
From: Lubos <lubos@heyapi.dev>
Date: Fri, 13 Feb 2026 07:32:54 +0800
Subject: [PATCH 7/7] Update changeset for generics in HttpRequests

---
 .changeset/rude-wolves-pump.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/rude-wolves-pump.md

diff --git a/.changeset/rude-wolves-pump.md b/.changeset/rude-wolves-pump.md
new file mode 100644
index 000000000..66695048d
--- /dev/null
+++ b/.changeset/rude-wolves-pump.md
@@ -0,0 +1,5 @@
+---
+"@hey-api/openapi-ts": patch
+---
+
+**plugin(@angular/common)**: use generics for HttpRequests