@orpc/client 2.0.0-beta.36 → 2.0.0-beta.37

package/dist/adapters/fetch/index.d.mts

@@ -1,17 +1,11 @@
 import { ClientContext, ClientOptions } from '../../index.mjs';
-import { Value, Promisable, Interceptor } from '@orpc/shared';
+import { Value, Promisable } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ToFetchBodyOptions } from '@standard-server/fetch';
-import { StandardLinkTransport, StandardLinkPlugin, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
+import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
 import { RPCLinkCodecOptions } from '../standard/index.mjs';
-import '../../shared/client.DPi5reJh.mjs';
+import '../../shared/client.n8K9dFhY.mjs';
 
-interface FetchLinkTransportFetchInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
-    path: string[];
-    url: string;
-    init: RequestInit;
-}
-type FetchLinkTransportFetchInterceptor<T extends ClientContext> = Interceptor<FetchLinkTransportFetchInterceptorOptions<T>, Promise<Response>>;
 interface FetchLinkTransportOptions<T extends ClientContext> {
     /**
      * The origin to prepend to all request URLs, useful for CORS requests.
@@ -30,32 +24,16 @@ interface FetchLinkTransportOptions<T extends ClientContext> {
      * @default (url, init) => globalThis.fetch(url, init)
      */
     fetch?(url: string, init: RequestInit, options: ClientOptions<T>, path: string[]): Promise<Response>;
-    /**
-     * Interceptors that execute before the actual fetch call, useful for modifying the fetch parameters, adding logging, etc.
-     */
-    fetchInterceptors?: FetchLinkTransportFetchInterceptor<T>[];
-    plugins?: FetchLinkTransportPlugin<T>[];
 }
 declare class FetchLinkTransport<T extends ClientContext> implements StandardLinkTransport<T> {
     private readonly origin;
     private readonly fetch;
     private readonly toFetchRequestOptions;
-    private readonly fetchInterceptors;
     constructor(options: FetchLinkTransportOptions<T>);
     send(standardRequest: StandardRequest, path: string[], options: ClientOptions<T>): Promise<StandardLazyResponse>;
 }
 
-interface FetchLinkTransportPlugin<T extends ClientContext> extends StandardLinkPlugin<T> {
-    initFetchLinkTransportOptions?(options: FetchLinkTransportOptions<T>): FetchLinkTransportOptions<T>;
-}
-declare class CompositeFetchLinkTransportPlugin<T extends ClientContext> implements FetchLinkTransportPlugin<T> {
-    protected readonly plugins: FetchLinkTransportPlugin<T>[];
-    name: string;
-    constructor(plugins?: FetchLinkTransportPlugin<T>[]);
-    initFetchLinkTransportOptions(options: FetchLinkTransportOptions<T>): FetchLinkTransportOptions<T>;
-}
-
-interface RPCLinkOptions<T extends ClientContext> extends Omit<StandardLinkOptions<T>, 'plugins'>, FetchLinkTransportOptions<T>, RPCLinkCodecOptions<T> {
+interface RPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, FetchLinkTransportOptions<T>, RPCLinkCodecOptions<T> {
 }
 /**
  * Client link that communicates with an RPC Handler over the Fetch API (HTTP).
@@ -66,5 +44,5 @@ declare class RPCLink<T extends ClientContext> extends StandardLink<T> {
     constructor(options: RPCLinkOptions<T>);
 }
 
-export { CompositeFetchLinkTransportPlugin, FetchLinkTransport, RPCLink };
-export type { FetchLinkTransportFetchInterceptor, FetchLinkTransportFetchInterceptorOptions, FetchLinkTransportOptions, FetchLinkTransportPlugin, RPCLinkOptions };
+export { FetchLinkTransport, RPCLink };
+export type { FetchLinkTransportOptions, RPCLinkOptions };

package/dist/adapters/fetch/index.d.ts

@@ -1,17 +1,11 @@
 import { ClientContext, ClientOptions } from '../../index.js';
-import { Value, Promisable, Interceptor } from '@orpc/shared';
+import { Value, Promisable } from '@orpc/shared';
 import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ToFetchBodyOptions } from '@standard-server/fetch';
-import { StandardLinkTransport, StandardLinkPlugin, StandardLink, StandardLinkOptions } from '../standard/index.js';
+import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.js';
 import { RPCLinkCodecOptions } from '../standard/index.js';
-import '../../shared/client.DPi5reJh.js';
+import '../../shared/client.n8K9dFhY.js';
 
-interface FetchLinkTransportFetchInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
-    path: string[];
-    url: string;
-    init: RequestInit;
-}
-type FetchLinkTransportFetchInterceptor<T extends ClientContext> = Interceptor<FetchLinkTransportFetchInterceptorOptions<T>, Promise<Response>>;
 interface FetchLinkTransportOptions<T extends ClientContext> {
     /**
      * The origin to prepend to all request URLs, useful for CORS requests.
@@ -30,32 +24,16 @@ interface FetchLinkTransportOptions<T extends ClientContext> {
      * @default (url, init) => globalThis.fetch(url, init)
      */
     fetch?(url: string, init: RequestInit, options: ClientOptions<T>, path: string[]): Promise<Response>;
-    /**
-     * Interceptors that execute before the actual fetch call, useful for modifying the fetch parameters, adding logging, etc.
-     */
-    fetchInterceptors?: FetchLinkTransportFetchInterceptor<T>[];
-    plugins?: FetchLinkTransportPlugin<T>[];
 }
 declare class FetchLinkTransport<T extends ClientContext> implements StandardLinkTransport<T> {
     private readonly origin;
     private readonly fetch;
     private readonly toFetchRequestOptions;
-    private readonly fetchInterceptors;
     constructor(options: FetchLinkTransportOptions<T>);
     send(standardRequest: StandardRequest, path: string[], options: ClientOptions<T>): Promise<StandardLazyResponse>;
 }
 
