@orpc/standard-server 1.8.6 → 1.8.7

package/dist/batch/index.mjs

@@ -1,4 +1,4 @@
-import { stringifyJSON, parseEmptyableJSON, isAsyncIteratorObject, isObject } from '@orpc/shared';
+import { stringifyJSON, parseEmptyableJSON, AsyncIteratorClass, isAsyncIteratorObject, isObject } from '@orpc/shared';
 
 function toBatchAbortSignal(signals) {
   const realSignals = signals.filter((signal) => signal !== void 0);
@@ -91,46 +91,56 @@ function toBatchResponse(options) {
   return {
     headers: options.headers,
     status: options.status,
-    body: (async function* () {
-      try {
-        for await (const item of options.body) {
-          yield {
-            index: item.index,
-            status: item.status === options.status ? void 0 : item.status,
-            headers: Object.keys(item.headers).length ? item.headers : void 0,
-            body: item.body
-          };
+    body: new AsyncIteratorClass(
+      async () => {
+        const { done, value } = await options.body.next();
+        if (done) {
+          return { done, value };
+        }
+        return {
+          done,
+          value: {
+            index: value.index,
+            status: value.status === options.status ? void 0 : value.status,
+            headers: Object.keys(value.headers).length ? value.headers : void 0,
+            body: value.body
+          }
+        };
+      },
+      async (reason) => {
+        if (reason !== "next") {
+          await options.body.return?.();
         }
-      } finally {
-        await options.body.return?.();
       }
-    })()
+    )
   };
 }
 function parseBatchResponse(response) {
   const body = response.body;
   if (isAsyncIteratorObject(body) || Array.isArray(body)) {
-    return (async function* () {
-      try {
-        for await (const item of body) {
-          if (!isObject(item) || !("index" in item) || typeof item.index !== "number") {
-            throw new TypeError("Invalid batch response", {
-              cause: item
-            });
-          }
-          yield {
-            index: item.index,
-            status: item.status ?? response.status,
-            headers: item.headers ?? {},
-            body: item.body
-          };
+    const iterator = (async function* () {
+      for await (const item of body) {
+        if (!isObject(item) || !("index" in item) || typeof item.index !== "number") {
+          throw new TypeError("Invalid batch response", {
+            cause: item
+          });
         }
-      } finally {
-        if (isAsyncIteratorObject(body)) {
+        yield {
+          index: item.index,
+          status: item.status ?? response.status,
+          headers: item.headers ?? {},
+          body: item.body
+        };
+      }
+    })();
+    return new AsyncIteratorClass(
+      () => iterator.next(),
+      async (reason) => {
+        if (reason !== "next" && isAsyncIteratorObject(body)) {
           await body.return?.();
         }
       }
-    })();
+    );
   }
   throw new TypeError("Invalid batch response", {
     cause: response

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server",
   "type": "module",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -28,7 +28,7 @@
     "dist"
   ],
   "dependencies": {
-    "@orpc/shared": "1.8.6"
+    "@orpc/shared": "1.8.7"
   },
   "scripts": {
     "build": "unbuild",