@orpc/standard-server 1.0.0-beta.4 → 1.0.0-beta.6

package/README.md

@@ -53,6 +53,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
 - [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).

package/dist/batch/index.d.mts

@@ -0,0 +1,23 @@
+import { S as StandardHeaders, b as StandardRequest, d as StandardResponse } from '../shared/standard-server.R_NaHlxw.mjs';
+
+interface ToBatchRequestOptions {
+    url: URL;
+    method: 'GET' | 'POST';
+    headers: StandardHeaders;
+    requests: readonly StandardRequest[];
+}
+declare function toBatchRequest(options: ToBatchRequestOptions): StandardRequest;
+declare function parseBatchRequest(request: StandardRequest): StandardRequest[];
+
+interface BatchResponseBodyItem extends StandardResponse {
+    index: number;
+}
+interface ToBatchResponseOptions extends StandardResponse {
+    body: AsyncIteratorObject<BatchResponseBodyItem>;
+}
+declare function toBatchResponse(options: ToBatchResponseOptions): StandardResponse;
+declare function parseBatchResponse(response: StandardResponse): AsyncGenerator<BatchResponseBodyItem>;
+
+declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal;
+
+export { type BatchResponseBodyItem, type ToBatchRequestOptions, type ToBatchResponseOptions, parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };

package/dist/batch/index.d.ts

@@ -0,0 +1,23 @@
+import { S as StandardHeaders, b as StandardRequest, d as StandardResponse } from '../shared/standard-server.R_NaHlxw.js';
+
+interface ToBatchRequestOptions {
+    url: URL;
+    method: 'GET' | 'POST';
+    headers: StandardHeaders;
+    requests: readonly StandardRequest[];
+}
+declare function toBatchRequest(options: ToBatchRequestOptions): StandardRequest;
+declare function parseBatchRequest(request: StandardRequest): StandardRequest[];
+
+interface BatchResponseBodyItem extends StandardResponse {
+    index: number;
+}
+interface ToBatchResponseOptions extends StandardResponse {
+    body: AsyncIteratorObject<BatchResponseBodyItem>;
+}
+declare function toBatchResponse(options: ToBatchResponseOptions): StandardResponse;
+declare function parseBatchResponse(response: StandardResponse): AsyncGenerator<BatchResponseBodyItem>;
+
+declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal;
+
+export { type BatchResponseBodyItem, type ToBatchRequestOptions, type ToBatchResponseOptions, parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };

package/dist/batch/index.mjs

@@ -0,0 +1,85 @@
+import { stringifyJSON, parseEmptyableJSON, isAsyncIteratorObject, isObject } from '@orpc/shared';
+
+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();
+  }
+  for (const signal of realSignals) {
+    signal.addEventListener("abort", () => {
+      abortedSignals.push(signal);
+      if (abortedSignals.length === realSignals.length) {
+        controller.abort();
+      }
+    });
+  }
+  return controller.signal;
+}
+
+function toBatchRequest(options) {
+  const url = new URL(options.url);
+  let body;
+  const batchRequestItems = options.requests.map((request) => ({
+    body: request.body,
+    headers: request.headers,
+    method: request.method,
+    url: request.url
+  }));
+  if (options.method === "GET") {
+    url.searchParams.append("batch", stringifyJSON(batchRequestItems));
+  } else if (options.method === "POST") {
+    body = batchRequestItems;
+  }
+  return {
+    method: options.method,
+    url,
+    headers: options.headers,
+    body,
+    signal: toBatchAbortSignal(options.requests.map((request) => request.signal))
+  };
+}
+function parseBatchRequest(request) {
+  const items = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("batch").at(-1)) : request.body;
+  if (!Array.isArray(items)) {
+    throw new TypeError("Invalid batch request");
+  }
+  return items.map((item) => {
+    return {
+      method: item.method,
+      url: new URL(item.url),
+      headers: item.headers,
+      body: item.body,
+      signal: request.signal
+    };
+  });
+}
+
+function toBatchResponse(options) {
+  return options;
+}
+function parseBatchResponse(response) {
+  const body = response.body;
+  if (!isAsyncIteratorObject(body)) {
+    throw new TypeError("Invalid batch response", {
+      cause: response
+    });
+  }
+  return async function* () {
+    try {
+      for await (const item of body) {
+        if (!isObject(item) || !("index" in item) || !("status" in item) || !("headers" in item)) {
+          throw new TypeError("Invalid batch response", {
+            cause: item
+          });
+        }
+        yield item;
+      }
+    } finally {
+      await body.return?.();
+    }
+  }();
+}
+
+export { parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };

package/dist/index.d.mts

