@orpc/client 0.0.0-next.c72b962 → 0.0.0-next.c79fd64

package/dist/shared/{client.CRWEpqLB.mjs → client.txdq_i5V.mjs}

@@ -1,4 +1,4 @@
-import { isObject, isTypescriptObject } from '@orpc/shared';
+import { resolveMaybeOptionalOptions, isObject, AsyncIteratorClass, isTypescriptObject } from '@orpc/shared';
 import { getEventMeta, withEventMeta } from '@orpc/standard-server';
 
 const COMMON_ORPC_ERROR_DEFS = {
@@ -90,16 +90,17 @@ class ORPCError extends Error {
   code;
   status;
   data;
-  constructor(code, ...[options]) {
-    if (options?.status && !isORPCErrorStatus(options.status)) {
+  constructor(code, ...rest) {
+    const options = resolveMaybeOptionalOptions(rest);
+    if (options.status !== void 0 && !isORPCErrorStatus(options.status)) {
       throw new Error("[ORPCError] Invalid error status code.");
     }
-    const message = fallbackORPCErrorMessage(code, options?.message);
+    const message = fallbackORPCErrorMessage(code, options.message);
     super(message, options);
     this.code = code;
-    this.status = fallbackORPCErrorStatus(code, options?.status);
-    this.defined = options?.defined ?? false;
-    this.data = options?.data;
+    this.status = fallbackORPCErrorStatus(code, options.status);
+    this.defined = options.defined ?? false;
+    this.data = options.data;
   }
   toJSON() {
     return {
@@ -141,35 +142,39 @@ function createORPCErrorFromJson(json, options = {}) {
 }
 
 function mapEventIterator(iterator, maps) {
-  return async function* () {
-    try {
-      while (true) {
-        const { done, value } = await iterator.next();
-        let mappedValue = await maps.value(value, done);
-        if (mappedValue !== value) {
-          const meta = getEventMeta(value);
-          if (meta && isTypescriptObject(mappedValue)) {
-            mappedValue = withEventMeta(mappedValue, meta);
-          }
-        }
-        if (done) {
-          return mappedValue;
-        }
-        yield mappedValue;
+  const mapError = async (error) => {
+    let mappedError = await maps.error(error);
+    if (mappedError !== error) {
+      const meta = getEventMeta(error);
+      if (meta && isTypescriptObject(mappedError)) {
+        mappedError = withEventMeta(mappedError, meta);
       }
-    } catch (error) {
-      let mappedError = await maps.error(error);
-      if (mappedError !== error) {
-        const meta = getEventMeta(error);
-        if (meta && isTypescriptObject(mappedError)) {
-          mappedError = withEventMeta(mappedError, meta);
-        }
+    }
+    return mappedError;
+  };
+  return new AsyncIteratorClass(async () => {
+    const { done, value } = await (async () => {
+      try {
+        return await iterator.next();
+      } catch (error) {
+        throw await mapError(error);
+      }
+    })();
+    let mappedValue = await maps.value(value, done);
+    if (mappedValue !== value) {
+      const meta = getEventMeta(value);
+      if (meta && isTypescriptObject(mappedValue)) {
+        mappedValue = withEventMeta(mappedValue, meta);
       }
-      throw mappedError;
-    } finally {
+    }
+    return { done, value: mappedValue };
+  }, async () => {
+    try {
       await iterator.return?.();
+    } catch (error) {
+      throw await mapError(error);
     }
-  }();
+  });
 }
 
 export { COMMON_ORPC_ERROR_DEFS as C, ORPCError as O, fallbackORPCErrorMessage as a, isORPCErrorStatus as b, isORPCErrorJson as c, createORPCErrorFromJson as d, fallbackORPCErrorStatus as f, isDefinedError as i, mapEventIterator as m, toORPCError as t };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/client",
   "type": "module",
-  "version": "0.0.0-next.c72b962",
+  "version": "0.0.0-next.c79fd64",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -33,18 +33,29 @@
       "types": "./dist/adapters/fetch/index.d.mts",
       "import": "./dist/adapters/fetch/index.mjs",
       "default": "./dist/adapters/fetch/index.mjs"
+    },
+    "./websocket": {
+      "types": "./dist/adapters/websocket/index.d.mts",
+      "import": "./dist/adapters/websocket/index.mjs",
+      "default": "./dist/adapters/websocket/index.mjs"
+    },
+    "./message-port": {
+      "types": "./dist/adapters/message-port/index.d.mts",
+      "import": "./dist/adapters/message-port/index.mjs",
+      "default": "./dist/adapters/message-port/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.c72b962",
-    "@orpc/standard-server-fetch": "0.0.0-next.c72b962",
-    "@orpc/standard-server": "0.0.0-next.c72b962"
+    "@orpc/shared": "0.0.0-next.c79fd64",
+    "@orpc/standard-server": "0.0.0-next.c79fd64",
+    "@orpc/standard-server-fetch": "0.0.0-next.c79fd64",
+    "@orpc/standard-server-peer": "0.0.0-next.c79fd64"
   },
   "devDependencies": {
-    "zod": "^3.24.2"
+    "zod": "^4.1.5"
   },
   "scripts": {
     "build": "unbuild",