typed-openapi 1.5.0 → 2.0.0

package/dist/{chunk-N6BWPZUB.js → chunk-E6A7N4ND.js}

@@ -1,3 +1,7 @@
+import {
+  prettify
+} from "./chunk-KAEXXJ7X.js";
+
 // src/asserts.ts
 var isPrimitiveType = (type2) => primitiveTypeList.includes(type2);
 var primitiveTypeList = ["string", "number", "integer", "boolean", "null"];
@@ -278,6 +282,69 @@ import { capitalize as capitalize2, groupBy } from "pastable/server";
 import * as Codegen from "@sinclair/typebox-codegen";
 import { match } from "ts-pattern";
 import { type } from "arktype";
+var DEFAULT_SUCCESS_STATUS_CODES = [
+  200,
+  201,
+  202,
+  203,
+  204,
+  205,
+  206,
+  207,
+  208,
+  226,
+  300,
+  301,
+  302,
+  303,
+  304,
+  305,
+  306,
+  307,
+  308
+];
+var DEFAULT_ERROR_STATUS_CODES = [
+  400,
+  401,
+  402,
+  403,
+  404,
+  405,
+  406,
+  407,
+  408,
+  409,
+  410,
+  411,
+  412,
+  413,
+  414,
+  415,
+  416,
+  417,
+  418,
+  421,
+  422,
+  423,
+  424,
+  425,
+  426,
+  428,
+  429,
+  431,
+  451,
+  500,
+  501,
+  502,
+  503,
+  504,
+  505,
+  506,
+  507,
+  508,
+  510,
+  511
+];
 var allowedRuntimes = type("'none' | 'arktype' | 'io-ts' | 'typebox' | 'valibot' | 'yup' | 'zod'");
 var runtimeValidationGenerator = {
   arktype: Codegen.ModelToArkType.Generate,
@@ -310,10 +377,17 @@ var replacerByRuntime = {
   )
 };
 var generateFile = (options) => {
-  const ctx = { ...options, runtime: options.runtime ?? "none" };
+  const ctx = {
+    ...options,
+    runtime: options.runtime ?? "none",
+    successStatusCodes: options.successStatusCodes ?? DEFAULT_SUCCESS_STATUS_CODES,
+    errorStatusCodes: options.errorStatusCodes ?? DEFAULT_ERROR_STATUS_CODES,
+    includeClient: options.includeClient ?? true
+  };
   const schemaList = generateSchemaList(ctx);
   const endpointSchemaList = options.schemasOnly ? "" : generateEndpointSchemaList(ctx);
-  const apiClient = options.schemasOnly ? "" : generateApiClient(ctx);
+  const endpointByMethod = options.schemasOnly ? "" : generateEndpointByMethod(ctx);
+  const apiClient = options.schemasOnly || !ctx.includeClient ? "" : generateApiClient(ctx);
   const transform = ctx.runtime === "none" ? (file2) => file2 : (file2) => {
     const model = Codegen.TypeScriptToModel.Generate(file2);
     const transformer = runtimeValidationGenerator[ctx.runtime];
@@ -333,6 +407,7 @@ var generateFile = (options) => {
   };
   const file = `
   ${transform(schemaList + endpointSchemaList)}
+  ${endpointByMethod}
   ${apiClient}
   `;
   return file;
@@ -376,6 +451,20 @@ var responseHeadersObjectToString = (responseHeaders, ctx) => {
   }
   return str + "}";
 };
+var generateResponsesObject = (responses, ctx) => {
+  let str = "{";
+  for (const [statusCode, responseType] of Object.entries(responses)) {
+    const value = ctx.runtime === "none" ? responseType.recompute((box) => {
+      if (Box.isReference(box) && !box.params.generics && box.value !== "null") {
+        box.value = `Schemas.${box.value}`;
+      }
+      return box;
+    }).value : responseType.value;
+    str += `${wrapWithQuotesIfNeeded(statusCode)}: ${value},
+`;
+  }
+  return str + "}";
+};
 var generateEndpointSchemaList = (ctx) => {
   let file = `
   ${ctx.runtime === "none" ? "export namespace Endpoints {" : ""}
@@ -407,6 +496,7 @@ var generateEndpointSchemaList = (ctx) => {
       }
       return box;
     }).value : endpoint.response.value},
+      ${endpoint.responses ? `responses: ${generateResponsesObject(endpoint.responses, ctx)},` : ""}
       ${endpoint.responseHeaders ? `responseHeaders: ${responseHeadersObjectToString(endpoint.responseHeaders, ctx)},` : ""}
     }
 `;
@@ -427,7 +517,7 @@ var generateEndpointByMethod = (ctx) => {
     return `${method}: {
            ${list.map(
       (endpoint) => `"${endpoint.path}": ${ctx.runtime === "none" ? "Endpoints." : ""}${endpoint.meta.alias}`
-    )}
+    ).join(",\n")}
          }`;
   }).join(",\n")}
      }
