typed-openapi 2.0.1 → 2.1.0

package/dist/{chunk-4EZJSCLI.js → chunk-I2PUFY2J.js}

@@ -503,12 +503,6 @@ var generateEndpointSchemaList = (ctx) => {
       ctx
     )},` : ""}
           }` : "parameters: never,"}
-      response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
-      if (Box.isReference(box) && !box.params.generics && box.value !== "null") {
-        box.value = `Schemas.${box.value}`;
-      }
-      return box;
-    }).value : endpoint.response.value},
       ${endpoint.responses ? `responses: ${generateResponsesObject(endpoint.responses, ctx)},` : ""}
       ${endpoint.responseHeaders ? `responseHeaders: ${responseHeadersObjectToString(endpoint.responseHeaders, ctx)},` : ""}
     }
@@ -567,7 +561,6 @@ type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 
 export type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
-  response: unknown;
   responses?: Record<string, unknown>;
   responseHeaders?: Record<string, unknown>;
 };
@@ -583,7 +576,6 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     hasParameters: boolean;
     areParametersRequired: boolean;
   };
-  response: TConfig["response"];
   responses?: TConfig["responses"];
   responseHeaders?: TConfig["responseHeaders"]
 };
@@ -596,49 +588,63 @@ export type SuccessStatusCode = typeof successStatusCodes[number];
 export const errorStatusCodes = [${ctx.errorStatusCodes.join(",")}] as const;
 export type ErrorStatusCode = typeof errorStatusCodes[number];
 
-// Error handling types
+// Taken from https://github.com/unjs/fetchdts/blob/ec4eaeab5d287116171fc1efd61f4a1ad34e4609/src/fetch.ts#L3
+export interface TypedHeaders<TypedHeaderValues extends Record<string, string> | unknown> extends Omit<Headers, 'append' | 'delete' | 'get' | 'getSetCookie' | 'has' | 'set' | 'forEach'> {
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/append) */
+  append: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name, value: Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string) => void
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/delete) */
+  delete: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name) => void
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/get) */
+  get: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name) => (Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string) | null
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/getSetCookie) */
+  getSetCookie: () => string[]
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/has) */
+  has: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name) => boolean
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/set) */
+  set: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name, value: Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string) => void
+  forEach: (callbackfn: (value: TypedHeaderValues[keyof TypedHeaderValues] | string & {}, key: Extract<keyof TypedHeaderValues, string> | string & {}, parent: TypedHeaders<TypedHeaderValues>) => void, thisArg?: any) => void
+}
+
 /** @see https://developer.mozilla.org/en-US/docs/Web/API/Response */
