typed-openapi 2.2.1 → 2.2.2

package/dist/{chunk-TC2ECJEG.js → chunk-4VZOXNI4.js}

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

package/dist/{chunk-ISAFCW3H.js → chunk-L5G4LNMY.js}

@@ -668,18 +668,18 @@ type NotNever<T> = [T] extends [never] ? false : true;
   const infer = inferByRuntime[ctx.runtime];
   const InferTEndpoint = match(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`)).otherwise(() => `TEndpoint`);
   const apiClient = `
-// <TypedResponseError>
-export class TypedResponseError extends Error {
-  response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>;
+// <TypedStatusError>
+export class TypedStatusError<TData = unknown> extends Error {
+  response: TypedErrorResponse<TData, ErrorStatusCode, unknown>;
   status: number;
-  constructor(response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>) {
+  constructor(response: TypedErrorResponse<TData, ErrorStatusCode, unknown>) {
     super(\`HTTP \${response.status}: \${response.statusText}\`);
-    this.name = 'TypedResponseError';
+    this.name = 'TypedStatusError';
     this.response = response;
     this.status = response.status;
   }
 }
-// </TypedResponseError>
+// </TypedStatusError>
 
 // <ApiClient>
 export class ApiClient {
@@ -851,7 +851,7 @@ export class ApiClient {
           }) as SafeApiResponse<TEndpoint>;
 
           if (throwOnStatusError && errorStatusCodes.includes(response.status as never)) {
-            throw new TypedResponseError(typedResponse as never);
+            throw new TypedStatusError(typedResponse as never);
           }
 
           return withResponse ? typedResponse : data;
@@ -1365,7 +1365,7 @@ var generateTanstackQueryFile = async (ctx) => {
   const file = `
   import { queryOptions } from "@tanstack/react-query"
   import type { EndpointByMethod, ApiClient, SuccessStatusCode, ErrorStatusCode, InferResponseByStatus, TypedSuccessResponse } from "${ctx.relativeApiClientPath}"
-  import { errorStatusCodes, TypedResponseError } from "${ctx.relativeApiClientPath}"
+  import { errorStatusCodes, TypedStatusError } from "${ctx.relativeApiClientPath}"
 
   type EndpointQueryKey<TOptions extends EndpointParameters> = [
       TOptions & {
@@ -1479,7 +1479,7 @@ var generateTanstackQueryFile = async (ctx) => {
                 : InferResponseData<TEndpoint, SuccessStatusCode>,
             TError = TEndpoint extends { responses: infer TResponses }
                 ? TResponses extends Record<string | number, unknown>
-                    ? InferResponseByStatus<TEndpoint, ErrorStatusCode>
+                    ? TypedStatusError<InferResponseData<TEndpoint, ErrorStatusCode>>
                     : Error
                 : Error
         >(method: TMethod, path: TPath, options?: {
@@ -1492,15 +1492,11 @@ var generateTanstackQueryFile = async (ctx) => {
              throwOnError?: boolean | ((error: TError) => boolean)
         }) {
             const mutationKey = [{ method, path }] as const;
-            const mutationFn = async <TLocalWithResponse extends boolean = TWithResponse, TLocalSelection = TLocalWithResponse extends true
-                ? InferResponseByStatus<TEndpoint, SuccessStatusCode>
-                : InferResponseData<TEndpoint, SuccessStatusCode>>
-            (params: (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
-                withResponse?: TLocalWithResponse;
+            const mutationFn = async (params: (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
                 throwOnStatusError?: boolean;
                 overrides?: RequestInit;
-            }): Promise<TLocalSelection> => {
-                const withResponse = params.withResponse ??options?.withResponse ?? false;
+            }): Promise<TSelection> => {
+                const 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, {
@@ -1510,7 +1506,7 @@ var generateTanstackQueryFile = async (ctx) => {
                 });
 
                 if (throwOnStatusError && errorStatusCodes.includes(response.status as never)) {
-                    throw new TypedResponseError(response as never);
+                    throw new TypedStatusError(response as never);
                 }
 
                 // Return just the data if withResponse is false, otherwise return the full response
@@ -1531,8 +1527,8 @@ var generateTanstackQueryFile = async (ctx) => {
                 TSelection,
                 TError,
                 (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
-                withResponse?: boolean;
-                throwOnStatusError?: boolean;
+                    withResponse?: boolean;
+                    throwOnStatusError?: boolean;
                 }
             >, "mutationFn"> & {
                 mutationFn: typeof mutationFn

package/dist/cli.js

@@ -1,9 +1,9 @@
 import {
   generateClientFiles
-} from "./chunk-TC2ECJEG.js";
+} from "./chunk-4VZOXNI4.js";
 import {
   allowedRuntimes
-} from "./chunk-ISAFCW3H.js";
+} from "./chunk-L5G4LNMY.js";
 import "./chunk-KAEXXJ7X.js";
 
 // src/cli.ts

package/dist/index.js

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

package/dist/node.export.js

@@ -1,7 +1,7 @@
 import {
   generateClientFiles
-} from "./chunk-TC2ECJEG.js";
-import "./chunk-ISAFCW3H.js";
+} from "./chunk-4VZOXNI4.js";
+import "./chunk-L5G4LNMY.js";
 import "./chunk-KAEXXJ7X.js";
 export {
   generateClientFiles

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {

package/src/generator.ts

@@ -424,18 +424,18 @@ type NotNever<T> = [T] extends [never] ? false : true;
     .otherwise(() => `TEndpoint`);
 
   const apiClient = `
-// <TypedResponseError>
-export class TypedResponseError extends Error {
-  response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>;
+// <TypedStatusError>
+export class TypedStatusError<TData = unknown> extends Error {
+  response: TypedErrorResponse<TData, ErrorStatusCode, unknown>;
   status: number;
-  constructor(response: TypedErrorResponse<unknown, ErrorStatusCode, unknown>) {
+  constructor(response: TypedErrorResponse<TData, ErrorStatusCode, unknown>) {
     super(\`HTTP \${response.status}: \${response.statusText}\`);
-    this.name = 'TypedResponseError';
+    this.name = 'TypedStatusError';
     this.response = response;
     this.status = response.status;
   }
 }
-// </TypedResponseError>
+// </TypedStatusError>
 
 // <ApiClient>
 export class ApiClient {
@@ -612,7 +612,7 @@ export class ApiClient {
           }) as SafeApiResponse<TEndpoint>;
 
           if (throwOnStatusError && errorStatusCodes.includes(response.status as never)) {
-            throw new TypedResponseError(typedResponse as never);
+            throw new TypedStatusError(typedResponse as never);
           }
 
           return withResponse ? typedResponse : data;

package/src/tanstack-query.generator.ts

@@ -13,7 +13,7 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
   const file = `
   import { queryOptions } from "@tanstack/react-query"
   import type { EndpointByMethod, ApiClient, SuccessStatusCode, ErrorStatusCode, InferResponseByStatus, TypedSuccessResponse } from "${ctx.relativeApiClientPath}"
-  import { errorStatusCodes, TypedResponseError } from "${ctx.relativeApiClientPath}"
+  import { errorStatusCodes, TypedStatusError } from "${ctx.relativeApiClientPath}"
 
   type EndpointQueryKey<TOptions extends EndpointParameters> = [
       TOptions & {
@@ -131,7 +131,7 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
                 : InferResponseData<TEndpoint, SuccessStatusCode>,
             TError = TEndpoint extends { responses: infer TResponses }
                 ? TResponses extends Record<string | number, unknown>
-                    ? InferResponseByStatus<TEndpoint, ErrorStatusCode>
+                    ? TypedStatusError<InferResponseData<TEndpoint, ErrorStatusCode>>
                     : Error
                 : Error
         >(method: TMethod, path: TPath, options?: {
@@ -144,15 +144,11 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
              throwOnError?: boolean | ((error: TError) => boolean)
         }) {
             const mutationKey = [{ method, path }] as const;
-            const mutationFn = async <TLocalWithResponse extends boolean = TWithResponse, TLocalSelection = TLocalWithResponse extends true
-                ? InferResponseByStatus<TEndpoint, SuccessStatusCode>
-                : InferResponseData<TEndpoint, SuccessStatusCode>>
-            (params: (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
-                withResponse?: TLocalWithResponse;
+            const mutationFn = async (params: (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
                 throwOnStatusError?: boolean;
                 overrides?: RequestInit;
-            }): Promise<TLocalSelection> => {
-                const withResponse = params.withResponse ??options?.withResponse ?? false;
+            }): Promise<TSelection> => {
+                const 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, {
@@ -162,7 +158,7 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
                 });
 
                 if (throwOnStatusError && errorStatusCodes.includes(response.status as never)) {
-                    throw new TypedResponseError(response as never);
+                    throw new TypedStatusError(response as never);
                 }
 
                 // Return just the data if withResponse is false, otherwise return the full response
@@ -183,8 +179,8 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
                 TSelection,
                 TError,
                 (TEndpoint extends { parameters: infer Parameters } ? Parameters : {}) & {
-                withResponse?: boolean;
-                throwOnStatusError?: boolean;
+                    withResponse?: boolean;
+                    throwOnStatusError?: boolean;
                 }
             >, "mutationFn"> & {
                 mutationFn: typeof mutationFn