@temporary-name/standard-server 1.9.3-alpha.b7ce8fb6e9463a26fd2564cb172dc612ae4de52d → 1.9.3-alpha.c13915862ce0feb161cb37a7c0da5ab7d57bd1bf

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AsyncIteratorClass, StandardHeaders, StandardLazyResponse } from '@temporary-name/shared';
+import { AsyncIteratorClass, StandardLazyResponse } from '@temporary-name/shared';
 
 interface EventMessage {
     event: string | undefined;
@@ -69,10 +69,9 @@ declare class HibernationEventIterator<T, TReturn = unknown, TNext = unknown> ex
 
 declare function generateContentDisposition(filename: string): string;
 declare function getFilenameFromContentDisposition(contentDisposition: string): string | undefined;
-declare function mergeStandardHeaders(a: StandardHeaders, b: StandardHeaders): StandardHeaders;
-declare function flattenHeader(header: string | readonly string[] | undefined): string | undefined;
+declare function maybeSetHeader(headers: Headers, name: string, value: string | readonly string[] | null | undefined): void;
+declare function setHeaderArray(headers: Headers, name: string, values: readonly string[]): void;
 declare function replicateStandardLazyResponse(response: StandardLazyResponse, count: number): StandardLazyResponse[];
-declare function isEventIteratorHeaders(headers: StandardHeaders): boolean;
 
-export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, HibernationEventIterator, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, flattenHeader, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, isEventIteratorHeaders, mapEventIterator, mergeStandardHeaders, replicateStandardLazyResponse, withEventMeta };
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, HibernationEventIterator, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mapEventIterator, maybeSetHeader, replicateStandardLazyResponse, setHeaderArray, withEventMeta };
 export type { ErrorEventOptions, EventDecoderOptions, EventMessage, EventMeta, HibernationEventIteratorCallback };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { AsyncIteratorClass, StandardHeaders, StandardLazyResponse } from '@temporary-name/shared';
+import { AsyncIteratorClass, StandardLazyResponse } from '@temporary-name/shared';
 
 interface EventMessage {
     event: string | undefined;
@@ -69,10 +69,9 @@ declare class HibernationEventIterator<T, TReturn = unknown, TNext = unknown> ex
 
 declare function generateContentDisposition(filename: string): string;
 declare function getFilenameFromContentDisposition(contentDisposition: string): string | undefined;
-declare function mergeStandardHeaders(a: StandardHeaders, b: StandardHeaders): StandardHeaders;
-declare function flattenHeader(header: string | readonly string[] | undefined): string | undefined;
+declare function maybeSetHeader(headers: Headers, name: string, value: string | readonly string[] | null | undefined): void;
+declare function setHeaderArray(headers: Headers, name: string, values: readonly string[]): void;
 declare function replicateStandardLazyResponse(response: StandardLazyResponse, count: number): StandardLazyResponse[];
-declare function isEventIteratorHeaders(headers: StandardHeaders): boolean;
 
-export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, HibernationEventIterator, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, flattenHeader, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, isEventIteratorHeaders, mapEventIterator, mergeStandardHeaders, replicateStandardLazyResponse, withEventMeta };
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, HibernationEventIterator, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mapEventIterator, maybeSetHeader, replicateStandardLazyResponse, setHeaderArray, withEventMeta };
 export type { ErrorEventOptions, EventDecoderOptions, EventMessage, EventMeta, HibernationEventIteratorCallback };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { isTypescriptObject, AsyncIteratorClass, tryDecodeURIComponent, toArray, once, isAsyncIteratorObject, replicateAsyncIterator } from '@temporary-name/shared';
+import { isTypescriptObject, AsyncIteratorClass, tryDecodeURIComponent, once, isAsyncIteratorObject, replicateAsyncIterator } from '@temporary-name/shared';
 
 class EventEncoderError extends TypeError {
 }
@@ -259,31 +259,18 @@ function getFilenameFromContentDisposition(contentDisposition) {
     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];
-      }
-    }
+function maybeSetHeader(headers, name, value) {
+  if (typeof value === "string") {
+    headers.set(name, value);
+  } else if (value != null) {
+    setHeaderArray(headers, name, value);
   }
-  return merged;
 }