@@ -1,4 +1,5 @@
-export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
+import { S as StandardHeaders } from './shared/standard-server.R_NaHlxw.mjs';
+export { a as StandardBody, c as StandardLazyRequest, e as StandardLazyResponse, b as StandardRequest, d as StandardResponse } from './shared/standard-server.R_NaHlxw.mjs';
 
 interface EventMessage {
     event: string | undefined;
@@ -51,53 +52,8 @@ type EventMeta = Partial<Pick<EventMessage, 'retry' | 'id' | 'comments'>>;
 declare function withEventMeta<T extends object>(container: T, meta: EventMeta): T;
 declare function getEventMeta(container: unknown): EventMeta | undefined;
 
-interface StandardHeaders {
-    [key: string]: string | string[] | undefined;
-}
-type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
-interface StandardRequest {
-    method: string;
-    url: URL;
-    headers: StandardHeaders;
-    /**
-     * The body has been parsed based on the content-type header.
-     */
-    body: StandardBody;
-    signal: AbortSignal | undefined;
-}
-interface StandardLazyRequest extends Omit<StandardRequest, 'body'> {
-    /**
-     * Can be { adapter: 'fetch', request: Request } | { adapter: 'node', request: IncomingMessage, response: ServerResponse }
-     */
-    raw: Record<string, unknown> & {
-        adapter: string;
-    };
-    /**
-     * The body has been parsed based on the content-type header.
-     * This method can safely call multiple times (cached).
-     */
-    body: () => Promise<StandardBody>;
-}
-interface StandardResponse {
-    status: number;
-    headers: StandardHeaders;
-    /**
-     * The body has been parsed based on the content-type header.
-     */
-    body: StandardBody;
-}
-interface StandardLazyResponse extends Omit<StandardResponse, 'body'> {
-    /**
-     * Can be { adapter: 'fetch', response: Response }
-     */
-    raw: Record<string, unknown> & {
-        adapter: string;
-    };
-    /**
-     * The body has been parsed based on the content-type header.
-     * This method can safely call multiple times (cached).
-     */
-    body: () => Promise<StandardBody>;
-}
+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, type StandardBody, type StandardHeaders, type StandardLazyRequest, type StandardLazyResponse, type StandardRequest, type StandardResponse, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, getEventMeta, withEventMeta };
+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 };

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
+import { S as StandardHeaders } from './shared/standard-server.R_NaHlxw.js';
+export { a as StandardBody, c as StandardLazyRequest, e as StandardLazyResponse, b as StandardRequest, d as StandardResponse } from './shared/standard-server.R_NaHlxw.js';
 
 interface EventMessage {
     event: string | undefined;
@@ -51,53 +52,8 @@ type EventMeta = Partial<Pick<EventMessage, 'retry' | 'id' | 'comments'>>;
 declare function withEventMeta<T extends object>(container: T, meta: EventMeta): T;
 declare function getEventMeta(container: unknown): EventMeta | undefined;
 
-interface StandardHeaders {
-    [key: string]: string | string[] | undefined;
-}
-type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
-interface StandardRequest {
-    method: string;
-    url: URL;
-    headers: StandardHeaders;
-    /**
-     * The body has been parsed based on the content-type header.
-     */
-    body: StandardBody;
-    signal: AbortSignal | undefined;
-}
-interface StandardLazyRequest extends Omit<StandardRequest, 'body'> {
-    /**
-     * Can be { adapter: 'fetch', request: Request } | { adapter: 'node', request: IncomingMessage, response: ServerResponse }
-     */
-    raw: Record<string, unknown> & {
-        adapter: string;
-    };
-    /**
-     * The body has been parsed based on the content-type header.
-     * This method can safely call multiple times (cached).
-     */
-    body: () => Promise<StandardBody>;
-}
-interface StandardResponse {
-    status: number;
-    headers: StandardHeaders;
-    /**
-     * The body has been parsed based on the content-type header.
-     */
-    body: StandardBody;
-}
-interface StandardLazyResponse extends Omit<StandardResponse, 'body'> {
-    /**
-     * Can be { adapter: 'fetch', response: Response }
-     */
-    raw: Record<string, unknown> & {
-        adapter: string;
-    };
-    /**
-     * The body has been parsed based on the content-type header.
-     * This method can safely call multiple times (cached).
-     */
-    body: () => Promise<StandardBody>;
-}
+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, type StandardBody, type StandardHeaders, type StandardLazyRequest, type StandardLazyResponse, type StandardRequest, type StandardResponse, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, getEventMeta, withEventMeta };
+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 };

package/dist/index.mjs

@@ -1,5 +1,4 @@
-import { isTypescriptObject } from '@orpc/shared';
-export { contentDisposition, parse as parseContentDisposition } from '@tinyhttp/content-disposition';
+import { isTypescriptObject, toArray } from '@orpc/shared';
 
 class EventEncoderError extends TypeError {
 }
@@ -183,4 +182,37 @@ function getEventMeta(container) {
   return isTypescriptObject(container) ? Reflect.get(container, EVENT_SOURCE_META_SYMBOL) : void 0;
 }
 