-interface SuccessResponse<TSuccess, TStatusCode> extends Omit<Response, "ok" | "status" | "json"> {
+export interface TypedSuccessResponse<TSuccess, TStatusCode, THeaders> extends Omit<Response, "ok" | "status" | "json" | "headers"> {
   ok: true;
   status: TStatusCode;
+  headers: never extends THeaders ? Headers :  TypedHeaders<THeaders>;
   data: TSuccess;
   /** [MDN Reference](https://developer.mozilla.org/en-US/docs/Web/API/Response/json) */
   json: () => Promise<TSuccess>;
 }
 
 /** @see https://developer.mozilla.org/en-US/docs/Web/API/Response */
-interface ErrorResponse<TData, TStatusCode> extends Omit<Response, "ok" | "status" | "json"> {
+export interface TypedErrorResponse<TData, TStatusCode, THeaders> extends Omit<Response, "ok" | "status" | "json" | "headers"> {
   ok: false;
   status: TStatusCode;
+  headers: never extends THeaders ? Headers :  TypedHeaders<THeaders>;
   data: TData;
   /** [MDN Reference](https://developer.mozilla.org/en-US/docs/Web/API/Response/json) */
   json: () => Promise<TData>;
 }
 
-export type TypedApiResponse<TSuccess, TAllResponses extends Record<string | number, unknown> = {}> =
-  (keyof TAllResponses extends never
-    ? SuccessResponse<TSuccess, number>
-    : {
-        [K in keyof TAllResponses]: K extends string
-          ? K extends \`\${infer TStatusCode extends number}\`
-            ? TStatusCode extends SuccessStatusCode
-              ? SuccessResponse<TSuccess, TStatusCode>
-              : ErrorResponse<TAllResponses[K], TStatusCode>
-            : never
-          : K extends number
-            ? K extends SuccessStatusCode
-              ? SuccessResponse<TSuccess, K>
-              : ErrorResponse<TAllResponses[K], K>
-            : never;
-      }[keyof TAllResponses]);
+export type TypedApiResponse<TAllResponses extends Record<string | number, unknown> = {}, THeaders = {}> =
+  ({
+    [K in keyof TAllResponses]: K extends string
+      ? K extends \`\${infer TStatusCode extends number}\`
+        ? TStatusCode extends SuccessStatusCode
+          ? TypedSuccessResponse<TAllResponses[K], TStatusCode, K extends keyof THeaders ? THeaders[K] : never>
+          : TypedErrorResponse<TAllResponses[K], TStatusCode, K extends keyof THeaders ? THeaders[K] : never>
+        : never
+      : K extends number
+        ? K extends SuccessStatusCode
+          ? TypedSuccessResponse<TAllResponses[K], K, K extends keyof THeaders ? THeaders[K] : never>
+          : TypedErrorResponse<TAllResponses[K], K, K extends keyof THeaders ? THeaders[K] : never>
+        : never;
+  }[keyof TAllResponses]);
 
-export type SafeApiResponse<TEndpoint> = TEndpoint extends { response: infer TSuccess; responses: infer TResponses }
+export type SafeApiResponse<TEndpoint> = TEndpoint extends { responses: infer TResponses }
   ? TResponses extends Record<string, unknown>
-    ? TypedApiResponse<TSuccess, TResponses>
-    : SuccessResponse<TSuccess, number>
-  : TEndpoint extends { response: infer TSuccess }
-    ? SuccessResponse<TSuccess, number>
-    : never;
+    ? TypedApiResponse<TResponses, TEndpoint extends { responseHeaders: infer THeaders } ? THeaders : never>
+    : never
+  : never
 
 export type InferResponseByStatus<TEndpoint, TStatusCode> = Extract<SafeApiResponse<TEndpoint>, { status: TStatusCode }>
 
@@ -653,9 +659,9 @@ type MaybeOptionalArg<T> = RequiredKeys<T> extends never ? [config?: T] : [confi
   const apiClient = `
 // <TypedResponseError>
 export class TypedResponseError extends Error {
-  response: ErrorResponse<unknown, ErrorStatusCode>;
+  response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>;
   status: number;
-  constructor(response: ErrorResponse<unknown, ErrorStatusCode>) {
+  constructor(response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>) {
     super(\`HTTP \${response.status}: \${response.statusText}\`);
     this.name = 'TypedResponseError';
     this.response = response;
@@ -691,7 +697,13 @@ export class ApiClient {
     ${method}<Path extends keyof ${capitalizedMethod}Endpoints, TEndpoint extends ${capitalizedMethod}Endpoints[Path]>(
       path: Path,
       ...params: MaybeOptionalArg<${match(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["parameters"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["parameters"]`).otherwise(() => `TEndpoint["parameters"]`)} & { withResponse?: false; throwOnStatusError?: boolean }>
-    ): Promise<${match(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["response"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`).otherwise(() => `TEndpoint["response"]`)}>;
+    ): Promise<${match(ctx.runtime).with("zod", "yup", () => infer(`InferResponseByStatus<TEndpoint, SuccessStatusCode>`)).with(
+      "arktype",
+      "io-ts",
+      "typebox",
+      "valibot",
+      () => `InferResponseByStatus<${infer(`TEndpoint`)}, SuccessStatusCode>["data"]`
+    ).otherwise(() => `InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"]`)}>;
 
     ${method}<Path extends keyof ${capitalizedMethod}Endpoints, TEndpoint extends ${capitalizedMethod}Endpoints[Path]>(
       path: Path,
@@ -721,7 +733,13 @@ export class ApiClient {
           return withResponse ? typedResponse : data;
         });
 
-        return promise ${match(ctx.runtime).with("zod", "yup", () => `as Promise<${infer(`TEndpoint["response"]`)}>`).with("arktype", "io-ts", "typebox", "valibot", () => `as Promise<${infer(`TEndpoint`) + `["response"]`}>`).otherwise(() => `as Promise<TEndpoint["response"]>`)}
+        return promise ${match(ctx.runtime).with("zod", "yup", () => `as Promise<${infer(`InferResponseByStatus<TEndpoint, SuccessStatusCode>`)}>`).with(
+      "arktype",
+      "io-ts",
+      "typebox",
+      "valibot",
+      () => `as Promise<InferResponseByStatus<${infer(`TEndpoint`)}, SuccessStatusCode>["data"]>`
+    ).otherwise(() => `as Promise<InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"]>`)}
     }
     // </ApiClient.${method}>
     ` : "";
@@ -1082,7 +1100,6 @@ var mapOpenApiEndpoints = (doc, options) => {
         method,
         path,
         requestFormat: "json",
-        response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
           alias,
           areParametersRequired: false,
@@ -1124,11 +1141,11 @@ var mapOpenApiEndpoints = (doc, options) => {
       if (operation.requestBody) {
         endpoint.meta.hasParameters = true;
         const requestBody = refs.unwrap(operation.requestBody ?? {});
-        const content2 = requestBody.content;
-        const matchingMediaType = Object.keys(content2).find(isAllowedParamMediaTypes);
-        if (matchingMediaType && content2[matchingMediaType]) {
+        const content = requestBody.content;
+        const matchingMediaType = Object.keys(content).find(isAllowedParamMediaTypes);
+        if (matchingMediaType && content[matchingMediaType]) {
           params.body = openApiSchemaToTs({
-            schema: content2[matchingMediaType]?.schema ?? {},
+            schema: content[matchingMediaType]?.schema ?? {},
             ctx
           });
         }
@@ -1159,67 +1176,64 @@ var mapOpenApiEndpoints = (doc, options) => {
         }
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
-      let responseObject;
       const allResponses = {};
+      const allHeaders = {};
       Object.entries(operation.responses ?? {}).map(([status, responseOrRef]) => {
-        const statusCode = Number(status);
         const responseObj = refs.unwrap(responseOrRef);
-        const content2 = responseObj?.content;
-        if (content2) {
-          const matchingMediaType = Object.keys(content2).find(isResponseMediaType);
-          if (matchingMediaType && content2[matchingMediaType]) {
-            allResponses[status] = openApiSchemaToTs({
-              schema: content2[matchingMediaType]?.schema ?? {},
-              ctx
-            });
+        const content = responseObj?.content;
+        const mediaTypes = Object.keys(content ?? {}).filter(isResponseMediaType);
+        if (content && mediaTypes.length) {
+          mediaTypes.forEach((mediaType) => {
+            const schema = content[mediaType] ? content[mediaType].schema ?? {} : {};
+            const t2 = createBoxFactory(schema, ctx);
+            const mediaTypeResponse = openApiSchemaToTs({ schema, ctx });
+            if (allResponses[status]) {
+              allResponses[status] = t2.union([
+                ...Array.isArray(allResponses[status]) ? allResponses[status] : [allResponses[status]],
+                mediaTypeResponse
+              ]);
+            } else {
+              allResponses[status] = mediaTypeResponse;
+            }
+          });
+        } else {
+          const schema = {};
+          const unknown = openApiSchemaToTs({ schema: {}, ctx });
+          const t2 = createBoxFactory(schema, ctx);
+          if (allResponses[status]) {
+            allResponses[status] = t2.union([
+              ...Array.isArray(allResponses[status]) ? allResponses[status] : [allResponses[status]],
+              unknown
+            ]);
           } else {
-            allResponses[status] = openApiSchemaToTs({ schema: {}, ctx });
+            allResponses[status] = unknown;
           }
-        } else {
-          allResponses[status] = openApiSchemaToTs({ schema: {}, ctx });
         }
-        if (statusCode >= 200 && statusCode < 300 && !responseObject) {
-          responseObject = responseObj;
-        }
-      });
-      if (!responseObject && operation.responses?.default) {
-        responseObject = refs.unwrap(operation.responses.default);
-        if (!allResponses["default"]) {
-          const content2 = responseObject?.content;
-          if (content2) {
-            const matchingMediaType = Object.keys(content2).find(isResponseMediaType);
-            if (matchingMediaType && content2[matchingMediaType]) {
-              allResponses["default"] = openApiSchemaToTs({
-                schema: content2[matchingMediaType]?.schema ?? {},
-                ctx
-              });
-            }
+        const headers = responseObj?.headers;
+        const t = createBoxFactory(
+          { type: "object", properties: headers ?? {}, required: Object.keys(headers ?? {}) },
+          ctx
+        );
+        if (headers) {
+          const mappedHeaders = Object.entries(headers).reduce(
+            (acc, [name, headerOrRef]) => {
+              const header = refs.unwrap(headerOrRef);
+              const box = openApiSchemaToTs({ schema: header.schema ?? {}, ctx });
+              acc[name] = box;
+              return acc;
+            },
+            {}
+          );
+          if (Object.keys(mappedHeaders).length) {
+            allHeaders[status] = t.object(mappedHeaders);
           }
         }
-      }
+      });
       if (Object.keys(allResponses).length > 0) {
         endpoint.responses = allResponses;
       }
-      const content = responseObject?.content;
-      if (content) {
-        const matchingMediaType = Object.keys(content).find(isResponseMediaType);
-        if (matchingMediaType && content[matchingMediaType]) {
-          endpoint.response = openApiSchemaToTs({
-            schema: content[matchingMediaType]?.schema ?? {},
-            ctx
-          });
-        }
-      }
-      const headers = responseObject?.headers;
-      if (headers) {
-        endpoint.responseHeaders = Object.entries(headers).reduce(
-          (acc, [name, headerOrRef]) => {
-            const header = refs.unwrap(headerOrRef);
-            acc[name] = openApiSchemaToTs({ schema: header.schema ?? {}, ctx });
-            return acc;
-          },
-          {}
-        );
+      if (Object.keys(allHeaders).length) {
+        endpoint.responseHeaders = allHeaders;
       }
       endpointList.push(endpoint);
     });
@@ -1233,7 +1247,7 @@ var allowedParamMediaTypes = [
   "*/*"
 ];
 var isAllowedParamMediaTypes = (mediaType) => mediaType.includes("application/") && mediaType.includes("json") || allowedParamMediaTypes.includes(mediaType) || mediaType.includes("text/");
-var isResponseMediaType = (mediaType) => mediaType === "application/json" || mediaType === "*/*";
+var isResponseMediaType = (mediaType) => mediaType === "*/*" || mediaType.includes("application/") && mediaType.includes("json");
 var getAlias = ({ path, method, operation }) => sanitizeName(
   (method + "_" + capitalize3(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__"),
   "endpoint"
@@ -1325,7 +1339,7 @@ var generateTanstackQueryFile = async (ctx) => {
                             withResponse: false as const
                         };
                         const res = await this.client.${method}(path, requestParams);
-                        return res as TEndpoint["response"];
+                        return res as InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"];
                     },
                     queryKey: queryKey
                 }),
@@ -1340,7 +1354,7 @@ var generateTanstackQueryFile = async (ctx) => {
                             withResponse: false as const
                         };
                         const res = await this.client.${method}(path, requestParams);
-                        return res as TEndpoint["response"];
+                        return res as InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"];
                     }
                 }
             };

package/dist/{chunk-GD55PFNE.js → chunk-J2KG2QH2.js}

@@ -5,7 +5,7 @@ import {
   generateFile,
   generateTanstackQueryFile,
   mapOpenApiEndpoints
-} from "./chunk-4EZJSCLI.js";
+} from "./chunk-I2PUFY2J.js";
 import {
   prettify
 } from "./chunk-KAEXXJ7X.js";

package/dist/cli.js

@@ -1,9 +1,9 @@
 import {
   generateClientFiles
-} from "./chunk-GD55PFNE.js";
+} from "./chunk-J2KG2QH2.js";
 import {
   allowedRuntimes
-} from "./chunk-4EZJSCLI.js";
+} from "./chunk-I2PUFY2J.js";
 import "./chunk-KAEXXJ7X.js";
 
 // src/cli.ts

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { ReferenceObject } from 'openapi3-ts/oas31';
-import { S as StringOrBox, O as OpenapiSchemaConvertContext, L as LibSchemaObject, B as BoxFactory, m as mapOpenApiEndpoints, N as NameTransformOptions, a as OpenapiSchemaConvertArgs, b as Box, A as AnyBoxDef } from './types-DsI2d-HE.js';
-export { q as AnyBox, j as BoxArray, f as BoxDefinition, i as BoxIntersection, o as BoxKeyword, n as BoxLiteral, p as BoxObject, k as BoxOptional, g as BoxParams, l as BoxRef, h as BoxUnion, c as Endpoint, E as EndpointParameters, F as FactoryCreator, G as GenericFactory, M as Method, R as RefInfo, e as RefResolver, W as WithSchema, d as createRefResolver } from './types-DsI2d-HE.js';
+import { S as StringOrBox, O as OpenapiSchemaConvertContext, L as LibSchemaObject, B as BoxFactory, m as mapOpenApiEndpoints, N as NameTransformOptions, a as OpenapiSchemaConvertArgs, b as Box, A as AnyBoxDef } from './types-BOJSTQwz.js';
+export { q as AnyBox, j as BoxArray, f as BoxDefinition, i as BoxIntersection, o as BoxKeyword, n as BoxLiteral, p as BoxObject, k as BoxOptional, g as BoxParams, l as BoxRef, h as BoxUnion, c as Endpoint, E as EndpointParameters, F as FactoryCreator, G as GenericFactory, M as Method, R as RefInfo, e as RefResolver, W as WithSchema, d as createRefResolver } from './types-BOJSTQwz.js';
 import * as arktype_internal_methods_string_ts from 'arktype/internal/methods/string.ts';
 import * as Codegen from '@sinclair/typebox-codegen';
 import 'openapi3-ts/oas30';

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   openApiSchemaToTs,
   tsFactory,
   unwrap
-} from "./chunk-4EZJSCLI.js";
+} from "./chunk-I2PUFY2J.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   createBoxFactory,

package/dist/node.export.d.ts

@@ -1,5 +1,5 @@
 import * as arktype_internal_methods_object_ts from 'arktype/internal/methods/object.ts';
-import { N as NameTransformOptions } from './types-DsI2d-HE.js';
+import { N as NameTransformOptions } from './types-BOJSTQwz.js';
 import 'openapi3-ts/oas31';
 import 'openapi3-ts/oas30';
 

package/dist/node.export.js

@@ -1,7 +1,7 @@
 import {
   generateClientFiles
-} from "./chunk-GD55PFNE.js";
-import "./chunk-4EZJSCLI.js";
+} from "./chunk-J2KG2QH2.js";
+import "./chunk-I2PUFY2J.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   generateClientFiles

package/dist/{types-DsI2d-HE.d.ts → types-BOJSTQwz.d.ts}

@@ -99,9 +99,8 @@ type EndpointParameters = {
 type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 type DefaultEndpoint = {
     parameters?: EndpointParameters | undefined;
-    response: AnyBox;
     responses?: Record<string, AnyBox>;
-    responseHeaders?: Record<string, AnyBox>;
+    responseHeaders?: Record<string, Box<BoxObject>>;
 };
 type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     operation: OperationObject;
@@ -114,7 +113,6 @@ type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
         hasParameters: boolean;
         areParametersRequired: boolean;
     };
-    response: TConfig["response"];
     responses?: TConfig["responses"];
     responseHeaders?: TConfig["responseHeaders"];
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {
@@ -36,7 +36,8 @@
     "msw": "2.10.5",
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.3"
+    "vitest": "^3.1.3",
+    "zod": "3.21.4"
   },
   "files": [
     "src",

package/src/generator.ts

@@ -6,7 +6,7 @@ import * as Codegen from "@sinclair/typebox-codegen";
 import { match } from "ts-pattern";
 import { type } from "arktype";
 import { wrapWithQuotesIfNeeded } from "./string-utils.ts";
-import type { NameTransformOptions } from "./types.ts";
+import type { BoxObject, NameTransformOptions } from "./types.ts";
 
 // Default success status codes (2xx and 3xx ranges)
 export const DEFAULT_SUCCESS_STATUS_CODES = [
@@ -170,7 +170,7 @@ const parameterObjectToString = (parameters: Box<AnyBoxDef> | Record<string, Any
   return str + "}";
 };
 
-const responseHeadersObjectToString = (responseHeaders: Record<string, AnyBox>, ctx: GeneratorContext) => {
+const responseHeadersObjectToString = (responseHeaders: Record<string, Box<BoxObject>>, ctx: GeneratorContext) => {
   let str = "{";
   for (const [key, responseHeader] of Object.entries(responseHeaders)) {
     const value =
@@ -242,17 +242,6 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
           }`
           : "parameters: never,"
       }
-      response: ${
-        ctx.runtime === "none"
-          ? endpoint.response.recompute((box) => {
-              if (Box.isReference(box) && !box.params.generics && box.value !== "null") {
-                box.value = `Schemas.${box.value}`;
-              }
-
-              return box;
-            }).value
-          : endpoint.response.value
-      },
       ${endpoint.responses ? `responses: ${generateResponsesObject(endpoint.responses, ctx)},` : ""}
       ${
         endpoint.responseHeaders
@@ -331,7 +320,6 @@ type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 
 export type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
-  response: unknown;
   responses?: Record<string, unknown>;
   responseHeaders?: Record<string, unknown>;
 };
@@ -347,7 +335,6 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     hasParameters: boolean;
     areParametersRequired: boolean;
   };
-  response: TConfig["response"];
   responses?: TConfig["responses"];
   responseHeaders?: TConfig["responseHeaders"]
 };
@@ -360,49 +347,63 @@ export type SuccessStatusCode = typeof successStatusCodes[number];
 export const errorStatusCodes = [${ctx.errorStatusCodes.join(",")}] as const;
 export type ErrorStatusCode = typeof errorStatusCodes[number];
 
-// Error handling types
+// Taken from https://github.com/unjs/fetchdts/blob/ec4eaeab5d287116171fc1efd61f4a1ad34e4609/src/fetch.ts#L3
+export interface TypedHeaders<TypedHeaderValues extends Record<string, string> | unknown> extends Omit<Headers, 'append' | 'delete' | 'get' | 'getSetCookie' | 'has' | 'set' | 'forEach'> {
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/append) */
+  append: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name, value: Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string) => void
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/delete) */
+  delete: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name) => void
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/get) */
+  get: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name) => (Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string) | null
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/getSetCookie) */
+  getSetCookie: () => string[]
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/has) */
+  has: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name) => boolean
+  /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Headers/set) */
+  set: <Name extends Extract<keyof TypedHeaderValues, string> | string & {}> (name: Name, value: Lowercase<Name> extends keyof TypedHeaderValues ? TypedHeaderValues[Lowercase<Name>] : string) => void
+  forEach: (callbackfn: (value: TypedHeaderValues[keyof TypedHeaderValues] | string & {}, key: Extract<keyof TypedHeaderValues, string> | string & {}, parent: TypedHeaders<TypedHeaderValues>) => void, thisArg?: any) => void
+}
+
 /** @see https://developer.mozilla.org/en-US/docs/Web/API/Response */
