elysia 1.4.28 → 2.0.0-beta.0

package/dist/adapter/web-standard/handler.mjs

@@ -1,401 +1,145 @@
-import {
-  createResponseHandler,
-  createStreamHandler,
-  handleFile,
-  handleSet
-} from "../utils.mjs";
-import { mime } from "../../universal/file.mjs";
-import { isNotEmpty } from "../../utils.mjs";
-import { Cookie } from "../../cookies.mjs";
-import { ElysiaCustomStatusResponse } from "../../error.mjs";
-const handleElysiaFile = (file, set = {
-  headers: {}
-}, request) => {
-  const path = file.path, contentType = mime[path.slice(path.lastIndexOf(".") + 1)];
-  return contentType && (set.headers["content-type"] = contentType), file.stats && set.status !== 206 && set.status !== 304 && set.status !== 412 && set.status !== 416 ? file.stats.then((stat) => {
-    const size = stat.size;
-    return size !== void 0 && (set.headers["content-range"] = `bytes 0-${size - 1}/${size}`, set.headers["content-length"] = size), handleFile(file.value, set, request);
-  }) : handleFile(file.value, set, request);
-}, mapResponse = (response, set, request) => {
-  if (isNotEmpty(set.headers) || set.status !== 200 || set.cookie)
-    switch (handleSet(set), response?.constructor?.name) {
-      case "String":
-        return set.headers["content-type"] || (set.headers["content-type"] = "text/plain"), new Response(response, set);
-      case "Array":
-      case "Object":
-        return set.headers["content-type"] || (set.headers["content-type"] = "application/json"), new Response(JSON.stringify(response), set);
-      case "ElysiaFile":
-        return handleElysiaFile(response, set, request);
-      case "File":
-        return handleFile(response, set, request);
-      case "Blob":
-        return handleFile(response, set, request);
-      case "ElysiaCustomStatusResponse":
-        return set.status = response.code, mapResponse(
-          response.response,
-          set,
-          request
-        );
-      case void 0:
-        return response ? new Response(JSON.stringify(response), set) : new Response("", set);
-      case "Response":
-        return handleResponse(response, set, request);
-      case "Error":
-        return errorToResponse(response, set);
-      case "Promise":
-        return response.then(
-          (x) => mapResponse(x, set, request)
-        );
-      case "Function":
-        return mapResponse(response(), set, request);
-      case "Number":
-      case "Boolean":
-        return new Response(
-          response.toString(),
-          set
-        );
-      case "Cookie":
-        return response instanceof Cookie ? new Response(response.value, set) : new Response(response?.toString(), set);
-      case "FormData":
-        return new Response(response, set);
-      default:
-        if (response instanceof Response)
-          return handleResponse(response, set, request);
-        if (response instanceof Promise)
-          return response.then((x) => mapResponse(x, set));
-        if (response instanceof Error)
-          return errorToResponse(response, set);
-        if (response instanceof ElysiaCustomStatusResponse)
-          return set.status = response.code, mapResponse(
-            response.response,
-            set,
-            request
-          );
-        if (
-          // @ts-expect-error
-          typeof response?.next == "function" || response instanceof ReadableStream
-        )
-          return handleStream(response, set, request);
-        if (typeof response?.then == "function")
-          return response.then(
-            (x) => mapResponse(x, set)
-          );
-        if (Array.isArray(response))
-          return new Response(JSON.stringify(response), {
-            headers: {
-              "Content-Type": "application/json"
-            }
-          });
-        if (typeof response?.toResponse == "function")
-          return mapResponse(response.toResponse(), set);
-        if ("charCodeAt" in response) {
-          const code = response.charCodeAt(0);
-          if (code === 123 || code === 91)
-            return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-              JSON.stringify(response),
-              set
-            );
-        }
-        return new Response(response, set);
-    }
-  return (
-    // @ts-expect-error
-    typeof response?.next == "function" || response instanceof ReadableStream ? handleStream(response, set, request) : mapCompactResponse(response, request)
-  );
-}, mapEarlyResponse = (response, set, request) => {
-  if (response != null)
-    if (isNotEmpty(set.headers) || set.status !== 200 || set.cookie)
-      switch (handleSet(set), response?.constructor?.name) {
-        case "String":
-          return set.headers["content-type"] || (set.headers["content-type"] = "text/plain"), new Response(response, set);
-        case "Array":
-        case "Object":
-          return set.headers["content-type"] || (set.headers["content-type"] = "application/json"), new Response(JSON.stringify(response), set);
-        case "ElysiaFile":
-          return handleElysiaFile(response, set, request);
-        case "File":
-          return handleFile(response, set, request);
-        case "Blob":
-          return handleFile(response, set, request);
-        case "ElysiaCustomStatusResponse":
-          return set.status = response.code, mapEarlyResponse(
-            response.response,
-            set,
-            request
-          );
-        case void 0:
-          return response ? new Response(JSON.stringify(response), set) : void 0;
-        case "Response":
-          return handleResponse(response, set, request);
-        case "Promise":
-          return response.then(
-            (x) => mapEarlyResponse(x, set)
-          );
-        case "Error":
-          return errorToResponse(response, set);
-        case "Function":
-          return mapEarlyResponse(response(), set);
-        case "Number":
-        case "Boolean":
-          return new Response(
-            response.toString(),
-            set
-          );
-        case "FormData":
-          return new Response(response);
-        case "Cookie":
-          return response instanceof Cookie ? new Response(response.value, set) : new Response(response?.toString(), set);
-        default:
-          if (response instanceof Response)
-            return handleResponse(response, set, request);
-          if (response instanceof Promise)
-            return response.then((x) => mapEarlyResponse(x, set));
-          if (response instanceof Error)
-            return errorToResponse(response, set);
-          if (response instanceof ElysiaCustomStatusResponse)
-            return set.status = response.code, mapEarlyResponse(
-              response.response,
-              set,
-              request
-            );
-          if (
-            // @ts-expect-error
-            typeof response?.next == "function" || response instanceof ReadableStream
-          )
-            return handleStream(response, set, request);
-          if (typeof response?.then == "function")
-            return response.then(
-              (x) => mapEarlyResponse(x, set)
-            );
-          if (typeof response?.toResponse == "function")
-            return mapEarlyResponse(response.toResponse(), set);
-          if (Array.isArray(response))
-            return new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json"
-              }
-            });
-          if ("charCodeAt" in response) {
-            const code = response.charCodeAt(0);
-            if (code === 123 || code === 91)
-              return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-                JSON.stringify(response),
-                set
-              );
-          }
-          return new Response(response, set);
-      }
-    else
-      switch (response?.constructor?.name) {
-        case "String":
-          return set.headers["content-type"] || (set.headers["content-type"] = "text/plain"), new Response(response);
-        case "Array":
-        case "Object":
-          return set.headers["content-type"] || (set.headers["content-type"] = "application/json"), new Response(JSON.stringify(response), set);
-        case "ElysiaFile":
-          return handleElysiaFile(response, set, request);
-        case "File":
-          return handleFile(response, set, request);
-        case "Blob":
-          return handleFile(response, set, request);
-        case "ElysiaCustomStatusResponse":
-          return set.status = response.code, mapEarlyResponse(
-            response.response,
-            set,
-            request
-          );
-        case void 0:
-          return response ? new Response(JSON.stringify(response), {
-            headers: {
-              "content-type": "application/json"
-            }
-          }) : new Response("");
-        case "Response":
-          return response;
-        case "Promise":
-          return response.then((x) => {
-            const r = mapEarlyResponse(x, set);
-            if (r !== void 0) return r;
-          });
-        case "Error":
-          return errorToResponse(response, set);
-        case "Function":
-          return mapCompactResponse(response(), request);
-        case "Number":
-        case "Boolean":
-          return new Response(response.toString());
-        case "Cookie":
-          return response instanceof Cookie ? new Response(response.value, set) : new Response(response?.toString(), set);
-        case "FormData":
-          return new Response(response);
-        default:
-          if (response instanceof Response) return response;
-          if (response instanceof Promise)
-            return response.then((x) => mapEarlyResponse(x, set));
-          if (response instanceof Error)
-            return errorToResponse(response, set);
-          if (response instanceof ElysiaCustomStatusResponse)
-            return set.status = response.code, mapEarlyResponse(
-              response.response,
-              set,
-              request
-            );
-          if (
-            // @ts-expect-error
-            typeof response?.next == "function" || response instanceof ReadableStream
-          )
-            return handleStream(response, set, request);
-          if (typeof response?.then == "function")
-            return response.then(
-              (x) => mapEarlyResponse(x, set)
-            );
-          if (typeof response?.toResponse == "function")
-            return mapEarlyResponse(response.toResponse(), set);
-          if (Array.isArray(response))
-            return new Response(JSON.stringify(response), {
-              headers: {
-                "Content-Type": "application/json"
-              }
-            });
-          if ("charCodeAt" in response) {
-            const code = response.charCodeAt(0);
-            if (code === 123 || code === 91)
-              return set.headers["Content-Type"] || (set.headers["Content-Type"] = "application/json"), new Response(
-                JSON.stringify(response),
-                set
-              );
-          }
-          return new Response(response);
-      }
-}, mapCompactResponse = (response, request) => {
-  switch (response?.constructor?.name) {
-    case "String":
-      return new Response(response, {
-        headers: {
-          "Content-Type": "text/plain"
-        }
-      });
-    case "Object":
-    case "Array":
-      return new Response(JSON.stringify(response), {
-        headers: {
-          "Content-Type": "application/json"
-        }
-      });
-    case "ElysiaFile":
-      return handleElysiaFile(response, void 0, request);
-    case "File":
-      return handleFile(response, void 0, request);
-    case "Blob":
-      return handleFile(response, void 0, request);
-    case "ElysiaCustomStatusResponse":
-      return mapResponse(
-        response.response,
-        {
-          status: response.code,
-          headers: {}
-        }
-      );
-    case void 0:
-      return response ? new Response(JSON.stringify(response), {
-        headers: {
-          "content-type": "application/json"
-        }
-      }) : new Response("");
-    case "Response":
-      return response;
-    case "Error":
-      return errorToResponse(response);
-    case "Promise":
-      return response.then(
-        (x) => mapCompactResponse(x, request)
-      );
-    // ? Maybe response or Blob
-    case "Function":
-      return mapCompactResponse(response(), request);
-    case "Number":
-    case "Boolean":
-      return new Response(response.toString());
-    case "FormData":
-      return new Response(response);
-    default:
-      if (response instanceof Response) return response;
-      if (response instanceof Promise)
-        return response.then(
-          (x) => mapCompactResponse(x, request)
-        );
-      if (response instanceof Error)
-        return errorToResponse(response);
-      if (response instanceof ElysiaCustomStatusResponse)
-        return mapResponse(
-          response.response,
-          {
-            status: response.code,
-            headers: {}
-          }
-        );
-      if (
-        // @ts-expect-error
-        typeof response?.next == "function" || response instanceof ReadableStream
-      )
-        return handleStream(response, void 0, request);
-      if (typeof response?.then == "function")
-        return response.then(
-          (x) => mapCompactResponse(x, request)
-        );
-      if (typeof response?.toResponse == "function")
-        return mapCompactResponse(response.toResponse());
-      if (Array.isArray(response))
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "Content-Type": "application/json"
-          }
-        });
-      if ("charCodeAt" in response) {
-        const code = response.charCodeAt(0);
-        if (code === 123 || code === 91)
-          return new Response(JSON.stringify(response), {
-            headers: {
-              "Content-Type": "application/json"
-            }
-          });
-      }
-      return new Response(response);
-  }
-}, errorToResponse = (error, set) => {
-  if (typeof error?.toResponse == "function") {
-    const raw = error.toResponse(), targetSet = set ?? { headers: {}, status: 200, redirect: "" }, apply = (resolved) => (resolved instanceof Response && (targetSet.status = resolved.status), mapResponse(resolved, targetSet));
-    return typeof raw?.then == "function" ? raw.then(apply) : apply(raw);
-  }
-  return new Response(
-    JSON.stringify({
-      name: error?.name,
-      message: error?.message,
-      cause: error?.cause
-    }),
-    {
-      status: set?.status !== 200 ? set?.status ?? 500 : 500,
-      headers: set?.headers
-    }
-  );
-}, createStaticHandler = (handle, hooks, setHeaders = {}) => {
-  if (typeof handle == "function") return;
-  const response = mapResponse(handle, {
-    headers: setHeaders
-  });
-  if (!hooks.parse?.length && !hooks.transform?.length && !hooks.beforeHandle?.length && !hooks.afterHandle?.length)
-    return () => response.clone();
-}, handleResponse = createResponseHandler({
-  mapResponse,
-  mapCompactResponse
-}), handleStream = createStreamHandler({
-  mapResponse,
-  mapCompactResponse
+import { isBun } from "../../universal/constants.mjs";
+import { ElysiaFile, mime } from "../../universal/file.mjs";
+import { formToFormData, isNotEmpty, nullObject } from "../../utils.mjs";
+import { ElysiaStatus, PROBLEM_JSON, internalServerErrorBody } from "../../error.mjs";
+import { defaultHeaders } from "../default-headers.mjs";
+import { createResponseHandler, createStreamHandler, handleFile, handleSet, materializeSetHeaders } from "../utils.mjs";
+
+//#region src/adapter/web-standard/handler.ts
+const textPlainInit = { headers: { "content-type": "text/plain" } };
+function handleElysiaFile(file, set = { headers: nullObject() }, request) {
+	const path = file.path;
+	const contentType = mime[path.slice(path.lastIndexOf(".") + 1).toLowerCase()];
+	const headers = materializeSetHeaders(set);
+	if (contentType) headers["content-type"] = contentType;
+	const stats = file.stats;
+	if (stats) return stats.then((stat) => {
+		const size = stat.size;
+		if (size !== void 0 && set.status !== 206 && set.status !== 304 && set.status !== 412 && set.status !== 416) headers["content-length"] = size;
+		return handleFile(file, set, request, size);
+	});
+	return handleFile(file.value, set, request);
+}
+function mapResponseWithSet(response, set, request, owned) {
+	handleSet(set);
+	const headers = set.headers;
+	switch (response?.constructor?.name) {
+		case "String":
+			if (!isBun && !headers["content-type"]) materializeSetHeaders(set)["content-type"] = "text/plain";
+			return new Response(response, set);
+		case "Array": return Response.json(response, set);
+		case "Object":
+			if (response["~ely-form"]) return new Response(formToFormData(response), set);
+			if (typeof response?.next === "function") return handleStream(response, set, request, void 0, owned);
+			return Response.json(response, set);
+		case "Number":
+		case "Boolean": return new Response(typeof response === "boolean" ? response ? "true" : "false" : response.toString(), set);
+		case "ElysiaFile": return handleElysiaFile(response, set, request);
+		case "File":
+		case "Blob": return handleFile(response, set, request);
+		case "ElysiaStatus":
+			set.status = response.code;
+			if (response.headers) Object.assign(materializeSetHeaders(set), response.headers);
+			return mapResponseWithSet(response.response, set, request, owned);
+		case void 0: return response ? Response.json(response, set) : new Response(null, set);
+		case "Response": return handleResponse(response, set, request, owned);
+		case "Error": return errorToResponse(response, set, request, owned);
+		case "Promise": return response.then((x) => mapResponseWithSet(x, set, request, owned));
+		case "Function": return mapResponseWithSet(response(), set, request, owned);
+		case "FormData": return new Response(response, set);
+		default: return mapFallback(response, set, request, owned);
+	}
+}
+function mapResponse(response, set, request, owned) {
+	const headers = set.headers;
+	if (set.status !== void 0 || set.cookie || headers["\0"] === headers || isNotEmpty(headers)) return mapResponseWithSet(response, set, request, owned);
+	if (response instanceof ElysiaStatus) {
+		set.status = response.code;
+		if (response.headers) Object.assign(set.headers, response.headers);
+		return mapResponse(response.response, set, request, owned);
+	}
+	if (response instanceof Response) return owned ? handleResponse(response, void 0, request, true) : response;
+	if (response instanceof Promise) return response.then((x) => mapResponse(x, set, request, owned));
+	if (typeof response?.next === "function" || response instanceof ReadableStream) return handleStream(response, set, request, void 0, owned);
+	return mapCompactResponse(response, request, owned);
+}
+const textHeaders = isBun ? void 0 : textPlainInit;
+function mapCompactResponse(response, request, owned) {
+	switch (response?.constructor?.name) {
+		case "String": return new Response(response, textHeaders);
+		case "Array": return Response.json(response);
+		case "Object":
+			if (response["~ely-form"]) return new Response(formToFormData(response));
+			return Response.json(response);
+		case "Number":
+		case "Boolean": return new Response(typeof response === "boolean" ? response ? "true" : "false" : response.toString());
+		case "ElysiaFile": return handleElysiaFile(response, void 0, request);
+		case "File":
+		case "Blob": return handleFile(response, void 0, request);
+		case "ElysiaStatus": return mapResponse(response.response, {
+			status: response.code,
+			headers: response.headers ? Object.assign(nullObject(), response.headers) : nullObject()
+		}, request, owned);
+		case void 0: return response ? Response.json(response) : new Response("");
+		case "Response": return owned ? handleResponse(response, void 0, request, true) : response;
+		case "Error": return errorToResponse(response, void 0, request, owned);
+		case "Promise": return response.then((x) => mapCompactResponse(x, request, owned));
+		case "Function": return mapCompactResponse(response(), request, owned);
+		case "FormData": return new Response(response);
+		default: return mapFallback(response, void 0, request, owned);
+	}
+}
+function errorToResponse(error, set, request, owned = false) {
+	if (error?.toResponse) {
+		const targetSet = set ?? { headers: nullObject() };
+		const apply = (resolved) => {
+			if (resolved instanceof Response) targetSet.status = resolved.status;
+			return mapResponse(resolved, targetSet, request, owned);
+		};
+		const raw = error.toResponse();
+		return typeof raw?.then === "function" ? raw.then(apply) : apply(raw);
+	}
+	const status = set?.status && set.status !== 200 ? set.status : 500;
+	const body = internalServerErrorBody(error);
+	body.status = status;
+	const headers = set ? materializeSetHeaders(set) : nullObject();
+	headers["content-type"] = PROBLEM_JSON;
+	return new Response(JSON.stringify(body), {
+		status,
+		headers
+	});
+}
+function mapFallback(response, set, request, owned = false) {
+	if (response instanceof Response) return handleResponse(response, set, request, owned);
+	if (response instanceof Promise) return response.then((x) => set ? mapResponse(x, set, request, owned) : mapCompactResponse(x, request, owned));
+	if (response instanceof Error) return errorToResponse(response, set, request, owned);
+	if (response instanceof ElysiaStatus) if (set) {
+		set.status = response.code;
+		if (response.headers) set.headers = {
+			...set.headers,
+			...response.headers
+		};
+		return mapResponse(response.response, set, request, owned);
+	} else return mapResponse(response.response, {
+		status: response.code,
+		headers: response.headers ? { ...response.headers } : {}
+	}, request, owned);
+	if (response instanceof ElysiaFile) return handleElysiaFile(response, void 0, request);
+	if (typeof response?.next === "function" || response instanceof ReadableStream) return handleStream(response, set, request, void 0, owned);
+	if (typeof response?.then === "function") return response.then((x) => set ? mapResponse(x, set, request, owned) : mapCompactResponse(x, request, owned));
+	if (Array.isArray(response)) return Response.json(response);
+	if (typeof response?.toResponse === "function") return set ? mapResponse(response.toResponse(), set, request, owned) : mapCompactResponse(response.toResponse(), request, owned);
+	if (response?.constructor?.name === "Cookie" && response.jar) return new Response(response.value, set);
+	return new Response(response, set);
+}
+const handleResponse = createResponseHandler({
+	mapResponse,
+	mapCompactResponse
 });
-export {
-  createStaticHandler,
-  errorToResponse,
-  mapCompactResponse,
-  mapEarlyResponse,
-  mapResponse
-};
+const handleStream = createStreamHandler({
+	mapResponse,
+	mapCompactResponse
+});
+
+//#endregion
+export { errorToResponse, mapCompactResponse, mapResponse };

package/dist/adapter/web-standard/index.d.ts

@@ -1,2 +1,5 @@
-import type { ElysiaAdapter } from '../types';
-export declare const WebStandardAdapter: ElysiaAdapter;
+import { ElysiaAdapterOptions } from "../types.js";
+//#region src/adapter/web-standard/index.d.ts
+declare const WebStandardAdapter: ElysiaAdapterOptions<void>;
+//#endregion
+export { WebStandardAdapter };