@orpc/client 2.0.0-beta.43 → 2.0.0-beta.45

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 };

package/dist/shared/{client.DD2eNne_.mjs → client.LF04eOvL.mjs}

@@ -1,4 +1,4 @@
-import { resolveMaybeOptionalOptions, getConstructors } from '@orpc/shared';
+import { resolveMaybeOptionalOptions, getConstructors, isPlainObject } from '@orpc/shared';
 
 const COMMON_ERROR_STATUS_MAP = {
   BAD_REQUEST: 400,
@@ -48,7 +48,7 @@ class ORPCError extends Error {
   data;
   constructor(code, ...rest) {
     const options = resolveMaybeOptionalOptions(rest);
-    const message = options.message ?? code.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
+    const message = options.message ?? codeToMessage(code);
     super(message, options);
     this.code = code;
     this.data = options.data;
@@ -85,13 +85,31 @@ class ORPCError extends Error {
     return false;
   }
 }
-class MalformedResponseError extends Error {
-  name = "MalformedResponseError";
+class ResponseError extends Error {
+  name = "ResponseError";
   response;
   constructor(options) {
-    super(options.message, options);
+    super(options.message ?? `Received a ${options.response.status} response.`, options);
     this.response = options.response;
   }
 }
+class MalformedResponseError extends ResponseError {
+  name = "MalformedResponseError";
+  constructor(options) {
+    super({ ...options, message: options.message ?? inferMalformedResponseMessage(options.response) });
+  }
+}
+const INFERRED_MESSAGE_MAX_LENGTH = 256;
+function inferMalformedResponseMessage(response) {
+  const candidate = isPlainObject(response.body) ? response.body.message : response.body;
+  if (typeof candidate === "string" && candidate.length > 0 && candidate.length <= INFERRED_MESSAGE_MAX_LENGTH) {
+    return candidate;
+  }
+  const commonCode = Object.entries(COMMON_ERROR_STATUS_MAP).find(([, status]) => status === response.status)?.[0];
+  return commonCode ? codeToMessage(commonCode) : "Malformed oRPC Response";
+}
+function codeToMessage(code) {
+  return code.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
+}
 
-export { COMMON_ERROR_STATUS_MAP as C, MalformedResponseError as M, ORPCError as O };
+export { COMMON_ERROR_STATUS_MAP as C, MalformedResponseError as M, ORPCError as O, ResponseError as R };

package/dist/shared/{client.DpkGsZt-.mjs → client._wG5INmC.mjs}

@@ -1,6 +1,6 @@
-import { isPlainObject, wrapAsyncIterator, isTypescriptObject, NullProtoObj, copyOnWrite, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
+import { isPlainObject, wrapAsyncIterator, isTypescriptObject, NullProtoObj, parseBigIntString, DEFAULT_MAX_BIGINT_DIGITS, copyOnWrite, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
 import { getEventMeta, withEventMeta, ErrorEvent } from '@standard-server/core';
-import { O as ORPCError, M as MalformedResponseError, C as COMMON_ERROR_STATUS_MAP } from './client.DD2eNne_.mjs';
+import { O as ORPCError } from './client.LF04eOvL.mjs';
 
 function isDefinedError(error) {
   return error instanceof ORPCError && error.defined;
@@ -26,29 +26,6 @@ function createORPCErrorFromJson(json, options = {}) {
   error.defined = json.defined;
   return error;
 }
-function createORPCErrorFromMalformedResponse(options) {
-  const error = new ORPCError("MALFORMED_ORPC_RESPONSE", {
-    message: options.message ?? inferMalformedResponseMessage(options.response),
-    data: options.response
-  });
-  error.cause = new MalformedResponseError({ ...options, message: error.message });
-  return error;
-}
-const INFERRED_MESSAGE_MIN_LENGTH = 1;
-const INFERRED_MESSAGE_MAX_LENGTH = 256;
-function isInferableMessage(text) {
-  return text.length >= INFERRED_MESSAGE_MIN_LENGTH && text.length <= INFERRED_MESSAGE_MAX_LENGTH;
-}
-function inferMalformedResponseMessage(response) {
-  if (typeof response.body === "string" && isInferableMessage(response.body)) {
-    return response.body;
-  }
-  if (isPlainObject(response.body) && typeof response.body.message === "string" && isInferableMessage(response.body.message)) {
-    return response.body.message;
-  }
-  const commonCode = Object.entries(COMMON_ERROR_STATUS_MAP).find(([, status]) => status === response.status)?.[0];
-  return commonCode?.split("_").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
-}
 function cloneORPCError(error) {
   const cloned = new ORPCError(error.code, {
     message: error.message,
@@ -95,6 +72,16 @@ function assertSerializedType(ok, type, expected) {
     throw invalidSerializedData(`type "${type}" expects ${expected}.`);
   }
 }
+function isWalkable(value) {
+  return Array.isArray(value) || isPlainObject(value);
+}
+function walkInto(parent, key, original, restored) {
+  const value = parent[key];
+  if (!isWalkable(value) || restored?.has(value)) {
+    throw invalidSerializedData(`segment "${key}" cannot be walked into.`);
+  }
+  return value === original ? copyOnWrite(parent, key, original) : value;
+}
 const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
   undefined: {
     condition(data) {
@@ -118,7 +105,11 @@ const DEFAULT_RPC_JSON_SERIALIZER_HANDLERS = {
     },
     deserialize(serialized) {
       assertSerializedType(typeof serialized === "string", "bigint", "a string");
-      return BigInt(serialized);
+      const value = parseBigIntString(serialized, DEFAULT_MAX_BIGINT_DIGITS);
+      if (value === void 0) {
+        throw invalidSerializedData(`type "bigint" expects a decimal integer string of at most ${DEFAULT_MAX_BIGINT_DIGITS} digits.`);
+      }
+      return value;
     },
     isTerminal: true
   },
@@ -239,7 +230,7 @@ class RPCJsonSerializer {
     this.inlineBuiltInHandlers = inlineBuiltInHandlers;
     this.handlerEntries = handlerEntries;
   }
-  serialize(data) {
+  serializeJson(data) {
     let meta = [];
     const maps = [];
     const blobs = [];
@@ -354,7 +345,7 @@ class RPCJsonSerializer {
     }
     return data;
   }
-  deserialize(serialized) {
+  deserializeJson(serialized) {
     const ref = { json: serialized.json };
     if (serialized.blobs?.length) {
       for (let i = 0; i < serialized.maps.length; i++) {
@@ -368,7 +359,7 @@ class RPCJsonSerializer {
         let preSegment = "json";
         for (let j = 0; j < segments.length; j++) {
           original = original[preSegment];
-          currentRef = copyOnWrite(currentRef, preSegment, original);
+          currentRef = walkInto(currentRef, preSegment, original);
           preSegment = segments[j];
           if (!Object.hasOwn(currentRef, preSegment)) {
             throw invalidSerializedData(`segment "${preSegment}" does not exist.`);
@@ -377,36 +368,64 @@ class RPCJsonSerializer {
         currentRef[preSegment] = blob;
       }
     }
-    if (serialized.meta) {
-      for (const item of serialized.meta) {
+    const meta = serialized.meta;
+    if (meta) {
+      let restored;
+      const chain = meta.length === 1 ? void 0 : [];
+      let chainDepth = 0;
+      for (const item of meta) {
         const type = item[0];
         const handler = this.handlers[type];
         if (handler === void 0) {
           throw invalidSerializedData(`type "${type}" is not supported.`);
         }
+        const depth = item.length - 1;
+        const shared = Math.min(depth, chainDepth);
+        let d = 0;
         let original = serialized;
         let currentRef = ref;
         let preSegment = "json";
-        for (let i = 1; i < item.length; i++) {
+        if (chain !== void 0 && shared > 0) {
+          d = 1;
+          while (d < shared && chain[3 * d] === item[d]) {
+            d++;
+          }
+          currentRef = chain[3 * d - 2];
+          original = chain[3 * d - 1];
+          preSegment = item[d];
+          if (!Object.hasOwn(currentRef, preSegment)) {
+            throw invalidSerializedData(`segment "${preSegment}" does not exist.`);
+          }
+        }
+        while (d < depth) {
           original = original[preSegment];
-          currentRef = copyOnWrite(currentRef, preSegment, original);
-          preSegment = item[i];
+          currentRef = walkInto(currentRef, preSegment, original, restored);
+          if (chain !== void 0) {
+            chain[3 * d] = preSegment;
+            chain[3 * d + 1] = currentRef;
+            chain[3 * d + 2] = original;
+          }
+          preSegment = item[++d];
           if (!Object.hasOwn(currentRef, preSegment)) {
             throw invalidSerializedData(`segment "${preSegment}" does not exist.`);
           }
         }
-        currentRef[preSegment] = handler.deserialize(currentRef[preSegment]);
+        chainDepth = depth;
+        const value = handler.deserialize(currentRef[preSegment]);
+        currentRef[preSegment] = value;
+        if (isWalkable(value)) {
+          (restored ??= /* @__PURE__ */ new Set()).add(value);
+        }
       }
     }
     return ref.json;
   }
 }
 
-class RPCSerializer {
-  jsonSerializer;
+class RPCSerializer extends RPCJsonSerializer {
   defaultSerializeOptions;
   constructor(options = {}) {
-    this.jsonSerializer = new RPCJsonSerializer(options);
+    super(options);
     this.defaultSerializeOptions = options.serialize;
   }
   serialize(data, options = {}) {
@@ -419,19 +438,19 @@ class RPCSerializer {
           if (result.value === void 0) {
             return result;
           }
-          return { done: result.done, value: this.serializeValue(result.value, false) };
+          return { done: result.done, value: this.serializePayload(result.value, false) };
         },
         mapError: (e) => new ErrorEvent(
-          this.serializeValue(toORPCError(e).toJSON(), false),
+          this.serializePayload(toORPCError(e).toJSON(), false),
           { cause: e }
         )
       });
     }
     const useFormDataForBlobs = options.useFormDataForBlobFields ?? this.defaultSerializeOptions?.useFormDataForBlobFields ?? true;
-    return this.serializeValue(data, useFormDataForBlobs);
+    return this.serializePayload(data, useFormDataForBlobs);
   }
-  serializeValue(data, useFormDataForBlobs) {
-    const { json, meta, maps, blobs } = this.jsonSerializer.serialize(data);
+  serializePayload(data, useFormDataForBlobs) {
+    const { json, meta, maps, blobs } = this.serializeJson(data);
     if (!useFormDataForBlobs || !blobs?.length) {
       return { json, meta };
     }
@@ -452,13 +471,13 @@ class RPCSerializer {
           if (result.value === void 0) {
             return result;
           }
-          return { done: result.done, value: this.deserializeValue(result.value) };
+          return { done: result.done, value: this.deserializePayload(result.value) };
         },
         mapError: (e) => {
           if (!(e instanceof ErrorEvent)) {
             return e;
           }
-          const deserialized = this.deserializeValue(e.data);
+          const deserialized = this.deserializePayload(e.data);
           if (isORPCErrorJson(deserialized)) {
             return createORPCErrorFromJson(deserialized, { cause: e });
           }
@@ -466,11 +485,11 @@ class RPCSerializer {
         }
       });
     }
-    return this.deserializeValue(data);
+    return this.deserializePayload(data);
   }
-  deserializeValue(data) {
+  deserializePayload(data) {
     if (!(data instanceof FormData)) {
-      return this.jsonSerializer.deserialize(data);
+      return this.deserializeJson(data);
     }
     const serialized = JSON.parse(data.get("data"));
     const blobs = [];
@@ -479,8 +498,8 @@ class RPCSerializer {
         blobs[Number(key)] = value;
       }
     }
-    return this.jsonSerializer.deserialize({ ...serialized, blobs });
+    return this.deserializeJson({ ...serialized, blobs });
   }
 }
 
-export { RPCSerializer as R, createORPCErrorFromJson as a, isDefinedError as b, createORPCErrorFromMalformedResponse as c, RPCJsonSerializer as d, cloneORPCError as e, isORPCErrorJson as i, toORPCError as t, wrapAsyncIteratorPreservingEventMeta as w };
+export { RPCSerializer as R, isDefinedError as a, RPCJsonSerializer as b, createORPCErrorFromJson as c, cloneORPCError as d, isORPCErrorJson as i, toORPCError as t, wrapAsyncIteratorPreservingEventMeta as w };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "2.0.0-beta.43",
+  "version": "2.0.0-beta.45",
   "description": "Consume oRPC and OpenAPI APIs with end-to-end type safety over HTTP, WebSocket, or message ports",
   "license": "MIT",
   "funding": [
@@ -63,15 +63,15 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "2.0.0-beta.43",
-    "@standard-server/core": "~0.10.2",
-    "@standard-server/fetch": "~0.10.2",
-    "@standard-server/peer": "~0.10.2"
+    "@orpc/shared": "2.0.0-beta.45",
+    "@standard-server/core": "~0.11.0",
+    "@standard-server/fetch": "~0.11.0",
+    "@standard-server/peer": "~0.11.0"
   },
   "devDependencies": {
-    "@types/ws": "^8.18.1",
-    "ws": "^8.21.3",
-    "zod": "^4.5.4"
+    "@types/ws": "^8.18.2",
+    "ws": "^8.22.0",
+    "zod": "^4.6.7"
   },
   "scripts": {
     "type:check": "tsc -b"