@orpc/standard-server 0.53.0 → 0.54.0

package/dist/batch/index.d.mts

@@ -18,6 +18,7 @@ interface ToBatchResponseOptions extends StandardResponse {
 declare function toBatchResponse(options: ToBatchResponseOptions): StandardResponse;
 declare function parseBatchResponse(response: StandardResponse): AsyncGenerator<BatchResponseBodyItem>;
 
-declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal;
+declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal | undefined;
 
-export { type BatchResponseBodyItem, type ToBatchRequestOptions, type ToBatchResponseOptions, parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };
+export { parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };
+export type { BatchResponseBodyItem, ToBatchRequestOptions, ToBatchResponseOptions };

package/dist/batch/index.d.ts

@@ -18,6 +18,7 @@ interface ToBatchResponseOptions extends StandardResponse {
 declare function toBatchResponse(options: ToBatchResponseOptions): StandardResponse;
 declare function parseBatchResponse(response: StandardResponse): AsyncGenerator<BatchResponseBodyItem>;
 
-declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal;
+declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal | undefined;
 
-export { type BatchResponseBodyItem, type ToBatchRequestOptions, type ToBatchResponseOptions, parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };
+export { parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };
+export type { BatchResponseBodyItem, ToBatchRequestOptions, ToBatchResponseOptions };

package/dist/batch/index.mjs

@@ -2,17 +2,22 @@ import { stringifyJSON, parseEmptyableJSON, isAsyncIteratorObject, isObject } fr
 
 function toBatchAbortSignal(signals) {
   const realSignals = signals.filter((signal) => signal !== void 0);
-  const controller = new AbortController();
-  const abortedSignals = realSignals.filter((signal) => signal.aborted);
-  if (abortedSignals.length && abortedSignals.length === realSignals.length) {
-    controller.abort();
+  if (realSignals.length === 0 || realSignals.length !== signals.length) {
+    return void 0;
   }
+  const controller = new AbortController();
+  const abortIfAllInputsAborted = () => {
+    if (realSignals.every((signal) => signal.aborted)) {
+      controller.abort();
+    }
+  };
+  abortIfAllInputsAborted();
   for (const signal of realSignals) {
     signal.addEventListener("abort", () => {
-      abortedSignals.push(signal);
-      if (abortedSignals.length === realSignals.length) {
-        controller.abort();
-      }
+      abortIfAllInputsAborted();
+    }, {
+      once: true,
+      signal: controller.signal
     });
   }
   return controller.signal;
@@ -23,8 +28,8 @@ function toBatchRequest(options) {
   let body;
   const batchRequestItems = options.requests.map((request) => ({
     body: request.body,
-    headers: request.headers,
-    method: request.method,
+    headers: Object.keys(request.headers).length ? request.headers : void 0,
+    method: request.method === options.method ? void 0 : request.method,
     url: request.url
   }));
   if (options.method === "GET") {
@@ -47,9 +52,9 @@ function parseBatchRequest(request) {
   }
   return items.map((item) => {
     return {
-      method: item.method,
+      method: item.method ?? request.method,
       url: new URL(item.url),
-      headers: item.headers,
+      headers: item.headers ?? {},
       body: item.body,
       signal: request.signal
     };
@@ -57,7 +62,23 @@ function parseBatchRequest(request) {
 }
 
 function toBatchResponse(options) {
-  return options;
+  return {
+    ...options,
+    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
+          };
+        }
+      } finally {
+        options.body.return?.();
+      }
+    }()
+  };
 }
 function parseBatchResponse(response) {
   const body = response.body;
@@ -69,12 +90,17 @@ function parseBatchResponse(response) {
   return async function* () {
     try {
       for await (const item of body) {
-        if (!isObject(item) || !("index" in item) || !("status" in item) || !("headers" in item)) {
+        if (!isObject(item) || !("index" in item) || typeof item.index !== "number") {
           throw new TypeError("Invalid batch response", {
             cause: item
           });
         }
-        yield item;
+        yield {
+          index: item.index,
+          status: item.status ?? response.status,
+          headers: item.headers ?? {},
+          body: item.body
+        };
       }
     } finally {
       await body.return?.();

package/dist/index.d.mts

@@ -56,4 +56,5 @@ declare function generateContentDisposition(filename: string): string;
 declare function getFilenameFromContentDisposition(contentDisposition: string): string | undefined;
 declare function mergeStandardHeaders(a: StandardHeaders, b: StandardHeaders): StandardHeaders;
 
-export { ErrorEvent, type ErrorEventOptions, EventDecoder, EventDecoderError, type EventDecoderOptions, EventDecoderStream, EventEncoderError, type EventMessage, type EventMeta, StandardHeaders, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mergeStandardHeaders, withEventMeta };
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, StandardHeaders, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mergeStandardHeaders, withEventMeta };
+export type { ErrorEventOptions, EventDecoderOptions, EventMessage, EventMeta };

package/dist/index.d.ts

@@ -56,4 +56,5 @@ declare function generateContentDisposition(filename: string): string;
 declare function getFilenameFromContentDisposition(contentDisposition: string): string | undefined;
 declare function mergeStandardHeaders(a: StandardHeaders, b: StandardHeaders): StandardHeaders;
 
-export { ErrorEvent, type ErrorEventOptions, EventDecoder, EventDecoderError, type EventDecoderOptions, EventDecoderStream, EventEncoderError, type EventMessage, type EventMeta, StandardHeaders, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mergeStandardHeaders, withEventMeta };
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, StandardHeaders, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mergeStandardHeaders, withEventMeta };
+export type { ErrorEventOptions, EventDecoderOptions, EventMessage, EventMeta };

package/package.json

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