@orpc/client 2.0.0-beta.44 → 2.0.0-beta.46

package/dist/plugins/index.d.ts

@@ -3,7 +3,19 @@ import { StandardUrl, StandardHeaders, StandardRequest, StandardLazyResponse } f
 import { ClientContext } from '../index.js';
 import { StandardLinkPlugin, StandardLinkTransportInterceptorOptions, StandardLinkOptions, StandardLinkInterceptorOptions } from '../adapters/standard/index.js';
 
-type BatchLinkPluginMode = 'streaming' | 'buffered';
+/**
+ * Header that marks a request as a batch, set by the Batch Link Plugin and detected by the Batch Handler Plugin.
+ * Nothing between the client and server, such as a CORS policy or proxy, should block or strip it.
+ *
+ * @see {@link https://orpc.dev/docs/plugins/batch#setup | Batch Plugin - Setup}
+ */
+declare const BATCH_HEADER = "orpc-batch";
+/**
+ * Default `maxSize` of both the Batch Link Plugin and the Batch Handler Plugin.
+ *
+ * @see {@link https://orpc.dev/docs/plugins/batch#max-size | Batch Plugin - Max Size}
+ */
+declare const DEFAULT_BATCH_MAX_SIZE = 10;
 interface BatchLinkPluginGroup<T extends ClientContext> {
     /**
      * Determines whether a request should be included in this batch group.
@@ -21,7 +33,7 @@ interface BatchLinkPluginGroup<T extends ClientContext> {
      *
      * @default []
      */
-    path?: Value<string[], [items: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    path?: Value<string[], [items: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]> | undefined;
 }
 interface BatchLinkPluginOptions<T extends ClientContext> {
     groups: [BatchLinkPluginGroup<T>, ...BatchLinkPluginGroup<T>[]];
@@ -30,20 +42,22 @@ interface BatchLinkPluginOptions<T extends ClientContext> {
      *
      * @default () => true
      */
-    filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]>;
+    filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]> | undefined;
     /**
      * Only requests with the same scope are batched together.
      * On the server, return a value unique to the incoming request so different users never share a batch.
      *
      * @default () => undefined
      */
-    scope?: (options: StandardLinkTransportInterceptorOptions<T>) => unknown;
+    scope?: ((options: StandardLinkTransportInterceptorOptions<T>) => unknown) | undefined;
     /**
-     * The maximum number of requests in the batch.
+     * The maximum number of requests in the batch. Larger batches are split.
+     * Keep it at or below the server Batch Handler Plugin's `maxSize`, which rejects larger batches with a `413`.
      *
-     * @default 10
+     * @default DEFAULT_BATCH_MAX_SIZE (10)
+     * @see {@link https://orpc.dev/docs/plugins/batch#max-size | Batch Plugin - Max Size}
      */
-    maxSize?: Value<Promisable<number>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    maxSize?: Value<Promisable<number>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]> | undefined;
     /**
      * How long (in ms) to wait for more requests before sending the batch,
      * counted from the first queued request.
@@ -51,20 +65,13 @@ interface BatchLinkPluginOptions<T extends ClientContext> {
      *
      * @default 0
      */
-    wait?: number;
-    /**
-     * The batch response mode.
-     * A `buffered` batch still streams once a procedure in it returns a stream.
-     *
-     * @default 'streaming'
-     */
-    mode?: Value<BatchLinkPluginMode, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    wait?: number | undefined;
     /**
      * URL for the batch request.
      *
      * @default URL of the first subrequest in the batch + '/__batch__'
      */
-    url?: Value<Promisable<StandardUrl>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    url?: Value<Promisable<StandardUrl>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]> | undefined;
     /**
      * The maximum length of the URL that runtime supports,
      * if exceeded, the batch will be split into smaller batches and sent sequentially.
@@ -73,25 +80,25 @@ interface BatchLinkPluginOptions<T extends ClientContext> {
      *
      * @default 2083
      */
-    maxUrlLength?: Value<Promisable<number>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    maxUrlLength?: Value<Promisable<number>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]> | undefined;
     /**
      * Headers used for the batch request.
      *
      * @default Common headers among all subrequests in the batch.
      */