@@ -443,9 +533,11 @@ var generateEndpointByMethod = (ctx) => {
   return endpointByMethod + shorthands;
 };
 var generateApiClient = (ctx) => {
+  if (!ctx.includeClient) {
+    return "";
+  }
   const { endpointList } = ctx;
   const byMethods = groupBy(endpointList, "method");
-  const endpointSchemaList = generateEndpointByMethod(ctx);
   const apiClientTypes = `
 // <ApiClientTypes>
 export type EndpointParameters = {
@@ -463,6 +555,7 @@ 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>;
 };
 
@@ -478,11 +571,64 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     areParametersRequired: boolean;
   };
   response: TConfig["response"];
+  responses?: TConfig["responses"];
   responseHeaders?: TConfig["responseHeaders"]
 };
 
 export type Fetcher = (method: Method, url: string, parameters?: EndpointParameters | undefined) => Promise<Response>;
 
+export const successStatusCodes = [${ctx.successStatusCodes.join(",")}] as const;
+export type SuccessStatusCode = typeof successStatusCodes[number];
+
+export const errorStatusCodes = [${ctx.errorStatusCodes.join(",")}] as const;
+export type ErrorStatusCode = typeof errorStatusCodes[number];
+
+// Error handling types
+/** @see https://developer.mozilla.org/en-US/docs/Web/API/Response */
+interface SuccessResponse<TSuccess, TStatusCode> extends Omit<Response, "ok" | "status" | "json"> {
+  ok: true;
+  status: TStatusCode;
+  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"> {
+  ok: false;
+  status: TStatusCode;
+  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 }
+  ? TResponses extends Record<string, unknown>
+    ? TypedApiResponse<TSuccess, TResponses>
+    : SuccessResponse<TSuccess, number>
+  : TEndpoint extends { response: infer TSuccess }
+    ? SuccessResponse<TSuccess, number>
+    : never;
+
+export type InferResponseByStatus<TEndpoint, TStatusCode> = Extract<SafeApiResponse<TEndpoint>, { status: TStatusCode }>
+
 type RequiredKeys<T> = {
   [P in keyof T]-?: undefined extends T[P] ? never : P;
 }[keyof T];
@@ -492,9 +638,23 @@ type MaybeOptionalArg<T> = RequiredKeys<T> extends never ? [config?: T] : [confi
 // </ApiClientTypes>
 `;
   const apiClient = `
+// <TypedResponseError>
+export class TypedResponseError extends Error {
+  response: ErrorResponse<unknown, ErrorStatusCode>;
+  status: number;
+  constructor(response: ErrorResponse<unknown, ErrorStatusCode>) {
+    super(\`HTTP \${response.status}: \${response.statusText}\`);
+    this.name = 'TypedResponseError';
+    this.response = response;
+    this.status = response.status;
+  }
+}
+// </TypedResponseError>
 // <ApiClient>
 export class ApiClient {
   baseUrl: string = "";
+  successStatusCodes = successStatusCodes;
+  errorStatusCodes = errorStatusCodes;
 
   constructor(public fetcher: Fetcher) {}
 
@@ -517,10 +677,44 @@ export class ApiClient {
     return endpointByMethod.length ? `// <ApiClient.${method}>
     ${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"]`)}>
-    ): Promise<${match(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["response"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`).otherwise(() => `TEndpoint["response"]`)}> {
-      return this.fetcher("${method}", this.baseUrl + path, params[0])
-          .then(response => this.parseResponse(response))${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"]>`)};
+      ...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"]`)}>;
+
+    ${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: true; throwOnStatusError?: boolean }>
+    ): Promise<SafeApiResponse<TEndpoint>>;
+
+    ${method}<Path extends keyof ${capitalizedMethod}Endpoints, TEndpoint extends ${capitalizedMethod}Endpoints[Path]>(
+      path: Path,
+      ...params: MaybeOptionalArg<any>
+    ): Promise<any> {
+      const requestParams = params[0];
+      const withResponse = requestParams?.withResponse;
+      const { withResponse: _, throwOnStatusError = withResponse ? false : true, ...fetchParams } = requestParams || {};
+
+      const promise = this.fetcher("${method}", this.baseUrl + path, Object.keys(fetchParams).length ? requestParams : undefined)
+        .then(async (response) => {
+          const data = await this.parseResponse(response);
+          const typedResponse = Object.assign(response, {
+            data: data,
+            json: () => Promise.resolve(data)
+          }) as SafeApiResponse<TEndpoint>;
+
+          if (throwOnStatusError && errorStatusCodes.includes(response.status as never)) {
+            throw new TypedResponseError(typedResponse as never);
+          }
+
+          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"]>`)}
     }
     // </ApiClient.${method}>
     ` : "";
@@ -548,11 +742,8 @@ export class ApiClient {
     "valibot",
     () => inferByRuntime[ctx.runtime](`TEndpoint`) + `["parameters"]`
   ).otherwise(() => `TEndpoint extends { parameters: infer Params } ? Params : never`)}>)
-    : Promise<Omit<Response, "json"> & {
-      /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/json) */
-      json: () => Promise<TEndpoint extends { response: infer Res } ? Res : never>;
-    }> {
-      return this.fetcher(method, this.baseUrl + (path as string), params[0] as EndpointParameters);
+    : Promise<SafeApiResponse<TEndpoint>> {
+      return this.fetcher(method, this.baseUrl + (path as string), params[0] as EndpointParameters) as Promise<SafeApiResponse<TEndpoint>>;
     }
     // </ApiClient.request>
 }
@@ -570,11 +761,26 @@ export function createApiClient(fetcher: Fetcher, baseUrl?: string) {
  api.get("/users").then((users) => console.log(users));
  api.post("/users", { body: { name: "John" } }).then((user) => console.log(user));
  api.put("/users/:id", { path: { id: 1 }, body: { name: "John" } }).then((user) => console.log(user));
+
+ // With error handling
+ const result = await api.get("/users/{id}", { path: { id: "123" }, withResponse: true });
+ if (result.ok) {
+   // Access data directly
+   const user = result.data;
+   console.log(user);
+
+   // Or use the json() method for compatibility
+   const userFromJson = await result.json();
+   console.log(userFromJson);
+ } else {
+   const error = result.data;
+   console.error(\`Error \${result.status}:\`, error);
+ }
 */
 
-// </ApiClient
+// </ApiClient>
 `;
-  return endpointSchemaList + apiClientTypes + apiClient;
+  return apiClientTypes + apiClient;
 };
 
 // src/ref-resolver.ts
@@ -603,10 +809,90 @@ function topologicalSort(graph) {
   return sorted;
 }
 
+// src/sanitize-name.ts
+var reservedWords = /* @__PURE__ */ new Set([
+  // TS keywords and built-ins
+  "import",
+  "package",
+  "namespace",
+  "Record",
+  "Partial",
+  "Required",
+  "Readonly",
+  "Pick",
+  "Omit",
+  "String",
+  "Number",
+  "Boolean",
+  "Object",
+  "Array",
+  "Function",
+  "any",
+  "unknown",
+  "never",
+  "void",
+  "extends",
+  "super",
+  "class",
+  "interface",
+  "type",
+  "enum",
+  "const",
+  "let",
+  "var",
+  "if",
+  "else",
+  "for",
+  "while",
+  "do",
+  "switch",
+  "case",
+  "default",
+  "break",
+  "continue",
+  "return",
+  "try",
+  "catch",
+  "finally",
+  "throw",
+  "new",
+  "delete",
+  "in",
+  "instanceof",
+  "typeof",
+  "void",
+  "with",
+  "yield",
+  "await",
+  "static",
+  "public",
+  "private",
+  "protected",
+  "abstract",
+  "as",
+  "asserts",
+  "from",
+  "get",
+  "set",
+  "module",
+  "require",
+  "keyof",
+  "readonly",
+  "global",
+  "symbol",
+  "bigint"
+]);
+function sanitizeName(name, type2) {
+  let n = name.replace(/[\W/]+/g, "_");
+  if (/^\d/.test(n)) n = "_" + n;
+  if (reservedWords.has(n)) n = (type2 === "schema" ? "Schema_" : "Endpoint_") + n;
+  return n;
+}
+
 // src/ref-resolver.ts
 var autocorrectRef = (ref) => ref[1] === "/" ? ref : "#/" + ref.slice(1);
 var componentsWithSchemas = ["schemas", "responses", "parameters", "requestBodies", "headers"];
-var createRefResolver = (doc, factory2) => {
+var createRefResolver = (doc, factory2, nameTransform) => {
   const nameByRef = /* @__PURE__ */ new Map();
   const refByName = /* @__PURE__ */ new Map();
   const byRef = /* @__PURE__ */ new Map();
@@ -619,7 +905,11 @@ var createRefResolver = (doc, factory2) => {
     const normalizedPath = path.replace("#/", "").replace("#", "").replaceAll("/", ".");
     const map = get(doc, normalizedPath) ?? {};
     const name = split[split.length - 1];
-    const normalized = normalizeString(name);
+    let normalized = normalizeString(name);
+    if (nameTransform?.transformSchemaName) {
+      normalized = nameTransform.transformSchemaName(normalized);
+    }
+    normalized = sanitizeName(normalized, "schema");
     nameByRef.set(correctRef, normalized);
     refByName.set(normalized, correctRef);
     const infos = { ref: correctRef, name, normalized, kind: normalizedPath.split(".")[1] };
@@ -768,7 +1058,7 @@ var tsFactory = createFactory({
 import { capitalize as capitalize3, pick } from "pastable/server";
 import { match as match2, P } from "ts-pattern";
 var factory = tsFactory;
-var mapOpenApiEndpoints = (doc) => {
+var mapOpenApiEndpoints = (doc, options) => {
   const refs = createRefResolver(doc, factory);
   const ctx = { refs, factory };
   const endpointList = [];
@@ -776,6 +1066,10 @@ var mapOpenApiEndpoints = (doc) => {
     const pathItem = pick(pathItemObj, ["get", "put", "post", "delete", "options", "head", "patch", "trace"]);
     Object.entries(pathItem).forEach(([method, operation]) => {
       if (operation.deprecated) return;
+      let alias = getAlias({ path, method, operation });
+      if (options?.nameTransform?.transformEndpointName) {
+        alias = options.nameTransform.transformEndpointName({ alias, path, method, operation });
+      }
       const endpoint = {
         operation,
         method,
@@ -783,7 +1077,7 @@ var mapOpenApiEndpoints = (doc) => {
         requestFormat: "json",
         response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
-          alias: getAlias({ path, method, operation }),
+          alias,
           areParametersRequired: false,
           hasParameters: false
         }
@@ -827,7 +1121,7 @@ var mapOpenApiEndpoints = (doc) => {
         const matchingMediaType = Object.keys(content2).find(isAllowedParamMediaTypes);
         if (matchingMediaType && content2[matchingMediaType]) {
           params.body = openApiSchemaToTs({
-            schema: content2[matchingMediaType]?.schema ?? {} ?? {},
+            schema: content2[matchingMediaType]?.schema ?? {},
             ctx
           });
         }
@@ -852,21 +1146,52 @@ var mapOpenApiEndpoints = (doc) => {
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
       let responseObject;
+      const allResponses = {};
       Object.entries(operation.responses ?? {}).map(([status, responseOrRef]) => {
         const statusCode = Number(status);
-        if (statusCode >= 200 && statusCode < 300) {
-          responseObject = refs.unwrap(responseOrRef);
+        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
+            });
+          } else {
+            allResponses[status] = openApiSchemaToTs({ schema: {}, ctx });
+          }
+        } 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
+              });
+            }
+          }
+        }
+      }
+      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 ?? {} ?? {},
+            schema: content[matchingMediaType]?.schema ?? {},
             ctx
           });
         }
@@ -895,25 +1220,10 @@ var allowedParamMediaTypes = [
 ];
 var isAllowedParamMediaTypes = (mediaType) => mediaType.includes("application/") && mediaType.includes("json") || allowedParamMediaTypes.includes(mediaType) || mediaType.includes("text/");
 var isResponseMediaType = (mediaType) => mediaType === "application/json";
-var getAlias = ({ path, method, operation }) => (method + "_" + capitalize3(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__");
-
-// src/format.ts
-import prettier from "prettier";
-import parserTypescript from "prettier/parser-typescript";
-function maybePretty(input, options) {
-  try {
-    return prettier.format(input, {
-      parser: "typescript",
-      plugins: [parserTypescript],
-      ...options
-    });
-  } catch (err) {
-    console.warn("Failed to format code");
-    console.warn(err);
-    return input;
-  }
-}
-var prettify = (str, options) => maybePretty(str, { printWidth: 120, trailingComma: "all", ...options });
+var getAlias = ({ path, method, operation }) => sanitizeName(
+  (method + "_" + capitalize3(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__"),
+  "endpoint"
+);
 
 // src/tanstack-query.generator.ts
 import { capitalize as capitalize4 } from "pastable/server";
@@ -921,7 +1231,8 @@ var generateTanstackQueryFile = async (ctx) => {
   const endpointMethods = new Set(ctx.endpointList.map((endpoint) => endpoint.method.toLowerCase()));
   const file = `
   import { queryOptions } from "@tanstack/react-query"
-  import type { EndpointByMethod, ApiClient } from "${ctx.relativeApiClientPath}"
+  import type { EndpointByMethod, ApiClient, SuccessStatusCode, ErrorStatusCode, InferResponseByStatus } from "${ctx.relativeApiClientPath}"
+  import { errorStatusCodes, TypedResponseError } from "${ctx.relativeApiClientPath}"
 
   type EndpointQueryKey<TOptions extends EndpointParameters> = [
       TOptions & {
@@ -985,30 +1296,36 @@ var generateTanstackQueryFile = async (ctx) => {
             path: Path,
             ...params: MaybeOptionalArg<TEndpoint["parameters"]>
         ) {
-            const queryKey = createQueryKey(path, params[0]);
+            const queryKey = createQueryKey(path as string, params[0]);
             const query = {
                 /** type-only property if you need easy access to the endpoint params */
                 "~endpoint": {} as TEndpoint,
                 queryKey,
+                queryFn: {} as "You need to pass .queryOptions to the useQuery hook",
                 queryOptions: queryOptions({
                     queryFn: async ({ queryKey, signal, }) => {
-                        const res = await this.client.${method}(path, {
-                            ...params,
-                            ...queryKey[0],
+                        const requestParams = {
+                            ...(params[0] || {}),
+                            ...(queryKey[0] || {}),
                             signal,
-                        });
+                            withResponse: false as const
+                        };
+                        const res = await this.client.${method}(path, requestParams);
                         return res as TEndpoint["response"];
                     },
                     queryKey: queryKey
                 }),
+                mutationFn: {} as "You need to pass .mutationOptions to the useMutation hook",
                 mutationOptions: {
                     mutationKey: queryKey,
                     mutationFn: async (localOptions: TEndpoint extends { parameters: infer Parameters} ? Parameters: never) => {
-                        const res = await this.client.${method}(path, {
-                            ...params,
-                            ...queryKey[0],
-                            ...localOptions,
-                        });
+                        const requestParams = {
+                            ...(params[0] || {}),
+                            ...(queryKey[0] || {}),
+                            ...(localOptions || {}),
+                            withResponse: false as const
+                        };
+                        const res = await this.client.${method}(path, requestParams);
                         return res as TEndpoint["response"];
                     }
                 }
@@ -1022,32 +1339,67 @@ var generateTanstackQueryFile = async (ctx) => {
 
         // <ApiClient.request>
         /**
-         * Generic mutation method with full type-safety for any endpoint that doesnt require parameters to be passed initially
+         * Generic mutation method with full type-safety for any endpoint; it doesnt require parameters to be passed initially
+         * but instead will require them to be passed when calling the mutation.mutate() method
          */
         mutation<
             TMethod extends keyof EndpointByMethod,
             TPath extends keyof EndpointByMethod[TMethod],
             TEndpoint extends EndpointByMethod[TMethod][TPath],
-            TSelection,
-        >(method: TMethod, path: TPath, selectFn?: (res: Omit<Response, "json"> & {
-            /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/json) */
-            json: () => Promise<TEndpoint extends { response: infer Res } ? Res : never>;
-        }) => TSelection) {
+            TWithResponse extends boolean = false,
+            TSelection = TWithResponse extends true
+                ? InferResponseByStatus<TEndpoint, SuccessStatusCode>
+                : TEndpoint extends { response: infer Res } ? Res : never,
+            TError = TEndpoint extends { responses: infer TResponses }
+                ? TResponses extends Record<string | number, unknown>
+                    ? InferResponseByStatus<TEndpoint, ErrorStatusCode>
+                    : Error
+                : Error
+        >(method: TMethod, path: TPath, options?: {
+            withResponse?: TWithResponse;
+            selectFn?: (res: TWithResponse extends true
+                ? InferResponseByStatus<TEndpoint, SuccessStatusCode>
+                : TEndpoint extends { response: infer Res } ? Res : never
+            ) => TSelection;
+             throwOnStatusError?: boolean
+        }) {
             const mutationKey = [{ method, path }] as const;
             return {
             /** type-only property if you need easy access to the endpoint params */
             "~endpoint": {} as TEndpoint,
             mutationKey: mutationKey,
+            mutationFn: {} as "You need to pass .mutationOptions to the useMutation hook",
             mutationOptions: {
                 mutationKey: mutationKey,
-                mutationFn: async (params: TEndpoint extends { parameters: infer Parameters } ? Parameters : never) => {
-                const response = await this.client.request(method, path, params);
-                const res = selectFn ? selectFn(response) : response
-                return res as unknown extends TSelection ? typeof response : Awaited<TSelection>
-                },
-            },
-            };
+                mutationFn: async <TLocalWithResponse extends boolean = TWithResponse, TLocalSelection = TLocalWithResponse extends true
+                    ? InferResponseByStatus<TEndpoint, SuccessStatusCode>
+                    : TEndpoint extends { response: infer Res }
+                        ? Res
+                        : never>
+                (params: (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
+                    withResponse?: TLocalWithResponse;
+                    throwOnStatusError?: boolean;
+                }): Promise<TLocalSelection> => {
+                    const withResponse = params.withResponse ??options?.withResponse ?? false;
+                    const throwOnStatusError = params.throwOnStatusError ?? options?.throwOnStatusError ?? (withResponse ? false : true);
+                    const selectFn = options?.selectFn;
+                    const response = await (this.client as any)[method](path, { ...params as any, withResponse: true, throwOnStatusError: false });
+
+                    if (throwOnStatusError && errorStatusCodes.includes(response.status as never)) {
+                        throw new TypedResponseError(response as never);
+                    }
+
+                    // Return just the data if withResponse is false, otherwise return the full response
+                    const finalResponse = withResponse ? response : response.data;
+                    const res = selectFn ? selectFn(finalResponse as any) : finalResponse;
+                    return res as never;
+                }
+            } satisfies import("@tanstack/react-query").UseMutationOptions<TSelection, TError, (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
+                    withResponse?: boolean;
+                    throwOnStatusError?: boolean;
+                }>,
         }
+    }
         // </ApiClient.request>
   }
 `;
@@ -1059,11 +1411,12 @@ export {
   createFactory,
   createBoxFactory,
   openApiSchemaToTs,
+  DEFAULT_SUCCESS_STATUS_CODES,
+  DEFAULT_ERROR_STATUS_CODES,
   allowedRuntimes,
   generateFile,
   createRefResolver,
   tsFactory,
   mapOpenApiEndpoints,
-  prettify,
   generateTanstackQueryFile
 };