-export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, getEventMeta, withEventMeta };
+function generateContentDisposition(filename) {
+  const escapedFileName = filename.replace(/"/g, '\\"');
+  const encodedFilenameStar = encodeURIComponent(filename).replace(/['()*]/g, (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`).replace(/%(7C|60|5E)/g, (str, hex) => String.fromCharCode(Number.parseInt(hex, 16)));
+  return `inline; filename="${escapedFileName}"; filename*=utf-8''${encodedFilenameStar}`;
+}
+function getFilenameFromContentDisposition(contentDisposition) {
+  const encodedFilenameStarMatch = contentDisposition.match(/filename\*=(UTF-8'')?([^;]*)/i);
+  if (encodedFilenameStarMatch && typeof encodedFilenameStarMatch[2] === "string") {
+    return decodeURIComponent(encodedFilenameStarMatch[2]);
+  }
+  const encodedFilenameMatch = contentDisposition.match(/filename="((?:\\"|[^"])*)"/i);
+  if (encodedFilenameMatch && typeof encodedFilenameMatch[1] === "string") {
+    return encodedFilenameMatch[1].replace(/\\"/g, '"');
+  }
+}
+function mergeStandardHeaders(a, b) {
+  const merged = { ...a };
+  for (const key in b) {
+    if (Array.isArray(b[key])) {
+      merged[key] = [...toArray(merged[key]), ...b[key]];
+    } else if (b[key] !== void 0) {
+      if (Array.isArray(merged[key])) {
+        merged[key] = [...merged[key], b[key]];
+      } else if (merged[key] !== void 0) {
+        merged[key] = [merged[key], b[key]];
+      } else {
+        merged[key] = b[key];
+      }
+    }
+  }
+  return merged;
+}
+
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mergeStandardHeaders, withEventMeta };

package/dist/shared/standard-server.R_NaHlxw.d.mts

@@ -0,0 +1,38 @@
+interface StandardHeaders {
+    [key: string]: string | string[] | undefined;
+}
+type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
+interface StandardRequest {
+    method: string;
+    url: URL;
+    headers: StandardHeaders;
+    /**
+     * The body has been parsed based on the content-type header.
+     */
+    body: StandardBody;
+    signal: AbortSignal | undefined;
+}
+interface StandardLazyRequest extends Omit<StandardRequest, 'body'> {
+    /**
+     * The body has been parsed based on the content-type header.
+     * This method can safely call multiple times (cached).
+     */
+    body: () => Promise<StandardBody>;
+}
+interface StandardResponse {
+    status: number;
+    headers: StandardHeaders;
+    /**
+     * The body has been parsed based on the content-type header.
+     */
+    body: StandardBody;
+}
+interface StandardLazyResponse extends Omit<StandardResponse, 'body'> {
+    /**
+     * The body has been parsed based on the content-type header.
+     * This method can safely call multiple times (cached).
+     */
+    body: () => Promise<StandardBody>;
+}
+
+export type { StandardHeaders as S, StandardBody as a, StandardRequest as b, StandardLazyRequest as c, StandardResponse as d, StandardLazyResponse as e };

package/dist/shared/standard-server.R_NaHlxw.d.ts

@@ -0,0 +1,38 @@
+interface StandardHeaders {
+    [key: string]: string | string[] | undefined;
+}
+type StandardBody = undefined | unknown | Blob | URLSearchParams | FormData | AsyncIterator<unknown | void, unknown | void, undefined>;
+interface StandardRequest {
+    method: string;
+    url: URL;
+    headers: StandardHeaders;
+    /**
+     * The body has been parsed based on the content-type header.
+     */
+    body: StandardBody;
+    signal: AbortSignal | undefined;
+}
+interface StandardLazyRequest extends Omit<StandardRequest, 'body'> {
+    /**
+     * The body has been parsed based on the content-type header.
+     * This method can safely call multiple times (cached).
+     */
+    body: () => Promise<StandardBody>;
+}
+interface StandardResponse {
+    status: number;
+    headers: StandardHeaders;
+    /**
+     * The body has been parsed based on the content-type header.
+     */
+    body: StandardBody;
+}
+interface StandardLazyResponse extends Omit<StandardResponse, 'body'> {
+    /**
+     * The body has been parsed based on the content-type header.
+     * This method can safely call multiple times (cached).
+     */
+    body: () => Promise<StandardBody>;
+}
+
+export type { StandardHeaders as S, StandardBody as a, StandardRequest as b, StandardLazyRequest as c, StandardResponse as d, StandardLazyResponse as e };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/standard-server",
   "type": "module",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.6",
   "license": "MIT",
   "homepage": "https://unnoq.com",
   "repository": {
@@ -17,14 +17,18 @@
       "types": "./dist/index.d.mts",
       "import": "./dist/index.mjs",
       "default": "./dist/index.mjs"
+    },
+    "./batch": {
+      "types": "./dist/batch/index.d.mts",
+      "import": "./dist/batch/index.mjs",
+      "default": "./dist/batch/index.mjs"
     }
   },
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@tinyhttp/content-disposition": "^2.2.2",
-    "@orpc/shared": "1.0.0-beta.4"
+    "@orpc/shared": "1.0.0-beta.6"
   },
   "scripts": {
     "build": "unbuild",