-    headers?: Value<Promisable<StandardHeaders>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]>;
+    headers?: Value<Promisable<StandardHeaders>, [subOptionsList: [StandardLinkTransportInterceptorOptions<T>, ...StandardLinkTransportInterceptorOptions<T>[]]]> | undefined;
     /**
      * Map each subrequest in the batch before it is sent.
      *
      * @default Removes headers that are duplicated with the batch headers
      */
-    mapSubrequest?: (subOptions: StandardLinkTransportInterceptorOptions<T>, partialBatchRequest: Pick<StandardRequest, 'url' | 'headers'>) => StandardRequest;
+    mapSubrequest?: ((subOptions: StandardLinkTransportInterceptorOptions<T>, partialBatchRequest: Pick<StandardRequest, 'url' | 'headers'>) => StandardRequest) | undefined;
     /**
      * Maps each subresponse before returning the final response.
      *
      * @default Low-priority merges headers from the batch response into each subresponse.
      */
-    mapSubresponse?: (subResponse: StandardLazyResponse, batchResponse: StandardLazyResponse, subOptions: StandardLinkTransportInterceptorOptions<T>) => StandardLazyResponse;
+    mapSubresponse?: ((subResponse: StandardLazyResponse, batchResponse: StandardLazyResponse, subOptions: StandardLinkTransportInterceptorOptions<T>) => StandardLazyResponse) | undefined;
 }
 /**
  * Combines multiple client requests into a single batch request
@@ -109,7 +116,6 @@ declare class BatchLinkPlugin<T extends ClientContext> implements StandardLinkPl
     private readonly scope;
     private readonly maxSize;
     private readonly wait;
-    private readonly mode;
     private readonly batchUrl;
     private readonly maxUrlLength;
     private readonly batchHeaders;
@@ -152,14 +158,14 @@ interface DedupeLinkPluginOptions<T extends ClientContext> {
      *
      * @default ({ request }) => request.method === 'GET' || request.method === 'QUERY'
      */
-    filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]>;
+    filter?: Value<boolean, [options: StandardLinkTransportInterceptorOptions<T>]> | undefined;
     /**
      * Only requests with the same scope are deduplicated together.
      * On the server, return a value unique to the incoming request so different users never share a response.
      *
      * @default () => undefined
      */
-    scope?: (options: StandardLinkTransportInterceptorOptions<T>) => unknown;
+    scope?: ((options: StandardLinkTransportInterceptorOptions<T>) => unknown) | undefined;
     /**
      * How long (in ms) to wait for more identical requests before sending,
      * counted from the first queued request.
@@ -167,7 +173,7 @@ interface DedupeLinkPluginOptions<T extends ClientContext> {
      *
      * @default 0
      */
-    wait?: number;
+    wait?: number | undefined;
 }
 /**
  * Prevents redundant requests by deduplicating similar in-flight requests,
@@ -196,7 +202,7 @@ interface RequestCompressionLinkPluginOptions<T extends ClientContext> {
      *
      * @default 'gzip'
      */
-    encoding?: 'gzip' | 'deflate' | 'deflate-raw';
+    encoding?: 'gzip' | 'deflate' | 'deflate-raw' | undefined;
     /**
      * The minimum request size in bytes required to trigger compression.
      * Requests smaller than this threshold will not be compressed to avoid overhead.
@@ -204,7 +210,7 @@ interface RequestCompressionLinkPluginOptions<T extends ClientContext> {
      *
      * @default 1024 (1KB)
      */
-    threshold?: number;
+    threshold?: number | undefined;
     /**
      * Determines whether a request with the given Content-Type should be compressed.
      * Only consulted for binary transfers (streams, files, and file form-data parts).
@@ -212,7 +218,7 @@ interface RequestCompressionLinkPluginOptions<T extends ClientContext> {
      *
      * @default isCompressibleContentType (covers common text-based formats)
      */
-    isCompressibleContentType?: (contentType: string | null | undefined, options: StandardLinkTransportInterceptorOptions<T>) => boolean;
+    isCompressibleContentType?: ((contentType: string | null | undefined, options: StandardLinkTransportInterceptorOptions<T>) => boolean) | undefined;
 }
 /**
  * Compresses request bodies before sending them to the server,
@@ -240,7 +246,7 @@ interface ResponseCompressionLinkPluginOptions<_T extends ClientContext> {
      *
      * @default ['gzip', 'deflate']
      */
