elysia 2.0.0-beta.2 → 2.0.0-beta.21

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

@@ -1,17 +1,18 @@
 import { isBun } from "../../universal/constants.mjs";
-import { ElysiaFile, mime } from "../../universal/file.mjs";
+import { ElysiaFile } from "../../universal/file.mjs";
 import { formToFormData, isElysiaForm, isNotEmpty, nullObject } from "../../utils.mjs";
+import { isProduction } from "../../universal/is-production.mjs";
 import { ElysiaStatus, PROBLEM_JSON, internalServerErrorBody } from "../../error.mjs";
 import { defaultHeaders } from "../default-headers.mjs";
 import { createResponseHandler, createStreamHandler, handleFile, handleSet, materializeSetHeaders } from "../utils.mjs";
+import { Cookie } from "../../cookie/cookie.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 contentType = file.type;
 	const headers = materializeSetHeaders(set);
-	if (contentType) headers["content-type"] = contentType;
+	if (contentType !== "application/octet-stream") headers["content-type"] = contentType;
 	const stats = file.stats;
 	if (stats) return stats.then((stat) => {
 		const size = stat.size;
@@ -21,12 +22,16 @@ function handleElysiaFile(file, set = { headers: nullObject() }, request) {
 	return handleFile(file.value, set, request);
 }
 function responseTag(response) {
+	if (typeof response === "string") return "String";
 	if (response == null) return;
-	return Object.getPrototypeOf(response)?.constructor?.name;
+	const constructor = Object.getPrototypeOf(response)?.constructor;
+	if (typeof constructor !== "function") return typeof response.next === "function" ? "" : void 0;
+	return constructor.name;
 }
 function mapResponseWithSet(response, set, request, owned) {
 	handleSet(set);
 	const headers = set.headers;
+	if (!isBun && (set.status === 204 || set.status === 304 || set.status === 205) && !(response instanceof Response) && !(response instanceof ElysiaStatus)) return new Response(null, set);
 	switch (responseTag(response)) {
 		case "String":
 			if (!isBun && !headers["content-type"]) materializeSetHeaders(set)["content-type"] = "text/plain";
@@ -37,14 +42,11 @@ function mapResponseWithSet(response, set, request, owned) {
 			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 "Boolean": return new Response(String(response), 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 "ElysiaStatus": return withStatus(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);
@@ -54,14 +56,24 @@ function mapResponseWithSet(response, set, request, owned) {
 		default: return mapFallback(response, set, request, owned);
 	}
 }
+function withStatus(response, set, request, owned) {
+	if (set) set.status = response.status;
+	else set = {
+		status: response.status,
+		headers: nullObject()
+	};
+	if (response.headers) Object.assign(materializeSetHeaders(set), response.headers);
+	return mapResponseWithSet(response.response, set, request, owned);
+}
+const checkRemovedSetRedirect = !isProduction();
 function mapResponse(response, set, request, owned) {
+	if (checkRemovedSetRedirect && Object.hasOwn(set, "redirect") && !isProduction()) {
+		delete set.redirect;
+		throw new Error("[Elysia] set.redirect was removed in 2.0 — return redirect(url) instead");
+	}
 	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 ElysiaStatus) return withStatus(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);
@@ -75,14 +87,11 @@ function mapCompactResponse(response, request, owned) {
 		case "ElysiaForm": return new Response(formToFormData(response));
 		case "Object": return Response.json(response);
 		case "Number":
-		case "Boolean": return new Response(typeof response === "boolean" ? response ? "true" : "false" : response.toString());
+		case "Boolean": return new Response(String(response));
 		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 "ElysiaStatus": return withStatus(response, void 0, 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);
@@ -114,28 +123,30 @@ function errorToResponse(error, set, request, owned = false) {
 }
 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 (response instanceof ElysiaStatus) {
+		if (set && response.headers) {
+			set.status = response.status;
+			set.headers = {
+				...set.headers,
+				...response.headers
+			};
+			return mapResponse(response.response, set, request, owned);
+		}
+		return withStatus(response, set, request, owned);
+	}
+	if (response instanceof ElysiaFile) return handleElysiaFile(response, set, request);
 	if (isElysiaForm(response)) return new Response(formToFormData(response), set);
 	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 (responseTag(response) === "Cookie") return set ? mapResponse(response.value, set, request, owned) : mapCompactResponse(response.value, request, owned);
+	if (typeof response?.then === "function") return response.then((x) => remap(x, set, request, owned));
+	if (Array.isArray(response)) return Response.json(response, set);
+	if (typeof response?.toResponse === "function") return remap(response.toResponse(), set, request, owned);
+	if (responseTag(response) === "Cookie" && Cookie.isCookie(response)) return remap(response.value, set, request, owned);
 	return new Response(response, set);
 }
+function remap(response, set, request, owned) {
+	return set ? mapResponse(response, set, request, owned) : mapCompactResponse(response, request, owned);
+}
 const handleResponse = createResponseHandler({
 	mapResponse,
 	mapCompactResponse

package/dist/adapter/web-standard/index.js

@@ -1,49 +1,21 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_universal_constants = require('../../universal/constants.js');
 const require_adapter_index = require('../index.js');
-const require_adapter_utils = require('../utils.js');
 const require_adapter_web_standard_handler = require('./handler.js');
 const require_adapter_web_standard_utils = require('./utils.js');
 const require_parse_query = require('../../parse-query.js');
 
 //#region src/adapter/web-standard/index.ts
-function lowercaseContentType(ct) {
-	for (let i = 0; i < ct.length; i++) {
-		const code = ct.charCodeAt(i);
-		if (code >= 65 && code <= 90) return ct.toLowerCase();
-	}
-	return ct;
-}
-function parseFormData(context, contentType) {
-	contentType ??= context.request.headers.get("content-type") ?? "";
-	const ct = lowercaseContentType(contentType);
-	if (require_universal_constants.isBun && ct !== contentType) {
-		const fullCt = context.request.headers.get("content-type") ?? "";
-		const semi = fullCt.indexOf(";");
-		const fixedCt = semi === -1 ? lowercaseContentType(fullCt) : lowercaseContentType(fullCt.slice(0, semi)) + fullCt.slice(semi);
-		const headers = new Headers(context.request.headers);
-		headers.set("content-type", fixedCt);
-		return new Request(context.request.url, {
-			method: context.request.method,
-			headers,
-			body: context.request.body,
-			duplex: "half"
-		}).formData().then(require_adapter_web_standard_utils.formDataToObject);
-	}
+function parseFormData(context) {
 	return context.request.formData().then(require_adapter_web_standard_utils.formDataToObject);
 }
 const WebStandardAdapter = require_adapter_index.createAdapter({
-	name: "web-standard",
-	runtime: "unknown",
-	isWebStandard: true,
 	parse: {
 		arrayBuffer: (context) => context.request.arrayBuffer(),
 		formData: parseFormData,
 		json: (context) => context.request.json(),
 		text: (context) => context.request.text(),
 		urlencoded: (context) => context.request.text().then(require_parse_query.parseQuery),
-		default(context, contentType, normalized) {
-			const ct = normalized ? contentType : require_adapter_utils.normalizeContentType(contentType);
+		default(context, ct) {
 			switch (ct.charCodeAt(12)) {
 				case 106:
 					if (ct === "application/json") return context.request.json();

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

@@ -1,48 +1,20 @@
-import { isBun } from "../../universal/constants.mjs";
 import { createAdapter } from "../index.mjs";
-import { normalizeContentType } from "../utils.mjs";
 import { mapCompactResponse, mapResponse } from "./handler.mjs";
 import { formDataToObject } from "./utils.mjs";
 import { parseQuery } from "../../parse-query.mjs";
 
 //#region src/adapter/web-standard/index.ts
-function lowercaseContentType(ct) {
-	for (let i = 0; i < ct.length; i++) {
-		const code = ct.charCodeAt(i);
-		if (code >= 65 && code <= 90) return ct.toLowerCase();
-	}
-	return ct;
-}
-function parseFormData(context, contentType) {
-	contentType ??= context.request.headers.get("content-type") ?? "";
-	const ct = lowercaseContentType(contentType);
-	if (isBun && ct !== contentType) {
-		const fullCt = context.request.headers.get("content-type") ?? "";
-		const semi = fullCt.indexOf(";");
-		const fixedCt = semi === -1 ? lowercaseContentType(fullCt) : lowercaseContentType(fullCt.slice(0, semi)) + fullCt.slice(semi);
-		const headers = new Headers(context.request.headers);
-		headers.set("content-type", fixedCt);
-		return new Request(context.request.url, {
-			method: context.request.method,
-			headers,
-			body: context.request.body,
-			duplex: "half"
-		}).formData().then(formDataToObject);
-	}
+function parseFormData(context) {
 	return context.request.formData().then(formDataToObject);
 }
 const WebStandardAdapter = createAdapter({
-	name: "web-standard",
-	runtime: "unknown",
-	isWebStandard: true,
 	parse: {
 		arrayBuffer: (context) => context.request.arrayBuffer(),
 		formData: parseFormData,
 		json: (context) => context.request.json(),
 		text: (context) => context.request.text(),
 		urlencoded: (context) => context.request.text().then(parseQuery),
-		default(context, contentType, normalized) {
-			const ct = normalized ? contentType : normalizeContentType(contentType);
+		default(context, ct) {
 			switch (ct.charCodeAt(12)) {
 				case 106:
 					if (ct === "application/json") return context.request.json();

package/dist/adapter/web-standard/utils.js

@@ -32,7 +32,7 @@ function resolveValue(entries) {
 		return typeof v === "string" ? tryParseJson(v) ?? v : v;
 	}
 	let jsonObj;
-	let fileCount = 0;
+	let files;
 	const result = new Array(length);
 	for (let i = 0; i < length; i++) {
 		const e = entries[i];
@@ -41,26 +41,13 @@ function resolveValue(entries) {
 			if (jsonObj === void 0 && parsed && !Array.isArray(parsed)) jsonObj = parsed;
 			result[i] = parsed ?? e;
 		} else {
-			if (HAS_FILE && e instanceof File) fileCount++;
+			if (HAS_FILE && e instanceof File) (files ??= []).push(e);
 			result[i] = e;
 		}
 	}
-	if (fileCount && jsonObj) {
-		if (fileCount === 1 && !("file" in jsonObj)) for (let i = 0; i < length; i++) {
-			const e = entries[i];
-			if (HAS_FILE && e instanceof File) {
-				jsonObj.file = e;
-				break;
-			}
-		}
-		else if (!("files" in jsonObj)) {
-			const files = [];
-			for (let i = 0; i < length; i++) {
-				const e = entries[i];
-				if (HAS_FILE && e instanceof File) files.push(e);
-			}
-			jsonObj.files = files;
-		}
+	if (files && jsonObj) {
+		if (files.length === 1 && !("file" in jsonObj)) jsonObj.file = files[0];
+		else if (!("files" in jsonObj)) jsonObj.files = files;
 		return jsonObj;
 	}
 	return result;

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

@@ -31,7 +31,7 @@ function resolveValue(entries) {
 		return typeof v === "string" ? tryParseJson(v) ?? v : v;
 	}
 	let jsonObj;
-	let fileCount = 0;
+	let files;
 	const result = new Array(length);
 	for (let i = 0; i < length; i++) {
 		const e = entries[i];
@@ -40,26 +40,13 @@ function resolveValue(entries) {
 			if (jsonObj === void 0 && parsed && !Array.isArray(parsed)) jsonObj = parsed;
 			result[i] = parsed ?? e;
 		} else {
-			if (HAS_FILE && e instanceof File) fileCount++;
+			if (HAS_FILE && e instanceof File) (files ??= []).push(e);
 			result[i] = e;
 		}
 	}
-	if (fileCount && jsonObj) {
-		if (fileCount === 1 && !("file" in jsonObj)) for (let i = 0; i < length; i++) {
-			const e = entries[i];
-			if (HAS_FILE && e instanceof File) {
-				jsonObj.file = e;
-				break;
-			}
-		}
-		else if (!("files" in jsonObj)) {
-			const files = [];
-			for (let i = 0; i < length; i++) {
-				const e = entries[i];
-				if (HAS_FILE && e instanceof File) files.push(e);
-			}
-			jsonObj.files = files;
-		}
+	if (files && jsonObj) {
+		if (files.length === 1 && !("file" in jsonObj)) jsonObj.file = files[0];
+		else if (!("files" in jsonObj)) jsonObj.files = files;
 		return jsonObj;
 	}
 	return result;