elysia 1.0.21 → 1.0.23

package/dist/dynamic-handle.mjs

@@ -293,6 +293,12 @@ var parseCookie = async (set, cookieString, {
           throw new InvalidCookieSignature(name);
       }
     }
+    if (value == null) {
+      jar[name] = {
+        value: v
+      };
+      continue;
+    }
     const start = value.charCodeAt(0);
     if (start === 123 || start === 91)
       try {
@@ -542,7 +548,7 @@ var validateFile = (options, value) => {
     }
   return true;
 };
-var File = TypeRegistry.Get("Files") ?? TypeSystem.Type("File", validateFile);
+var File2 = TypeRegistry.Get("Files") ?? TypeSystem.Type("File", validateFile);
 var Files = TypeRegistry.Get("Files") ?? TypeSystem.Type(
   "Files",
   (options, value) => {
@@ -688,7 +694,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -895,12 +901,25 @@ var isNumericString = (message) => {
   }
   return false;
 };
-var redirect = (url, status = 301) => new Response(null, {
-  status,
-  headers: {
-    Location: url
+var redirect = (url, status = 301) => Response.redirect(url, status);
+var ELYSIA_FORM_DATA = Symbol("ElysiaFormData");
+var form = (items) => {
+  const formData = new FormData();
+  for (const [key, value] of Object.entries(items)) {
+    if (Array.isArray(value)) {
+      for (const v of value) {
+        if (value instanceof File)
+          formData.append(key, value, value.name);
+        formData.append(key, v);
+      }
+      continue;
+    }
+    if (value instanceof File)
+      formData.append(key, value, value.name);
+    formData.append(key, value);
   }
-});
+  return formData;
+};
 
 // src/handler.ts
 var hasHeaderShorthand = "toJSON" in new Headers();
@@ -1008,9 +1027,21 @@ var mapResponse = (response, set, request) => {
         return new Response(response, set);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
         return Response.json(response, set);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(form(response));
+            default:
+              break;
+          }
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         if (!set.headers["content-type"]?.startsWith(
           "text/event-stream"
@@ -1084,6 +1115,8 @@ var mapResponse = (response, set, request) => {
         if (response instanceof Cookie)
           return new Response(response.value, set);
         return new Response(response?.toString(), set);
+      case "FormData":
+        return new Response(response, set);
       default:
         if (response instanceof Response) {
           let isCookieSet2 = false;
@@ -1124,6 +1157,8 @@ var mapResponse = (response, set, request) => {
           return response.then((x) => mapResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1143,13 +1178,24 @@ var mapResponse = (response, set, request) => {
         return new Response(response);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "content-type": "application/json"
+        return Response.json(response);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(
+                form(response),
+                set
+              );
+            default:
+              break;
           }
-        });
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         request?.signal.addEventListener(
           "abort",
@@ -1196,6 +1242,8 @@ var mapResponse = (response, set, request) => {
         if (response instanceof Cookie)
           return new Response(response.value, set);
         return new Response(response?.toString(), set);
+      case "FormData":
+        return new Response(response, set);
       default:
         if (response instanceof Response)
           return new Response(response.body, {
@@ -1207,6 +1255,8 @@ var mapResponse = (response, set, request) => {
           return response.then((x) => mapResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1250,9 +1300,24 @@ var mapEarlyResponse = (response, set, request) => {
         return new Response(response, set);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
         return Response.json(response, set);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(
+                form(response),
+                set
+              );
+            default:
+              break;
+          }
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         if (!set.headers["content-type"]?.startsWith(
           "text/event-stream"
@@ -1324,6 +1389,8 @@ var mapEarlyResponse = (response, set, request) => {
           response.toString(),
           set
         );
+      case "FormData":
+        return new Response(response);
       case "Cookie":
         if (response instanceof Cookie)
           return new Response(response.value, set);
@@ -1364,6 +1431,8 @@ var mapEarlyResponse = (response, set, request) => {
           return response.then((x) => mapEarlyResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapEarlyResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1383,13 +1452,24 @@ var mapEarlyResponse = (response, set, request) => {
         return new Response(response);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "content-type": "application/json"
+        return Response.json(response);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(
+                form(response),
+                set
+              );
+            default:
+              break;
           }
-        });
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         request?.signal.addEventListener(
           "abort",
@@ -1435,6 +1515,8 @@ var mapEarlyResponse = (response, set, request) => {
         if (response instanceof Cookie)
           return new Response(response.value, set);
         return new Response(response?.toString(), set);
+      case "FormData":
+        return new Response(response);
       default:
         if (response instanceof Response)
           return new Response(response.body, {
@@ -1446,6 +1528,8 @@ var mapEarlyResponse = (response, set, request) => {
           return response.then((x) => mapEarlyResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapEarlyResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1474,13 +1558,23 @@ var mapCompactResponse = (response, request) => {
       return new Response(response);
     case "Blob":
       return handleFile(response);
-    case "Object":
     case "Array":
-      return new Response(JSON.stringify(response), {
-        headers: {
-          "content-type": "application/json"
-        }
-      });
+      return Response.json(response);
+    case "Object":
+      form:
+        for (const value of Object.values(response))
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(form(response));
+            case "Object":
+              break form;
+            default:
+              break;
+          }
+      return Response.json(response);
     case "ReadableStream":
       request?.signal.addEventListener(
         "abort",
@@ -1520,6 +1614,8 @@ var mapCompactResponse = (response, request) => {
     case "Number":
     case "Boolean":
       return new Response(response.toString());
+    case "FormData":
+      return new Response(response);
     default:
       if (response instanceof Response)
         return new Response(response.body, {
@@ -1531,6 +1627,8 @@ var mapCompactResponse = (response, request) => {
         return response.then(mapCompactResponse);
       if (response instanceof Error)
         return errorToResponse(response);
+      if ("toResponse" in response)
+        return mapCompactResponse(response.toResponse());
       if ("charCodeAt" in response) {
         const code = response.charCodeAt(0);
         if (code === 123 || code === 91) {
@@ -1611,11 +1709,11 @@ var createDynamicHandler = (app) => async (request) => {
             break;
           case "multipart/form-data":
             body = {};
-            const form = await request.formData();
-            for (const key of form.keys()) {
+            const form2 = await request.formData();
+            for (const key of form2.keys()) {
               if (body[key])
                 continue;
-              const value = form.getAll(key);
+              const value = form2.getAll(key);
               if (value.length === 1)
                 body[key] = value[0];
               else
@@ -1657,11 +1755,11 @@ var createDynamicHandler = (app) => async (request) => {
                 break;
               case "multipart/form-data":
                 body = {};
-                const form = await request.formData();
-                for (const key of form.keys()) {
+                const form2 = await request.formData();
+                for (const key of form2.keys()) {
                   if (body[key])
                     continue;
-                  const value = form.getAll(key);
+                  const value = form2.getAll(key);
                   if (value.length === 1)
                     body[key] = value[0];
                   else

package/dist/error.mjs

@@ -242,7 +242,7 @@ var validateFile = (options, value) => {
     }
   return true;
 };
-var File = TypeRegistry.Get("Files") ?? TypeSystem.Type("File", validateFile);
+var File2 = TypeRegistry.Get("Files") ?? TypeSystem.Type("File", validateFile);
 var Files = TypeRegistry.Get("Files") ?? TypeSystem.Type(
   "Files",
   (options, value) => {
@@ -388,7 +388,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -550,6 +550,7 @@ var InvertedStatusMap = Object.fromEntries(
   Object.entries(StatusMap).map(([k, v]) => [v, k])
 );
 var encoder = new TextEncoder();
+var ELYSIA_FORM_DATA = Symbol("ElysiaFormData");
 
 // src/error.ts
 var env = typeof Bun !== "undefined" ? Bun.env : typeof process !== "undefined" ? process?.env : void 0;

package/dist/handler.mjs

@@ -442,7 +442,7 @@ var validateFile = (options, value) => {
     }
   return true;
 };
-var File = TypeRegistry.Get("Files") ?? TypeSystem.Type("File", validateFile);
+var File2 = TypeRegistry.Get("Files") ?? TypeSystem.Type("File", validateFile);
 var Files = TypeRegistry.Get("Files") ?? TypeSystem.Type(
   "Files",
   (options, value) => {
@@ -588,7 +588,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -750,6 +750,24 @@ var InvertedStatusMap = Object.fromEntries(
   Object.entries(StatusMap).map(([k, v]) => [v, k])
 );
 var encoder = new TextEncoder();
+var ELYSIA_FORM_DATA = Symbol("ElysiaFormData");
+var form = (items) => {
+  const formData = new FormData();
+  for (const [key, value] of Object.entries(items)) {
+    if (Array.isArray(value)) {
+      for (const v of value) {
+        if (value instanceof File)
+          formData.append(key, value, value.name);
+        formData.append(key, v);
+      }
+      continue;
+    }
+    if (value instanceof File)
+      formData.append(key, value, value.name);
+    formData.append(key, value);
+  }
+  return formData;
+};
 
 // src/handler.ts
 var hasHeaderShorthand = "toJSON" in new Headers();
@@ -857,9 +875,21 @@ var mapResponse = (response, set, request) => {
         return new Response(response, set);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
         return Response.json(response, set);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(form(response));
+            default:
+              break;
+          }
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         if (!set.headers["content-type"]?.startsWith(
           "text/event-stream"
@@ -933,6 +963,8 @@ var mapResponse = (response, set, request) => {
         if (response instanceof Cookie)
           return new Response(response.value, set);
         return new Response(response?.toString(), set);
+      case "FormData":
+        return new Response(response, set);
       default:
         if (response instanceof Response) {
           let isCookieSet2 = false;
@@ -973,6 +1005,8 @@ var mapResponse = (response, set, request) => {
           return response.then((x) => mapResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -992,13 +1026,24 @@ var mapResponse = (response, set, request) => {
         return new Response(response);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "content-type": "application/json"
+        return Response.json(response);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(
+                form(response),
+                set
+              );
+            default:
+              break;
           }
-        });
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         request?.signal.addEventListener(
           "abort",
@@ -1045,6 +1090,8 @@ var mapResponse = (response, set, request) => {
         if (response instanceof Cookie)
           return new Response(response.value, set);
         return new Response(response?.toString(), set);
+      case "FormData":
+        return new Response(response, set);
       default:
         if (response instanceof Response)
           return new Response(response.body, {
@@ -1056,6 +1103,8 @@ var mapResponse = (response, set, request) => {
           return response.then((x) => mapResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1099,9 +1148,24 @@ var mapEarlyResponse = (response, set, request) => {
         return new Response(response, set);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
         return Response.json(response, set);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(
+                form(response),
+                set
+              );
+            default:
+              break;
+          }
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         if (!set.headers["content-type"]?.startsWith(
           "text/event-stream"
@@ -1173,6 +1237,8 @@ var mapEarlyResponse = (response, set, request) => {
           response.toString(),
           set
         );
+      case "FormData":
+        return new Response(response);
       case "Cookie":
         if (response instanceof Cookie)
           return new Response(response.value, set);
@@ -1213,6 +1279,8 @@ var mapEarlyResponse = (response, set, request) => {
           return response.then((x) => mapEarlyResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapEarlyResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1232,13 +1300,24 @@ var mapEarlyResponse = (response, set, request) => {
         return new Response(response);
       case "Blob":
         return handleFile(response, set);
-      case "Object":
       case "Array":
-        return new Response(JSON.stringify(response), {
-          headers: {
-            "content-type": "application/json"
+        return Response.json(response);
+      case "Object":
+        for (const value in Object.values(response)) {
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(
+                form(response),
+                set
+              );
+            default:
+              break;
           }
-        });
+        }
+        return Response.json(response, set);
       case "ReadableStream":
         request?.signal.addEventListener(
           "abort",
@@ -1284,6 +1363,8 @@ var mapEarlyResponse = (response, set, request) => {
         if (response instanceof Cookie)
           return new Response(response.value, set);
         return new Response(response?.toString(), set);
+      case "FormData":
+        return new Response(response);
       default:
         if (response instanceof Response)
           return new Response(response.body, {
@@ -1295,6 +1376,8 @@ var mapEarlyResponse = (response, set, request) => {
           return response.then((x) => mapEarlyResponse(x, set));
         if (response instanceof Error)
           return errorToResponse(response, set);
+        if ("toResponse" in response)
+          return mapEarlyResponse(response.toResponse(), set);
         if ("charCodeAt" in response) {
           const code = response.charCodeAt(0);
           if (code === 123 || code === 91) {
@@ -1323,13 +1406,23 @@ var mapCompactResponse = (response, request) => {
       return new Response(response);
     case "Blob":
       return handleFile(response);
-    case "Object":
     case "Array":
-      return new Response(JSON.stringify(response), {
-        headers: {
-          "content-type": "application/json"
-        }
-      });
+      return Response.json(response);
+    case "Object":
+      form:
+        for (const value of Object.values(response))
+          switch (value?.constructor?.name) {
+            case "Blob":
+            case "File":
+            case "ArrayBuffer":
+            case "FileRef":
+              return new Response(form(response));
+            case "Object":
+              break form;
+            default:
+              break;
+          }
+      return Response.json(response);
     case "ReadableStream":
       request?.signal.addEventListener(
         "abort",
@@ -1369,6 +1462,8 @@ var mapCompactResponse = (response, request) => {
     case "Number":
     case "Boolean":
       return new Response(response.toString());
+    case "FormData":
+      return new Response(response);
     default:
       if (response instanceof Response)
         return new Response(response.body, {
@@ -1380,6 +1475,8 @@ var mapCompactResponse = (response, request) => {
         return response.then(mapCompactResponse);
       if (response instanceof Error)
         return errorToResponse(response);
+      if ("toResponse" in response)
+        return mapCompactResponse(response.toResponse());
       if ("charCodeAt" in response) {
         const code = response.charCodeAt(0);
         if (code === 123 || code === 91) {

package/dist/index.d.ts

@@ -1418,7 +1418,7 @@ export { Elysia };
 export { mapResponse, mapCompactResponse, mapEarlyResponse } from './handler';
 export { t } from './type-system';
 export { Cookie, type CookieOptions } from './cookies';
-export { getSchemaValidator, mergeHook, mergeObjectArray, getResponseSchemaValidator, redirect, StatusMap, InvertedStatusMap } from './utils';
+export { getSchemaValidator, mergeHook, mergeObjectArray, getResponseSchemaValidator, redirect, StatusMap, InvertedStatusMap, form, type ELYSIA_FORM_DATA } from './utils';
 export { error, ParseError, NotFoundError, ValidationError, InternalServerError, InvalidCookieSignature, ERROR_CODE, ELYSIA_RESPONSE } from './error';
 export type { Context, PreContext } from './context';
 export type { EphemeralType, CreateEden, ComposeElysiaResponse, ElysiaConfig, SingletonBase, DefinitionBase, RouteBase, Handler, ComposedHandler, InputSchema, LocalHook, MergeSchema, RouteSchema, UnwrapRoute, InternalRoute, HTTPMethod, SchemaValidator, VoidHandler, PreHandler, BodyHandler, OptionalHandler, ErrorHandler, AfterHandler, LifeCycleEvent, TraceEvent, LifeCycleStore, LifeCycleType, MaybePromise, ListenCallback, UnwrapSchema, TraceHandler, TraceProcess, TraceReporter, TraceStream, Checksum, DocumentDecoration, InferContext, InferHandler } from './types';