-    encodings?: readonly ('gzip' | 'deflate' | 'deflate-raw')[];
+    encodings?: readonly ('gzip' | 'deflate' | 'deflate-raw')[] | undefined;
 }
 /**
  * Advertises Accept-Encoding on requests and decompresses response bodies
@@ -287,7 +293,7 @@ interface RetryLinkPluginContext {
      *
      * @default 0
      */
-    retry?: Value<Promisable<number>, [Omit<StandardLinkInterceptorOptions<RetryLinkPluginContext>, 'next'>]>;
+    retry?: Value<Promisable<number>, [Omit<StandardLinkInterceptorOptions<RetryLinkPluginContext>, 'next'>]> | undefined;
     /**
      * Delay (in ms) before retrying.
      *
@@ -296,17 +302,17 @@ interface RetryLinkPluginContext {
      *
      * @default (o) => o.lastEventRetry ?? 2000
      */
-    retryDelay?: Value<Promisable<number>, [RetryLinkPluginAttemptOptions<RetryLinkPluginContext>]>;
+    retryDelay?: Value<Promisable<number>, [RetryLinkPluginAttemptOptions<RetryLinkPluginContext>]> | undefined;
     /**
      * Determine whether to retry.
      *
-     * @default true
+     * @default (o) => isRetryableError(o.error)
      */
-    shouldRetry?: Value<Promisable<boolean>, [RetryLinkPluginAttemptOptions<RetryLinkPluginContext>]>;
+    shouldRetry?: Value<Promisable<boolean>, [RetryLinkPluginAttemptOptions<RetryLinkPluginContext>]> | undefined;
     /**
      * Hook called before each retry. Can return a cleanup callback.
      */
-    onRetry?: (options: RetryLinkPluginAttemptOptions<RetryLinkPluginContext>) => void | ((isSuccess: boolean) => void);
+    onRetry?: ((options: RetryLinkPluginAttemptOptions<RetryLinkPluginContext>) => void | ((isSuccess: boolean) => void)) | undefined;
 }
 interface RetryLinkPluginOptions<_T extends RetryLinkPluginContext> {
     /**
@@ -314,6 +320,13 @@ interface RetryLinkPluginOptions<_T extends RetryLinkPluginContext> {
      */
     default?: RetryLinkPluginContext | undefined;
 }