-interface FetchLinkTransportPlugin<T extends ClientContext> extends StandardLinkPlugin<T> {
-    initFetchLinkTransportOptions?(options: FetchLinkTransportOptions<T>): FetchLinkTransportOptions<T>;
-}
-declare class CompositeFetchLinkTransportPlugin<T extends ClientContext> implements FetchLinkTransportPlugin<T> {
-    protected readonly plugins: FetchLinkTransportPlugin<T>[];
-    name: string;
-    constructor(plugins?: FetchLinkTransportPlugin<T>[]);
-    initFetchLinkTransportOptions(options: FetchLinkTransportOptions<T>): FetchLinkTransportOptions<T>;
-}
-
-interface RPCLinkOptions<T extends ClientContext> extends Omit<StandardLinkOptions<T>, 'plugins'>, FetchLinkTransportOptions<T>, RPCLinkCodecOptions<T> {
+interface RPCLinkOptions<T extends ClientContext> extends StandardLinkOptions<T>, FetchLinkTransportOptions<T>, RPCLinkCodecOptions<T> {
 }
 /**
  * Client link that communicates with an RPC Handler over the Fetch API (HTTP).
@@ -66,5 +44,5 @@ declare class RPCLink<T extends ClientContext> extends StandardLink<T> {
     constructor(options: RPCLinkOptions<T>);
 }
 
-export { CompositeFetchLinkTransportPlugin, FetchLinkTransport, RPCLink };
-export type { FetchLinkTransportFetchInterceptor, FetchLinkTransportFetchInterceptorOptions, FetchLinkTransportOptions, FetchLinkTransportPlugin, RPCLinkOptions };
+export { FetchLinkTransport, RPCLink };
+export type { FetchLinkTransportOptions, RPCLinkOptions };

package/dist/adapters/fetch/index.mjs

@@ -1,26 +1,10 @@
-import { sortPlugins, value, intercept, once } from '@orpc/shared';
+import { value, once } from '@orpc/shared';
 import { toFetchBody, toFetchHeaders, toStandardLazyResponse } from '@standard-server/fetch';
-import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.DmnKF1vQ.mjs';
+import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.BtJ-utP9.mjs';
 import '@standard-server/core';
-import '../../shared/client.BcRcwiif.mjs';
+import '../../shared/client.CUxLdmiH.mjs';
 import '../../shared/client.Dtv1JPkU.mjs';
 
-class CompositeFetchLinkTransportPlugin {
-  constructor(plugins = []) {
-    this.plugins = plugins;
-    this.plugins = sortPlugins(plugins);
-  }
-  name = "~composite/fetch";
-  initFetchLinkTransportOptions(options) {
-    for (const plugin of this.plugins) {
-      if (plugin.initFetchLinkTransportOptions) {
-        options = plugin.initFetchLinkTransportOptions(options);
-      }
-    }
-    return options;
-  }
-}
-
 const GET_SUPPORTED_DUPLEX_MODE = once(() => {
   try {
     let duplex;
@@ -44,13 +28,10 @@ class FetchLinkTransport {
   origin;
   fetch;
   toFetchRequestOptions;
-  fetchInterceptors;
   constructor(options) {
-    options = new CompositeFetchLinkTransportPlugin(options.plugins).initFetchLinkTransportOptions(options);
     this.origin = options.origin;
     this.fetch = options.fetch ?? ((url, init) => globalThis.fetch(url, init));
     this.toFetchRequestOptions = options.toFetchRequest;
-    this.fetchInterceptors = options.fetchInterceptors;
   }
   async send(standardRequest, path, options) {
     let origin = await value(this.origin, options, path);
@@ -72,11 +53,7 @@ class FetchLinkTransport {
         init.duplex = duplex;
       }
     }
-    const response = await intercept(
-      this.fetchInterceptors,
-      { ...options, url, path, init },
-      ({ url: url2, path: path2, init: init2, ...options2 }) => this.fetch(url2, init2, options2, path2)
-    );
+    const response = await this.fetch(url, init, options, path);
     const standardResponse = toStandardLazyResponse(response);
     return standardResponse;
   }
@@ -90,4 +67,4 @@ class RPCLink extends StandardLink {
   }
 }
 
-export { CompositeFetchLinkTransportPlugin, FetchLinkTransport, RPCLink };
+export { FetchLinkTransport, RPCLink };

package/dist/adapters/message-port/index.d.mts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ClientPeer, EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
 import { RPCLinkCodecOptions } from '../standard/index.mjs';
-import '../../shared/client.DPi5reJh.mjs';
+import '../../shared/client.n8K9dFhY.mjs';
 
 /**
  * The message port used by electron in main process

package/dist/adapters/message-port/index.d.ts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { ClientPeer, EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.js';
 import { RPCLinkCodecOptions } from '../standard/index.js';
-import '../../shared/client.DPi5reJh.js';
+import '../../shared/client.n8K9dFhY.js';
 
 /**
  * The message port used by electron in main process

package/dist/adapters/message-port/index.mjs

@@ -1,9 +1,9 @@
 import { value } from '@orpc/shared';
 import { ClientPeer, encodePeerMessage, decodePeerMessage, isServerPeerSendMessage, isPeerMessage } from '@standard-server/peer';
-import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.DmnKF1vQ.mjs';
+import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.BtJ-utP9.mjs';
 import '@standard-server/core';
 import '@standard-server/fetch';
-import '../../shared/client.BcRcwiif.mjs';
+import '../../shared/client.CUxLdmiH.mjs';
 import '../../shared/client.Dtv1JPkU.mjs';
 
 function postMessagePortMessage(port, data, transfer) {

package/dist/adapters/standard/index.mjs

@@ -1,6 +1,6 @@
-export { C as CompositeStandardLinkPlugin, R as RPCLinkCodec, S as StandardLink } from '../../shared/client.DmnKF1vQ.mjs';
+export { C as CompositeStandardLinkPlugin, R as RPCLinkCodec, S as StandardLink } from '../../shared/client.BtJ-utP9.mjs';
 import '@orpc/shared';
 import '@standard-server/core';
 import '@standard-server/fetch';
-import '../../shared/client.BcRcwiif.mjs';
+import '../../shared/client.CUxLdmiH.mjs';
 import '../../shared/client.Dtv1JPkU.mjs';

package/dist/adapters/websocket/index.d.mts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.mjs';
 import { RPCLinkCodecOptions } from '../standard/index.mjs';
-import '../../shared/client.DPi5reJh.mjs';
+import '../../shared/client.n8K9dFhY.mjs';
 
 type WebSocketLike = Pick<WebSocket, 'addEventListener' | 'removeEventListener' | 'send' | 'readyState'>;
 interface WebSocketLinkTransportAttemptInfo {

package/dist/adapters/websocket/index.d.ts

@@ -4,7 +4,7 @@ import { StandardRequest, StandardLazyResponse } from '@standard-server/core';
 import { EncodePeerMessageOptions, DecodePeerMessageOptions } from '@standard-server/peer';
 import { StandardLinkTransport, StandardLink, StandardLinkOptions } from '../standard/index.js';
 import { RPCLinkCodecOptions } from '../standard/index.js';
-import '../../shared/client.DPi5reJh.js';
+import '../../shared/client.n8K9dFhY.js';
 
 type WebSocketLike = Pick<WebSocket, 'addEventListener' | 'removeEventListener' | 'send' | 'readyState'>;
 interface WebSocketLinkTransportAttemptInfo {

package/dist/adapters/websocket/index.mjs

@@ -1,9 +1,9 @@
 import { runWithSignal, AbortError, sleep, promiseWithResolvers, sequential, loadBytes, toStringOrBytes } from '@orpc/shared';
 import { ClientPeer, encodePeerMessage, decodePeerMessage, isServerPeerSendMessage } from '@standard-server/peer';
-import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.DmnKF1vQ.mjs';
+import { S as StandardLink, R as RPCLinkCodec } from '../../shared/client.BtJ-utP9.mjs';
 import '@standard-server/core';
 import '@standard-server/fetch';
-import '../../shared/client.BcRcwiif.mjs';
+import '../../shared/client.CUxLdmiH.mjs';
 import '../../shared/client.Dtv1JPkU.mjs';
 
 const WEBSOCKET_CONNECTING = 0;

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { C as ClientContext, a as ClientOptions, c as AnyNestedClient, I as Infe
 export { i as AnyORPCErrorJSON, j as COMMON_ERROR_STATUS_MAP, k as InferClientBodyInputs, l as InferClientBodyOutputs, m as InferClientErrors, n as InferClientInputs, o as InferClientOutputs, p as MalformedResponseError, N as NestedClient, q as ORPCErrorOptions } from './shared/client.BoXZCzuS.mjs';
 import { StandardResponse } from '@standard-server/core';
 export { ErrorEvent, EventMeta, StandardBody, StandardBodyHint, StandardHeaders, StandardLazyRequest, StandardLazyResponse, StandardMethod, StandardRequest, StandardResponse, StandardUrl, getEventMeta, unwrapEvent, withEventMeta } from '@standard-server/core';
-export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.DPi5reJh.mjs';
+export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.n8K9dFhY.mjs';
 
 declare function wrapAsyncIteratorPreservingEventMeta<TYield, TReturn, TMappedYield = TYield, TMappedReturn = TReturn>(iterator: AsyncIterator<TYield, TReturn>, { mapResult, mapError, ...rest }: WrapAsyncIteratorOptions<TYield, TReturn, TMappedYield, TMappedReturn>): AsyncIteratorClass<TMappedYield, TMappedReturn>;
 

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { C as ClientContext, a as ClientOptions, c as AnyNestedClient, I as Infe
 export { i as AnyORPCErrorJSON, j as COMMON_ERROR_STATUS_MAP, k as InferClientBodyInputs, l as InferClientBodyOutputs, m as InferClientErrors, n as InferClientInputs, o as InferClientOutputs, p as MalformedResponseError, N as NestedClient, q as ORPCErrorOptions } from './shared/client.BoXZCzuS.js';
 import { StandardResponse } from '@standard-server/core';
 export { ErrorEvent, EventMeta, StandardBody, StandardBodyHint, StandardHeaders, StandardLazyRequest, StandardLazyResponse, StandardMethod, StandardRequest, StandardResponse, StandardUrl, getEventMeta, unwrapEvent, withEventMeta } from '@standard-server/core';
-export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.DPi5reJh.js';
+export { R as RPCJsonSerialization, a as RPCJsonSerializationMeta, b as RPCJsonSerializer, c as RPCJsonSerializerHandler, d as RPCJsonSerializerOptions, e as RPCSerializer, f as RPCSerializerOptions, g as RPCSerializerSerializeOptions } from './shared/client.n8K9dFhY.js';
 
 declare function wrapAsyncIteratorPreservingEventMeta<TYield, TReturn, TMappedYield = TYield, TMappedReturn = TReturn>(iterator: AsyncIterator<TYield, TReturn>, { mapResult, mapError, ...rest }: WrapAsyncIteratorOptions<TYield, TReturn, TMappedYield, TMappedReturn>): AsyncIteratorClass<TMappedYield, TMappedReturn>;
 

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { b as isDefinedError } from './shared/client.BcRcwiif.mjs';
-export { d as RPCJsonSerializer, R as RPCSerializer, e as cloneORPCError, a as createORPCErrorFromJson, c as createORPCErrorFromMalformedResponse, i as isORPCErrorJson, t as toORPCError, w as wrapAsyncIteratorPreservingEventMeta } from './shared/client.BcRcwiif.mjs';
+import { b as isDefinedError } from './shared/client.CUxLdmiH.mjs';
+export { d as RPCJsonSerializer, R as RPCSerializer, e as cloneORPCError, a as createORPCErrorFromJson, c as createORPCErrorFromMalformedResponse, i as isORPCErrorJson, t as toORPCError, w as wrapAsyncIteratorPreservingEventMeta } from './shared/client.CUxLdmiH.mjs';
 import { toArray, intercept, isTypescriptObject } from '@orpc/shared';
 export { AsyncIteratorClass, asyncIteratorToStream, asyncIteratorToUnproxiedDataStream, consumeAsyncIterator, consumeAsyncIterator as consumeEventIterator, asyncIteratorToStream as eventIteratorToStream, asyncIteratorToUnproxiedDataStream as eventIteratorToUnproxiedDataStream, onAsyncIteratorObjectError, onError, onFinish, onReadableStreamError, onStart, onSuccess, streamToAsyncIteratorObject, streamToAsyncIteratorObject as streamToEventIterator } from '@orpc/shared';
 export { C as COMMON_ERROR_STATUS_MAP, M as MalformedResponseError, O as ORPCError } from './shared/client.Dtv1JPkU.mjs';

package/dist/plugins/index.mjs

@@ -30,7 +30,8 @@ class BatchLinkPlugin {
       const headersList = options2.map((o) => o.request.headers);
       const commonHeaders = {};
       for (const headers of headersList) {
-        for (const [key, value2] of Object.entries(headers)) {
+        for (const key of Object.keys(headers)) {
+          const value2 = headers[key];
           if (headersList.every((h) => h[key] === value2)) {
             commonHeaders[key] = value2;
           }
@@ -40,7 +41,8 @@ class BatchLinkPlugin {
     });
     this.mapSubrequest = options.mapSubrequest ?? (({ request }, { headers }) => {
       const subHeaders = { ...request.headers };
-      for (const [key, value2] of Object.entries(headers)) {
+      for (const key of Object.keys(headers)) {
+        const value2 = headers[key];
         if (subHeaders[key] === value2) {
           subHeaders[key] = void 0;
         }

package/dist/shared/{client.DmnKF1vQ.mjs → client.BtJ-utP9.mjs}

@@ -1,7 +1,7 @@
 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 { R as RPCSerializer, c as createORPCErrorFromMalformedResponse, i as isORPCErrorJson, a as createORPCErrorFromJson } from './client.BcRcwiif.mjs';
+import { R as RPCSerializer, c as createORPCErrorFromMalformedResponse, i as isORPCErrorJson, a as createORPCErrorFromJson } from './client.CUxLdmiH.mjs';
 
 class CompositeStandardLinkPlugin {
   name = "~composite";

package/dist/shared/{client.BcRcwiif.mjs → client.CUxLdmiH.mjs}

@@ -87,7 +87,14 @@ function wrapAsyncIteratorPreservingEventMeta(iterator, { mapResult, mapError, .
   });
 }
 
-const REGEX_STRING_PATTERN = /^\/([\s\S]*)\/([a-z]*)$/;
+function invalidSerializedData(detail) {
+  return new TypeError(`Invalid RPC serialized data: ${detail}`);
+}
+function assertSerializedType(ok, type, expected) {
+  if (!ok) {
+    throw invalidSerializedData(`type "${type}" expects ${expected}.`);
+  }
+}
 const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
   undefined: {
     condition(data) {
@@ -96,7 +103,8 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
     serialize() {
       return null;
     },
-    deserialize() {
+    deserialize(serialized) {
+      assertSerializedType(serialized === null, "undefined", "null");
       return void 0;
     },
     isTerminal: true
@@ -109,6 +117,7 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
       return data.toString();
     },
     deserialize(serialized) {
+      assertSerializedType(typeof serialized === "string", "bigint", "a string");
       return BigInt(serialized);
     },
     isTerminal: true
@@ -124,7 +133,8 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
       return data.toISOString();
     },
     deserialize(serialized) {
-      return new Date(serialized ?? "Invalid Date");
+      assertSerializedType(typeof serialized === "string" || serialized === null, "date", "a string or null");
+      return new Date(serialized ?? Number.NaN);
     },
     isTerminal: true
   },
@@ -135,7 +145,8 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
     serialize() {
       return null;
     },
-    deserialize() {
+    deserialize(serialized) {
+      assertSerializedType(serialized === null, "nan", "null");
       return Number.NaN;
     },
     isTerminal: true
@@ -148,23 +159,11 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
       return data.toString();
     },
     deserialize(serialized) {
+      assertSerializedType(typeof serialized === "string", "url", "a string");
       return new URL(serialized);
     },
     isTerminal: true
   },
-  regexp: {
-    condition(data) {
-      return data instanceof RegExp;
-    },
-    serialize(data) {
-      return data.toString();
-    },
-    deserialize(serialized) {
-      const [, pattern, flags] = serialized.match(REGEX_STRING_PATTERN);
-      return new RegExp(pattern, flags);
-    },
-    isTerminal: true
-  },
   set: {
     condition(data) {
       return data instanceof Set;
@@ -173,6 +172,7 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
       return Array.from(data);
     },
     deserialize(serialized) {
+      assertSerializedType(Array.isArray(serialized), "set", "an array");
       return new Set(serialized);
     }
   },
@@ -184,6 +184,7 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
       return Array.from(data.entries());
     },
     deserialize(serialized) {
+      assertSerializedType(Array.isArray(serialized), "map", "an array");
       return new Map(serialized);
     }
   }
@@ -203,7 +204,8 @@ class RPCJsonSerializer {
     }
     let inlineBuiltInHandlers = true;
     let handlerEntries = [];
-    for (const [key, handler] of Object.entries(customHandlers)) {
+    for (const key of Object.keys(customHandlers)) {
+      const handler = customHandlers[key];
       this.handlers[key] = handler;
       if (inlineBuiltInHandlers && key in DEFAULT_RPC_JSON_SERIALIZER_HANDLERS) {
         inlineBuiltInHandlers = false;
@@ -214,7 +216,8 @@ class RPCJsonSerializer {
     }
     if (!inlineBuiltInHandlers) {
       handlerEntries = [];
-      for (const [key, handler] of Object.entries(this.handlers)) {
+      for (const key of Object.keys(this.handlers)) {
+        const handler = this.handlers[key];
         if (handler !== void 0) {
           handlerEntries.push([key, handler]);
         }
@@ -268,10 +271,6 @@ class RPCJsonSerializer {
             meta.push(["url", ...segments]);
             return data.toString();
           }
-          if (data instanceof RegExp) {
-            meta.push(["regexp", ...segments]);
-            return data.toString();
-          }
           if (data instanceof Set) {
             const result = this.serializeValue(Array.from(data), segments, meta, maps, blobs);
             meta.push(["set", ...segments]);
@@ -322,7 +321,8 @@ class RPCJsonSerializer {
     }
     if (isPlainObject(data)) {
       const json = new NullProtoObj();
-      for (const [k, v] of Object.entries(data)) {
+      for (const k of Object.keys(data)) {
+        const v = data[k];
         if (k === "toJSON" && typeof v === "function") {
           continue;
         }
@@ -348,7 +348,7 @@ class RPCJsonSerializer {
           currentRef = currentRef[preSegment];
           preSegment = segments[j];
           if (!Object.hasOwn(currentRef, preSegment)) {
-            throw new Error(`Security error: Invalid serialized data. Segment "${preSegment}" does not exist.`);
+            throw invalidSerializedData(`segment "${preSegment}" does not exist.`);
           }
         }
         currentRef[preSegment] = serialized.blobs[i];
@@ -357,16 +357,20 @@ class RPCJsonSerializer {
     if (serialized.meta) {
       for (const item of serialized.meta) {
         const type = item[0];
+        const handler = this.handlers[type];
+        if (handler === void 0) {
+          throw invalidSerializedData(`type "${type}" is not supported.`);
+        }
         let currentRef = ref;
         let preSegment = "data";
         for (let i = 1; i < item.length; i++) {
           currentRef = currentRef[preSegment];
           preSegment = item[i];
           if (!Object.hasOwn(currentRef, preSegment)) {
-            throw new Error(`Security error: Invalid serialized data. Segment "${preSegment}" does not exist.`);
+            throw invalidSerializedData(`segment "${preSegment}" does not exist.`);
           }
         }
-        currentRef[preSegment] = this.handlers[type].deserialize(currentRef[preSegment]);
+        currentRef[preSegment] = handler.deserialize(currentRef[preSegment]);
       }
     }
     return ref.data;

package/dist/shared/{client.DPi5reJh.d.mts → client.n8K9dFhY.d.mts}

@@ -16,7 +16,10 @@ type RPCJsonSerialization = {
 interface RPCJsonSerializerHandler {
     condition(value: unknown): boolean;
     serialize(value: any): unknown;
-    deserialize(serialized: any): unknown;
+    /**
+     * `serialized` comes from the wire, so validate its type and throw on mismatch.
+     */
+    deserialize(serialized: unknown): unknown;
     /**
      * If false, the result of this serializer will not be further processed by other serializers,
      * even if it matches their conditions and treat it as final serialized value.
@@ -60,10 +63,10 @@ interface RPCJsonSerializerOptions {
      *
      * **Disabling:** Set a key to `undefined` to remove a built-in handler:
      * ```ts
-     * handlers: { regexp: undefined }
+     * handlers: { url: undefined }
      * ```
      *
-     * Built-in type keys: `undefined`, `bigint`, `date`, `nan`, `url`, `regexp`, `set`, `map`.
+     * Built-in type keys: `undefined`, `bigint`, `date`, `nan`, `url`, `set`, `map`.
      */
     handlers?: Record<string, undefined | RPCJsonSerializerHandler> | undefined;
     /**

package/dist/shared/{client.DPi5reJh.d.ts → client.n8K9dFhY.d.ts}

@@ -16,7 +16,10 @@ type RPCJsonSerialization = {
 interface RPCJsonSerializerHandler {
     condition(value: unknown): boolean;
     serialize(value: any): unknown;
-    deserialize(serialized: any): unknown;
+    /**
+     * `serialized` comes from the wire, so validate its type and throw on mismatch.
+     */
+    deserialize(serialized: unknown): unknown;
     /**
      * If false, the result of this serializer will not be further processed by other serializers,
      * even if it matches their conditions and treat it as final serialized value.
@@ -60,10 +63,10 @@ interface RPCJsonSerializerOptions {
      *
      * **Disabling:** Set a key to `undefined` to remove a built-in handler:
      * ```ts
-     * handlers: { regexp: undefined }
+     * handlers: { url: undefined }
      * ```
      *
-     * Built-in type keys: `undefined`, `bigint`, `date`, `nan`, `url`, `regexp`, `set`, `map`.
+     * Built-in type keys: `undefined`, `bigint`, `date`, `nan`, `url`, `set`, `map`.
      */
     handlers?: Record<string, undefined | RPCJsonSerializerHandler> | undefined;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "2.0.0-beta.36",
+  "version": "2.0.0-beta.37",
   "description": "Consume oRPC and OpenAPI APIs with end-to-end type safety over HTTP, WebSocket, or message ports",
   "license": "MIT",
   "funding": [
@@ -63,10 +63,10 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "2.0.0-beta.36",
-    "@standard-server/core": "~0.9.0",
-    "@standard-server/fetch": "~0.9.0",
-    "@standard-server/peer": "~0.9.0"
+    "@orpc/shared": "2.0.0-beta.37",
+    "@standard-server/core": "~0.9.2",
+    "@standard-server/fetch": "~0.9.2",
+    "@standard-server/peer": "~0.9.2"
   },
   "devDependencies": {
     "zod": "^4.5.4"