-function flattenHeader(header) {
-  if (typeof header === "string" || header === void 0) {
-    return header;
-  }
-  if (header.length === 0) {
-    return void 0;
+function setHeaderArray(headers, name, values) {
+  headers.delete(name);
+  for (const value of values) {
+    headers.append(name, value);
   }
-  return header.join(", ");
 }
 function replicateStandardLazyResponse(response, count) {
   const replicated = [];
@@ -304,10 +291,5 @@ function replicateStandardLazyResponse(response, count) {
   }
   return replicated;
 }
-function isEventIteratorHeaders(headers) {
-  return Boolean(
-    flattenHeader(headers["content-type"])?.startsWith("text/event-stream") && flattenHeader(headers["content-disposition"]) === void 0
-  );
-}
 
-export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, HibernationEventIterator, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, flattenHeader, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, isEventIteratorHeaders, mapEventIterator, mergeStandardHeaders, replicateStandardLazyResponse, withEventMeta };
+export { ErrorEvent, EventDecoder, EventDecoderError, EventDecoderStream, EventEncoderError, HibernationEventIterator, assertEventComment, assertEventId, assertEventName, assertEventRetry, decodeEventMessage, encodeEventComments, encodeEventData, encodeEventMessage, generateContentDisposition, getEventMeta, getFilenameFromContentDisposition, mapEventIterator, maybeSetHeader, replicateStandardLazyResponse, setHeaderArray, withEventMeta };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@temporary-name/standard-server",
   "type": "module",
-  "version": "1.9.3-alpha.b7ce8fb6e9463a26fd2564cb172dc612ae4de52d",
+  "version": "1.9.3-alpha.c13915862ce0feb161cb37a7c0da5ab7d57bd1bf",
   "license": "MIT",
   "homepage": "https://www.stainless.com/",
   "repository": {
@@ -17,18 +17,13 @@
       "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": {
-    "@temporary-name/shared": "1.9.3-alpha.b7ce8fb6e9463a26fd2564cb172dc612ae4de52d"
+    "@temporary-name/shared": "1.9.3-alpha.c13915862ce0feb161cb37a7c0da5ab7d57bd1bf"
   },
   "scripts": {
     "build": "unbuild",

package/dist/batch/index.d.mts

@@ -1,29 +0,0 @@
-import { StandardHeaders, StandardRequest, StandardResponse, Promisable } from '@temporary-name/shared';
-
-interface ToBatchRequestOptions {
-    url: URL;
-    method: 'GET' | 'POST';
-    headers: StandardHeaders;
-    requests: readonly StandardRequest[];
-}
-declare function toBatchRequest(options: ToBatchRequestOptions): StandardRequest;
-declare function parseBatchRequest(request: StandardRequest): StandardRequest[];
-
-type BatchResponseMode = 'streaming' | 'buffered';
-interface BatchResponseBodyItem extends StandardResponse {
-    index: number;
-}
-interface ToBatchResponseOptions extends StandardResponse {
-    body: AsyncIteratorObject<BatchResponseBodyItem>;
-    /**
-     * @default 'streaming'
-     */
-    mode?: BatchResponseMode;
-}
-declare function toBatchResponse(options: ToBatchResponseOptions): Promisable<StandardResponse>;
-declare function parseBatchResponse(response: StandardResponse): AsyncGenerator<BatchResponseBodyItem>;
-
-declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal | undefined;
-
-export { parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };
-export type { BatchResponseBodyItem, BatchResponseMode, ToBatchRequestOptions, ToBatchResponseOptions };

package/dist/batch/index.d.ts

@@ -1,29 +0,0 @@
-import { StandardHeaders, StandardRequest, StandardResponse, Promisable } from '@temporary-name/shared';
-
-interface ToBatchRequestOptions {
-    url: URL;
-    method: 'GET' | 'POST';
-    headers: StandardHeaders;
-    requests: readonly StandardRequest[];
-}
-declare function toBatchRequest(options: ToBatchRequestOptions): StandardRequest;
-declare function parseBatchRequest(request: StandardRequest): StandardRequest[];
-
-type BatchResponseMode = 'streaming' | 'buffered';
-interface BatchResponseBodyItem extends StandardResponse {
-    index: number;
-}
-interface ToBatchResponseOptions extends StandardResponse {
-    body: AsyncIteratorObject<BatchResponseBodyItem>;
-    /**
-     * @default 'streaming'
-     */
-    mode?: BatchResponseMode;
-}
-declare function toBatchResponse(options: ToBatchResponseOptions): Promisable<StandardResponse>;
-declare function parseBatchResponse(response: StandardResponse): AsyncGenerator<BatchResponseBodyItem>;
-
-declare function toBatchAbortSignal(signals: readonly (AbortSignal | undefined)[]): AbortSignal | undefined;
-
-export { parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };
-export type { BatchResponseBodyItem, BatchResponseMode, ToBatchRequestOptions, ToBatchResponseOptions };

package/dist/batch/index.mjs

@@ -1,156 +0,0 @@
-import { stringifyJSON, parseEmptyableJSON, AsyncIteratorClass, isAsyncIteratorObject, isObject } from '@temporary-name/shared';
-
-function toBatchAbortSignal(signals) {
-  const realSignals = signals.filter((signal) => signal !== void 0);
-  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",
-      () => {
-        abortIfAllInputsAborted();
-      },
-      {
-        once: true,
-        signal: controller.signal
-      }
-    );
-  }
-  return controller.signal;
-}
-
-function toBatchRequest(options) {
-  const url = new URL(options.url);
-  let body;
-  const batchRequestItems = options.requests.map(
-    (request) => ({
-      body: request.body,
-      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") {
-    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 ?? request.method,
-      url: new URL(item.url),
-      headers: item.headers ?? {},
-      body: item.body,
-      signal: request.signal
-    };
-  });
-}
-
-function toBatchResponse(options) {
-  const mode = options.mode ?? "streaming";
-  const minifyResponseItem = (item) => {
-    return {
-      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
-    };
-  };
-  if (mode === "buffered") {
-    return (async () => {
-      try {
-        const body = [];
-        for await (const item of options.body) {
-          body.push(minifyResponseItem(item));
-        }
-        return {
-          headers: options.headers,
-          status: options.status,
-          body
-        };
-      } finally {
-        await options.body.return?.();
-      }
-    })();
-  }
-  return {
-    headers: options.headers,
-    status: options.status,
-    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?.();
-        }
-      }
-    )
-  };
-}
-function parseBatchResponse(response) {
-  const body = response.body;
-  if (isAsyncIteratorObject(body) || Array.isArray(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
-          });
-        }
-        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
-  });
-}
-
-export { parseBatchRequest, parseBatchResponse, toBatchAbortSignal, toBatchRequest, toBatchResponse };