+/**
+ * Default `shouldRetry` check of `RetryLinkPlugin`. Returns `false` only for errors
+ * from a 4xx response other than `408` and `429`.
+ *
+ * @see {@link https://orpc.dev/docs/plugins/retry#client-error-responses | Retry Plugin - Client Error Responses}
+ */
+declare function isRetryableError(error: unknown): boolean;
 /**
  * Automatically retries failed requests based on customizable retry strategies,
  * improving the resilience of your application.
@@ -342,7 +355,7 @@ interface RetryAfterLinkPluginOptions<T extends ClientContext> {
     condition?: Value<boolean, [
         response: StandardLazyResponse,
         options: StandardLinkTransportInterceptorOptions<T>
-    ]>;
+    ]> | undefined;
     /**
      * Maximum attempts before giving up retries.
      *
@@ -351,7 +364,7 @@ interface RetryAfterLinkPluginOptions<T extends ClientContext> {
     maxAttempts?: Value<number, [
         response: StandardLazyResponse,
         options: StandardLinkTransportInterceptorOptions<T>
-    ]>;
+    ]> | undefined;
     /**
      * Maximum timeout in milliseconds to wait before giving up retries.
      *
@@ -360,7 +373,7 @@ interface RetryAfterLinkPluginOptions<T extends ClientContext> {
     timeout?: Value<number, [
         response: StandardLazyResponse,
         options: StandardLinkTransportInterceptorOptions<T>
-    ]>;
+    ]> | undefined;
 }
 /**
  * The Retry After Link Plugin automatically retries requests based on server `retry-after` header.
@@ -403,5 +416,5 @@ declare class TimeoutLinkPlugin<T extends ClientContext> implements StandardLink
     init(options: StandardLinkOptions<T>): StandardLinkOptions<T>;
 }
 
-export { BatchLinkPlugin, RetryLinkPlugin as ClientRetryPlugin, DedupeLinkPlugin, DedupeLinkPlugin as DedupeRequestsPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryAfterLinkPlugin as RetryAfterPlugin, RetryLinkPlugin, TimeoutLinkPlugin };
-export type { BatchLinkPluginGroup, BatchLinkPluginMode, BatchLinkPluginOptions, RetryLinkPluginContext as ClientRetryPluginContext, DedupeLinkPluginGroup, DedupeLinkPluginOptions, RequestCompressionLinkPluginOptions, ResponseCompressionLinkPluginOptions, RetryAfterLinkPluginOptions, RetryLinkPluginAttemptOptions, RetryLinkPluginContext, RetryLinkPluginOptions, TimeoutLinkPluginOptions };
+export { BATCH_HEADER, BatchLinkPlugin, RetryLinkPlugin as ClientRetryPlugin, DEFAULT_BATCH_MAX_SIZE, DedupeLinkPlugin, DedupeLinkPlugin as DedupeRequestsPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryAfterLinkPlugin as RetryAfterPlugin, RetryLinkPlugin, TimeoutLinkPlugin, isRetryableError };
+export type { BatchLinkPluginGroup, BatchLinkPluginOptions, RetryLinkPluginContext as ClientRetryPluginContext, DedupeLinkPluginGroup, DedupeLinkPluginOptions, RequestCompressionLinkPluginOptions, ResponseCompressionLinkPluginOptions, RetryAfterLinkPluginOptions, RetryLinkPluginAttemptOptions, RetryLinkPluginContext, RetryLinkPluginOptions, TimeoutLinkPluginOptions };

package/dist/plugins/index.mjs

@@ -1,9 +1,11 @@
 import { toArray, value, splitInHalf, promiseWithResolvers, safeEncodeURIComponent, stringifyJSON, once, isAsyncIteratorObject, defer, captureAsyncContext, loadBytes, allAbortSignal, runWithSignal, replicateAsyncIterator, replicateReadableStream, wrapAsyncIterator, throwIfAborted, isCompressibleContentType, override, AsyncIteratorClass, sleep, AbortError, anyAbortSignal } from '@orpc/shared';
 import { parseStandardUrl, flattenStandardHeader, generateContentDisposition, getEventMeta } from '@standard-server/core';
-import { ClientPeer, isServerPeerSendMessage, decodePeerMessage } from '@standard-server/peer';
+import { ClientPeer, isPeerMessage, isServerPeerSendMessage, decodePeerMessage } from '@standard-server/peer';
 import { toFetchHeaders, toStandardBody } from '@standard-server/fetch';
-import { C as COMMON_ERROR_STATUS_MAP } from '../shared/client.CrHurHrq.mjs';
+import { O as ORPCError, R as ResponseError, C as COMMON_ERROR_STATUS_MAP } from '../shared/client.LF04eOvL.mjs';
 
+const BATCH_HEADER = "orpc-batch";
+const DEFAULT_BATCH_MAX_SIZE = 10;
 class BatchLinkPlugin {
   name = "~batch";
   groups;
@@ -11,7 +13,6 @@ class BatchLinkPlugin {
   scope;
   maxSize;
   wait;
-  mode;
   batchUrl;
   maxUrlLength;
   batchHeaders;
@@ -22,9 +23,8 @@ class BatchLinkPlugin {
     this.groups = options.groups;
     this.filter = options.filter ?? (() => true);
     this.scope = options.scope ?? (() => void 0);
-    this.maxSize = options.maxSize ?? 10;
+    this.maxSize = options.maxSize ?? DEFAULT_BATCH_MAX_SIZE;
     this.wait = options.wait ?? 0;
-    this.mode = options.mode ?? "streaming";
     this.batchUrl = options.url ?? ((options2) => {
       const [pathname] = parseStandardUrl(options2[0].request.url);
       return `${pathname}/__batch__`;
@@ -141,7 +141,6 @@ class BatchLinkPlugin {
       }
       const url = await value(this.batchUrl, subOptionsList);
       const headers = await value(this.batchHeaders, subOptionsList);
-      const mode = value(this.mode, subOptionsList);
       let suppressErrorFromCurrentBatch = false;
       const controller = new AbortController();
       const pendingMessages = [];
@@ -185,7 +184,7 @@ class BatchLinkPlugin {
         const request = {
           url,
           method,
-          headers: { ...headers, "orpc-batch": mode },
+          headers: { ...headers, [BATCH_HEADER]: "1" },
           signal: controller.signal
         };
         if (method === "GET") {
@@ -225,7 +224,7 @@ class BatchLinkPlugin {
           return;
         }
         const body = await batchResponse.resolveBody();
-        if (Array.isArray(body) && body.every((v) => isServerPeerSendMessage(v))) {
+        if (Array.isArray(body) && body.every((v) => isPeerMessage(v) && isServerPeerSendMessage(v))) {
           for (const message of body) {
             await peer.message(message);
           }
@@ -745,6 +744,14 @@ function parseContentEncodings(header) {
   return header.split(",").map((part) => part.trim().toLowerCase());
 }
 
+function isRetryableError(error) {
+  const responseError = error instanceof ORPCError ? error.cause : error;
+  if (!(responseError instanceof ResponseError)) {
+    return true;
+  }
+  const { status } = responseError.response;
+  return status < 400 || status >= 500 || status === COMMON_ERROR_STATUS_MAP.TIMEOUT || status === COMMON_ERROR_STATUS_MAP.TOO_MANY_REQUESTS;
+}
 class RetryLinkPlugin {
   defaultRetry;
   defaultRetryDelay;
@@ -754,7 +761,7 @@ class RetryLinkPlugin {
   constructor(options = {}) {
     this.defaultRetry = options.default?.retry ?? 0;
     this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
-    this.defaultShouldRetry = options.default?.shouldRetry ?? true;
+    this.defaultShouldRetry = options.default?.shouldRetry ?? ((o) => isRetryableError(o.error));
     this.defaultOnRetry = options.default?.onRetry;
   }
   init(options) {
@@ -961,4 +968,4 @@ class TimeoutLinkPlugin {
   }
 }
 
-export { BatchLinkPlugin, RetryLinkPlugin as ClientRetryPlugin, DedupeLinkPlugin, DedupeLinkPlugin as DedupeRequestsPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryAfterLinkPlugin as RetryAfterPlugin, RetryLinkPlugin, TimeoutLinkPlugin };
+export { BATCH_HEADER, BatchLinkPlugin, RetryLinkPlugin as ClientRetryPlugin, DEFAULT_BATCH_MAX_SIZE, DedupeLinkPlugin, DedupeLinkPlugin as DedupeRequestsPlugin, RequestCompressionLinkPlugin, ResponseCompressionLinkPlugin, RetryAfterLinkPlugin, RetryAfterLinkPlugin as RetryAfterPlugin, RetryLinkPlugin, TimeoutLinkPlugin, isRetryableError };

package/dist/shared/{client.DZHZRyR6.d.mts → client.BoHJeq15.d.mts}

@@ -10,7 +10,7 @@ interface ClientOptions<T extends ClientContext> {
     context: T;
 }
 type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (object extends T ? {
-    context?: T;
+    context?: T | undefined;
 } : {
     context: T;
 });
@@ -134,7 +134,7 @@ type ORPCErrorCode = Registry extends {
     ORPCErrorCode: infer T extends string;
 } ? T : (keyof typeof COMMON_ERROR_STATUS_MAP) | (string & {});
 type ORPCErrorOptions<TData> = ErrorOptions & {
-    message?: string;
+    message?: string | undefined;
 } & (undefined extends TData ? {
     data?: TData;
 } : {
@@ -186,18 +186,37 @@ interface ORPCErrorJSON<TCode extends string, TData> extends Pick<ORPCError<TCod
 }
 type AnyORPCError = ORPCError<any, any>;
 type AnyORPCErrorJSON = ORPCErrorJSON<any, any>;
-interface MalformedResponseErrorOptions extends ErrorOptions {
+interface ResponseErrorOptions extends ErrorOptions {
     /**
-     * @default inferred from the response body or status
+     * @default inferred from the response status
      */