-interface SuccessResponse<TSuccess, TStatusCode> extends Omit<Response, "ok" | "status" | "json"> {
+export interface TypedSuccessResponse<TSuccess, TStatusCode, THeaders> extends Omit<Response, "ok" | "status" | "json" | "headers"> {
   ok: true;
   status: TStatusCode;
+  headers: never extends THeaders ? Headers :  TypedHeaders<THeaders>;
   data: TSuccess;
   /** [MDN Reference](https://developer.mozilla.org/en-US/docs/Web/API/Response/json) */
   json: () => Promise<TSuccess>;
 }
 
 /** @see https://developer.mozilla.org/en-US/docs/Web/API/Response */
-interface ErrorResponse<TData, TStatusCode> extends Omit<Response, "ok" | "status" | "json"> {
+export interface TypedErrorResponse<TData, TStatusCode, THeaders> extends Omit<Response, "ok" | "status" | "json" | "headers"> {
   ok: false;
   status: TStatusCode;
+  headers: never extends THeaders ? Headers :  TypedHeaders<THeaders>;
   data: TData;
   /** [MDN Reference](https://developer.mozilla.org/en-US/docs/Web/API/Response/json) */
   json: () => Promise<TData>;
 }
 
-export type TypedApiResponse<TSuccess, TAllResponses extends Record<string | number, unknown> = {}> =
-  (keyof TAllResponses extends never
-    ? SuccessResponse<TSuccess, number>
-    : {
-        [K in keyof TAllResponses]: K extends string
-          ? K extends \`\${infer TStatusCode extends number}\`
-            ? TStatusCode extends SuccessStatusCode
-              ? SuccessResponse<TSuccess, TStatusCode>
-              : ErrorResponse<TAllResponses[K], TStatusCode>
-            : never
-          : K extends number
-            ? K extends SuccessStatusCode
-              ? SuccessResponse<TSuccess, K>
-              : ErrorResponse<TAllResponses[K], K>
-            : never;
-      }[keyof TAllResponses]);
-
-export type SafeApiResponse<TEndpoint> = TEndpoint extends { response: infer TSuccess; responses: infer TResponses }
+export type TypedApiResponse<TAllResponses extends Record<string | number, unknown> = {}, THeaders = {}> =
+  ({
+    [K in keyof TAllResponses]: K extends string
+      ? K extends \`\${infer TStatusCode extends number}\`
+        ? TStatusCode extends SuccessStatusCode
+          ? TypedSuccessResponse<TAllResponses[K], TStatusCode, K extends keyof THeaders ? THeaders[K] : never>
+          : TypedErrorResponse<TAllResponses[K], TStatusCode, K extends keyof THeaders ? THeaders[K] : never>
+        : never
+      : K extends number
+        ? K extends SuccessStatusCode
+          ? TypedSuccessResponse<TAllResponses[K], K, K extends keyof THeaders ? THeaders[K] : never>
+          : TypedErrorResponse<TAllResponses[K], K, K extends keyof THeaders ? THeaders[K] : never>
+        : never;
+  }[keyof TAllResponses]);
+
+export type SafeApiResponse<TEndpoint> = TEndpoint extends { responses: infer TResponses }
   ? TResponses extends Record<string, unknown>
-    ? TypedApiResponse<TSuccess, TResponses>
-    : SuccessResponse<TSuccess, number>
-  : TEndpoint extends { response: infer TSuccess }
-    ? SuccessResponse<TSuccess, number>
-    : never;
+    ? TypedApiResponse<TResponses, TEndpoint extends { responseHeaders: infer THeaders } ? THeaders : never>
+    : never
+  : never
 
 export type InferResponseByStatus<TEndpoint, TStatusCode> = Extract<SafeApiResponse<TEndpoint>, { status: TStatusCode }>
 
@@ -418,9 +419,9 @@ type MaybeOptionalArg<T> = RequiredKeys<T> extends never ? [config?: T] : [confi
   const apiClient = `
 // <TypedResponseError>
 export class TypedResponseError extends Error {
-  response: ErrorResponse<unknown, ErrorStatusCode>;
+  response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>;
   status: number;
-  constructor(response: ErrorResponse<unknown, ErrorStatusCode>) {
+  constructor(response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>) {
     super(\`HTTP \${response.status}: \${response.statusText}\`);
     this.name = 'TypedResponseError';
     this.response = response;
@@ -463,9 +464,15 @@ export class ApiClient {
         .with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["parameters"]`)
         .otherwise(() => `TEndpoint["parameters"]`)} & { withResponse?: false; throwOnStatusError?: boolean }>
     ): Promise<${match(ctx.runtime)
-      .with("zod", "yup", () => infer(`TEndpoint["response"]`))
-      .with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`)
-      .otherwise(() => `TEndpoint["response"]`)}>;
+      .with("zod", "yup", () => infer(`InferResponseByStatus<TEndpoint, SuccessStatusCode>`))
+      .with(
+        "arktype",
+        "io-ts",
+        "typebox",
+        "valibot",
+        () => `InferResponseByStatus<${infer(`TEndpoint`)}, SuccessStatusCode>["data"]`,
+      )
+      .otherwise(() => `InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"]`)}>;
 
     ${method}<Path extends keyof ${capitalizedMethod}Endpoints, TEndpoint extends ${capitalizedMethod}Endpoints[Path]>(
       path: Path,
@@ -499,9 +506,15 @@ export class ApiClient {
         });
 
         return promise ${match(ctx.runtime)
-          .with("zod", "yup", () => `as Promise<${infer(`TEndpoint["response"]`)}>`)
-          .with("arktype", "io-ts", "typebox", "valibot", () => `as Promise<${infer(`TEndpoint`) + `["response"]`}>`)
-          .otherwise(() => `as Promise<TEndpoint["response"]>`)}
+          .with("zod", "yup", () => `as Promise<${infer(`InferResponseByStatus<TEndpoint, SuccessStatusCode>`)}>`)
+          .with(
+            "arktype",
+            "io-ts",
+            "typebox",
+            "valibot",
+            () => `as Promise<InferResponseByStatus<${infer(`TEndpoint`)}, SuccessStatusCode>["data"]>`,
+          )
+          .otherwise(() => `as Promise<InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"]>`)}
     }
     // </ApiClient.${method}>
     `

package/src/map-openapi-endpoints.ts

@@ -6,7 +6,7 @@ import { createBoxFactory } from "./box-factory.ts";
 import { openApiSchemaToTs } from "./openapi-schema-to-ts.ts";
 import { createRefResolver } from "./ref-resolver.ts";
 import { tsFactory } from "./ts-factory.ts";
-import { AnyBox, BoxRef, OpenapiSchemaConvertContext } from "./types.ts";
+import { AnyBox, BoxRef, OpenapiSchemaConvertContext, type BoxObject, type LibSchemaObject } from "./types.ts";
 import { pathToVariableName } from "./string-utils.ts";
 import { NameTransformOptions } from "./types.ts";
 import { match, P } from "ts-pattern";
@@ -33,7 +33,6 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject, options?: { nameTransfor
         method: method as Method,
         path,
         requestFormat: "json",
-        response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
           alias,
           areParametersRequired: false,
@@ -131,86 +130,81 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject, options?: { nameTransfor
           }
         }
 
-        // No need to pass empty objects, it's confusing
         endpoint.parameters = Object.keys(params).length ? (params as any as EndpointParameters) : undefined;
       }
 
-      // Match the first 2xx-3xx response found, or fallback to default one otherwise
-      let responseObject: ResponseObject | undefined;
       const allResponses: Record<string, AnyBox> = {};
+      const allHeaders: Record<string, Box<BoxObject>> = {};
 
       Object.entries(operation.responses ?? {}).map(([status, responseOrRef]) => {
-        const statusCode = Number(status);
         const responseObj = refs.unwrap<ResponseObject>(responseOrRef);
 
         // Collect all responses for error handling
         const content = responseObj?.content;
-        if (content) {
-          const matchingMediaType = Object.keys(content).find(isResponseMediaType);
-          if (matchingMediaType && content[matchingMediaType]) {
-            allResponses[status] = openApiSchemaToTs({
-              schema: content[matchingMediaType]?.schema ?? {},
-              ctx,
-            });
-          } else {
+        const mediaTypes = Object.keys(content ?? {}).filter(isResponseMediaType);
+        if (content && mediaTypes.length) {
+          mediaTypes.forEach((mediaType) => {
             // If no JSON content, use unknown type
-            allResponses[status] = openApiSchemaToTs({ schema: {}, ctx });
-          }
+            const schema = content[mediaType] ? (content[mediaType].schema ?? {}) : {};
+            const t = createBoxFactory(schema as LibSchemaObject, ctx);
+            const mediaTypeResponse = openApiSchemaToTs({ schema, ctx });
+
+            if (allResponses[status]) {
+              allResponses[status] = t.union([
+                ...(Array.isArray(allResponses[status]) ? allResponses[status] : [allResponses[status]]),
+                mediaTypeResponse,
+              ]);
+            } else {
+              allResponses[status] = mediaTypeResponse;
+            }
+          });
         } else {
           // If no content defined, use unknown type
-          allResponses[status] = openApiSchemaToTs({ schema: {}, ctx });
-        }
-
-        // Keep the current logic for the main response (first 2xx-3xx)
-        if (statusCode >= 200 && statusCode < 300 && !responseObject) {
-          responseObject = responseObj;
+          const schema = {};
+          const unknown = openApiSchemaToTs({ schema: {}, ctx });
+          const t = createBoxFactory(schema as LibSchemaObject, ctx);
+
+          if (allResponses[status]) {
+            allResponses[status] = t.union([
+              ...(Array.isArray(allResponses[status]) ? allResponses[status] : [allResponses[status]]),
+              unknown,
+            ]);
+          } else {
+            allResponses[status] = unknown;
+          }
         }
-      });
 
-      if (!responseObject && operation.responses?.default) {
-        responseObject = refs.unwrap(operation.responses.default);
-        // Also add default to all responses if not already covered
-        if (!allResponses["default"]) {
-          const content = responseObject?.content;
-          if (content) {
-            const matchingMediaType = Object.keys(content).find(isResponseMediaType);
-            if (matchingMediaType && content[matchingMediaType]) {
-              allResponses["default"] = openApiSchemaToTs({
-                schema: content[matchingMediaType]?.schema ?? {},
-                ctx,
-              });
-            }
+        // Map response headers
+        const headers = responseObj?.headers;
+        const t = createBoxFactory(
+          { type: "object", properties: (headers ?? {}) as never, required: Object.keys(headers ?? {}) },
+          ctx,
+        );
+        if (headers) {
+          const mappedHeaders = Object.entries(headers).reduce(
+            (acc, [name, headerOrRef]) => {
+              const header = refs.unwrap(headerOrRef);
+              const box = openApiSchemaToTs({ schema: header.schema ?? {}, ctx });
+              acc[name] = box;
+
+              return acc;
+            },
+            {} as Record<string, Box>,
+          );
+
+          if (Object.keys(mappedHeaders).length) {
+            allHeaders[status] = t.object(mappedHeaders);
           }
         }
-      }
+      });
 
       // Set the responses collection
       if (Object.keys(allResponses).length > 0) {
         endpoint.responses = allResponses;
       }
 
-      const content = responseObject?.content;
-      if (content) {
-        const matchingMediaType = Object.keys(content).find(isResponseMediaType);
-        if (matchingMediaType && content[matchingMediaType]) {
-          endpoint.response = openApiSchemaToTs({
-            schema: content[matchingMediaType]?.schema ?? {},
-            ctx,
-          });
-        }
-      }
-
-      // Map response headers
-      const headers = responseObject?.headers;
-      if (headers) {
-        endpoint.responseHeaders = Object.entries(headers).reduce(
-          (acc, [name, headerOrRef]) => {
-            const header = refs.unwrap(headerOrRef);
-            acc[name] = openApiSchemaToTs({ schema: header.schema ?? {}, ctx });
-            return acc;
-          },
-          {} as Record<string, Box>,
-        );
+      if (Object.keys(allHeaders).length) {
+        endpoint.responseHeaders = allHeaders;
       }
 
       endpointList.push(endpoint);
@@ -233,7 +227,8 @@ const isAllowedParamMediaTypes = (
   allowedParamMediaTypes.includes(mediaType as any) ||
   mediaType.includes("text/");
 
-const isResponseMediaType = (mediaType: string) => mediaType === "application/json" || mediaType === "*/*";
+const isResponseMediaType = (mediaType: string) =>
+  mediaType === "*/*" || (mediaType.includes("application/") && mediaType.includes("json"));
 const getAlias = ({ path, method, operation }: Endpoint) =>
   sanitizeName(
     (method + "_" + capitalize(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__"),
@@ -254,9 +249,8 @@ type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 
 type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
-  response: AnyBox;
   responses?: Record<string, AnyBox>;
-  responseHeaders?: Record<string, AnyBox>;
+  responseHeaders?: Record<string, Box<BoxObject>>;
 };
 
 export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
@@ -270,7 +264,6 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     hasParameters: boolean;
     areParametersRequired: boolean;
   };
-  response: TConfig["response"];
   responses?: TConfig["responses"];
   responseHeaders?: TConfig["responseHeaders"];
 };

package/src/tanstack-query.generator.ts

@@ -95,7 +95,7 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
                             withResponse: false as const
                         };
                         const res = await this.client.${method}(path, requestParams);
-                        return res as TEndpoint["response"];
+                        return res as InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"];
                     },
                     queryKey: queryKey
                 }),
@@ -110,7 +110,7 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
                             withResponse: false as const
                         };
                         const res = await this.client.${method}(path, requestParams);
-                        return res as TEndpoint["response"];
+                        return res as InferResponseByStatus<TEndpoint, SuccessStatusCode>["data"];
                     }
                 }
             };