-    message?: string;
+    message?: string | undefined;
     response: StandardResponse;
 }
+/**
+ * Error carrying the resolved response a link received. Links set it as the `cause`
+ * of an `ORPCError` decoded from an error response, so details that are not part
+ * of the error itself, such as its status or headers, stay available.
+ *
+ * @see {@link https://orpc.dev/docs/rpc/link#error-responses | RPC Link - Error Responses}
+ * @see {@link https://orpc.dev/docs/openapi/link#error-responses | OpenAPI Link - Error Responses}
+ */
+declare class ResponseError extends Error {
+    readonly name: string;
+    response: StandardResponse;
+    constructor(options: ResponseErrorOptions);
+}
+interface MalformedResponseErrorOptions extends ResponseErrorOptions {
+    /**
+     * @default inferred from the response body or status
+     */
+    message?: string | undefined;
+}
 /**
  * Error thrown by links when a response does not follow the expected oRPC format,
- * for example when a proxy or gateway answers instead of your handler. Carries the
- * resolved response. Unless overridden via `options.message`, the message is
- * inferred from the response body or status.
+ * for example when a proxy or gateway answers instead of your handler. Extends
+ * `ResponseError`, so it carries the resolved response. Unless overridden via
+ * `options.message`, the message is inferred from the response body or status.
  *
  * Unlike `ORPCError`, it reaches a handler's callers as a generic `INTERNAL_SERVER_ERROR`
  * when thrown from the handler, so an upstream's response is not sent to them.
@@ -205,11 +224,10 @@ interface MalformedResponseErrorOptions extends ErrorOptions {
  * @see {@link https://orpc.dev/docs/rpc/link#malformed-responses | RPC Link - Malformed Responses}
  * @see {@link https://orpc.dev/docs/openapi/link#malformed-responses | OpenAPI Link - Malformed Responses}
  */
-declare class MalformedResponseError extends Error {
+declare class MalformedResponseError extends ResponseError {
     readonly name = "MalformedResponseError";
-    response: StandardResponse;
     constructor(options: MalformedResponseErrorOptions);
 }
 
-export { MalformedResponseError as M, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
-export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q };
+export { MalformedResponseError as M, ResponseError as R, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
+export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q, ResponseErrorOptions as r };

package/dist/shared/{client.DZHZRyR6.d.ts → client.BoHJeq15.d.ts}

@@ -10,7 +10,7 @@ interface ClientOptions<T extends ClientContext> {
     context: T;
 }
 type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (object extends T ? {
-    context?: T;
+    context?: T | undefined;
 } : {
     context: T;
 });
@@ -134,7 +134,7 @@ type ORPCErrorCode = Registry extends {
     ORPCErrorCode: infer T extends string;
 } ? T : (keyof typeof COMMON_ERROR_STATUS_MAP) | (string & {});
 type ORPCErrorOptions<TData> = ErrorOptions & {
-    message?: string;
+    message?: string | undefined;
 } & (undefined extends TData ? {
     data?: TData;
 } : {
@@ -186,18 +186,37 @@ interface ORPCErrorJSON<TCode extends string, TData> extends Pick<ORPCError<TCod
 }
 type AnyORPCError = ORPCError<any, any>;
 type AnyORPCErrorJSON = ORPCErrorJSON<any, any>;
-interface MalformedResponseErrorOptions extends ErrorOptions {
+interface ResponseErrorOptions extends ErrorOptions {
     /**
-     * @default inferred from the response body or status
+     * @default inferred from the response status
      */
-    message?: string;
+    message?: string | undefined;
     response: StandardResponse;
 }
+/**
+ * Error carrying the resolved response a link received. Links set it as the `cause`
+ * of an `ORPCError` decoded from an error response, so details that are not part
+ * of the error itself, such as its status or headers, stay available.
+ *
+ * @see {@link https://orpc.dev/docs/rpc/link#error-responses | RPC Link - Error Responses}
+ * @see {@link https://orpc.dev/docs/openapi/link#error-responses | OpenAPI Link - Error Responses}
+ */
+declare class ResponseError extends Error {
+    readonly name: string;
+    response: StandardResponse;
+    constructor(options: ResponseErrorOptions);
+}
+interface MalformedResponseErrorOptions extends ResponseErrorOptions {
+    /**
+     * @default inferred from the response body or status
+     */
+    message?: string | undefined;
+}
 /**
  * Error thrown by links when a response does not follow the expected oRPC format,
- * for example when a proxy or gateway answers instead of your handler. Carries the
- * resolved response. Unless overridden via `options.message`, the message is
- * inferred from the response body or status.
+ * for example when a proxy or gateway answers instead of your handler. Extends
+ * `ResponseError`, so it carries the resolved response. Unless overridden via
+ * `options.message`, the message is inferred from the response body or status.
  *
  * Unlike `ORPCError`, it reaches a handler's callers as a generic `INTERNAL_SERVER_ERROR`
  * when thrown from the handler, so an upstream's response is not sent to them.
@@ -205,11 +224,10 @@ interface MalformedResponseErrorOptions extends ErrorOptions {
  * @see {@link https://orpc.dev/docs/rpc/link#malformed-responses | RPC Link - Malformed Responses}
  * @see {@link https://orpc.dev/docs/openapi/link#malformed-responses | OpenAPI Link - Malformed Responses}
  */
-declare class MalformedResponseError extends Error {
+declare class MalformedResponseError extends ResponseError {
     readonly name = "MalformedResponseError";
-    response: StandardResponse;
     constructor(options: MalformedResponseErrorOptions);
 }
 
-export { MalformedResponseError as M, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
-export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q };
+export { MalformedResponseError as M, ResponseError as R, ORPCError as h, COMMON_ERROR_STATUS_MAP as j };
+export type { AnyORPCError as A, ClientContext as C, FriendlyClientOptions as F, InferClientContext as I, NestedClient as N, ORPCErrorCode as O, ClientOptions as a, ClientLink as b, AnyNestedClient as c, InferClientError as d, Client as e, ClientRest as f, ORPCErrorJSON as g, AnyORPCErrorJSON as i, InferClientBodyInputs as k, InferClientBodyOutputs as l, InferClientErrors as m, InferClientInputs as n, InferClientOutputs as o, MalformedResponseErrorOptions as p, ORPCErrorOptions as q, ResponseErrorOptions as r };

package/dist/shared/{client.B7P_ugvl.mjs → client.CKQeJJ2U.mjs}

@@ -1,8 +1,8 @@
 import { sortPlugins, runWithSpan, ORPC_NAME, getTracer, isAsyncIteratorObject, override, traceAsyncIterator, traceReadableStream, intercept, value, pathToHttpPath, stringifyJSON } from '@orpc/shared';
 import { mergeStandardHeaders, parseStandardUrl } from '@standard-server/core';
 import { toStandardHeaders } from '@standard-server/fetch';
-import { M as MalformedResponseError } from './client.CrHurHrq.mjs';
-import { R as RPCSerializer, i as isORPCErrorJson, c as createORPCErrorFromJson } from './client.BLfXUpyF.mjs';
+import { M as MalformedResponseError, R as ResponseError } from './client.LF04eOvL.mjs';
+import { R as RPCSerializer, i as isORPCErrorJson, c as createORPCErrorFromJson } from './client._wG5INmC.mjs';
 
 class CompositeStandardLinkPlugin {
   name = "~composite";
@@ -150,7 +150,12 @@ class RPCLinkCodec {
     })();
     if (!isOk) {
       if (isORPCErrorJson(deserialized)) {
-        return { kind: "error", error: createORPCErrorFromJson(deserialized) };
+        return {
+          kind: "error",
+          error: createORPCErrorFromJson(deserialized, {
+            cause: new ResponseError({ response: { status: response.status, headers: response.headers, body } })
+          })
+        };
       }
       throw new MalformedResponseError({ response: { headers: response.headers, status: response.status, body } });
     }
@@ -164,4 +169,4 @@ function toResolvedStandardHeaders(headers) {
   return headers;
 }
 
-export { CompositeStandardLinkPlugin as C, RPCLinkCodec as R, StandardLink as S };
+export { RPCLinkCodec as R, StandardLink as S };

package/dist/shared/{client.BPa_Mmuh.d.mts → client.DqIWeNhQ.d.mts}

@@ -28,7 +28,7 @@ interface RPCJsonSerializerHandler {
      *
      * @default false
      */
-    isTerminal?: boolean;
+    isTerminal?: boolean | undefined;
 }
 interface RPCJsonSerializerOptions {
     /**
@@ -88,13 +88,13 @@ declare class RPCJsonSerializer {
     private readonly handlerEntries;
     private readonly omitUndefinedProperties;
     constructor(options?: RPCJsonSerializerOptions);
-    serialize(data: unknown): RPCJsonSerialization;
+    serializeJson(data: unknown): RPCJsonSerialization;
     /**
      * `segments` is a shared mutable stack (push/pop while walking),
      * so it must be copied before being stored in `meta` or `maps`.
      */
     private serializeValue;
-    deserialize(serialized: RPCJsonSerialization): unknown;
+    deserializeJson(serialized: RPCJsonSerialization): unknown;
 }
 
 interface RPCSerializerSerializeOptions {
@@ -104,7 +104,7 @@ interface RPCSerializerSerializeOptions {
      *
      * @default true
      */
-    useFormDataForBlobFields?: boolean;
+    useFormDataForBlobFields?: boolean | undefined;
 }
 interface RPCSerializerOptions extends RPCJsonSerializerOptions {
     /**
@@ -118,14 +118,13 @@ interface RPCSerializerOptions extends RPCJsonSerializerOptions {
  *
  * @see {@link https://orpc.dev/docs/rpc/serializer | RPC Serializer}
  */
-declare class RPCSerializer {
-    private readonly jsonSerializer;
+declare class RPCSerializer extends RPCJsonSerializer {
     private readonly defaultSerializeOptions;
     constructor(options?: RPCSerializerOptions);
     serialize(data: unknown, options?: RPCSerializerSerializeOptions): StandardBody;
-    private serializeValue;
+    private serializePayload;
     deserialize(data: StandardBody): unknown;
-    private deserializeValue;
+    private deserializePayload;
 }
 
 export { RPCJsonSerializer as b, RPCSerializer as e };

package/dist/shared/{client.BPa_Mmuh.d.ts → client.DqIWeNhQ.d.ts}

@@ -28,7 +28,7 @@ interface RPCJsonSerializerHandler {
      *
      * @default false
      */
-    isTerminal?: boolean;
+    isTerminal?: boolean | undefined;
 }
 interface RPCJsonSerializerOptions {
     /**
@@ -88,13 +88,13 @@ declare class RPCJsonSerializer {
     private readonly handlerEntries;
     private readonly omitUndefinedProperties;
     constructor(options?: RPCJsonSerializerOptions);
-    serialize(data: unknown): RPCJsonSerialization;
+    serializeJson(data: unknown): RPCJsonSerialization;
     /**
      * `segments` is a shared mutable stack (push/pop while walking),
      * so it must be copied before being stored in `meta` or `maps`.
      */
     private serializeValue;
-    deserialize(serialized: RPCJsonSerialization): unknown;
+    deserializeJson(serialized: RPCJsonSerialization): unknown;
 }
 
 interface RPCSerializerSerializeOptions {
@@ -104,7 +104,7 @@ interface RPCSerializerSerializeOptions {
      *
      * @default true
      */
-    useFormDataForBlobFields?: boolean;
+    useFormDataForBlobFields?: boolean | undefined;
 }
 interface RPCSerializerOptions extends RPCJsonSerializerOptions {
     /**
@@ -118,14 +118,13 @@ interface RPCSerializerOptions extends RPCJsonSerializerOptions {
  *
  * @see {@link https://orpc.dev/docs/rpc/serializer | RPC Serializer}
  */
-declare class RPCSerializer {
-    private readonly jsonSerializer;
+declare class RPCSerializer extends RPCJsonSerializer {
     private readonly defaultSerializeOptions;
     constructor(options?: RPCSerializerOptions);
     serialize(data: unknown, options?: RPCSerializerSerializeOptions): StandardBody;
-    private serializeValue;
+    private serializePayload;
     deserialize(data: StandardBody): unknown;
-    private deserializeValue;
+    private deserializePayload;
 }
 
 export { RPCJsonSerializer as b, RPCSerializer as e };