elysia 1.0.21 → 1.0.22

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;
@@ -992,13 +1024,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 +1088,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, {
@@ -1099,9 +1144,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 +1233,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);
@@ -1232,13 +1294,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 +1357,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, {
@@ -1323,13 +1398,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 +1454,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, {

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';

package/dist/index.mjs

@@ -1135,9 +1135,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"
@@ -1211,6 +1223,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;
@@ -1270,13 +1284,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",
@@ -1323,6 +1348,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, {
@@ -1377,9 +1404,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"
@@ -1451,6 +1493,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);
@@ -1510,13 +1554,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",
@@ -1562,6 +1617,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, {
@@ -1601,13 +1658,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",
@@ -1647,6 +1714,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, {
@@ -2365,12 +2434,25 @@ var cloneInference = (inference) => ({
     set: inference.trace.set
   }
 });
-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/error.ts
 var env = typeof Bun !== "undefined" ? Bun.env : typeof process !== "undefined" ? process?.env : void 0;
@@ -4034,11 +4116,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
@@ -4080,11 +4162,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
@@ -4484,7 +4566,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) => {
@@ -4630,7 +4712,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t2.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -4911,7 +4993,9 @@ var Elysia = class _Elysia {
       aot: true,
       strictPath: false,
       global: false,
-      cookie: {},
+      cookie: {
+        path: "/"
+      },
       analytic: false,
       ...config,
       experimental: config?.experimental ?? {},
@@ -6592,6 +6676,7 @@ export {
   ValidationError,
   Elysia as default,
   error,
+  form,
   getResponseSchemaValidator,
   getSchemaValidator,
   mapCompactResponse,

package/dist/type-system.mjs

@@ -262,6 +262,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;
@@ -427,7 +428,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) => {
@@ -573,7 +574,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;

package/dist/types.d.ts

@@ -1,8 +1,9 @@
 /// <reference types="bun-types" />
 /// <reference types="node" />
 /// <reference types="bun-types" />
+/// <reference types="bun-types" />
 import type { Elysia } from '.';
-import type { Serve, Server, WebSocketHandler } from 'bun';
+import type { BunFile, Serve, Server, WebSocketHandler } from 'bun';
 import type { TSchema, TObject, StaticDecode, TAnySchema } from '@sinclair/typebox';
 import type { TypeCheck } from '@sinclair/typebox/compiler';
 import type { OpenAPIV3 } from 'openapi-types';
@@ -176,8 +177,8 @@ export interface UnwrapRoute<in out Schema extends InputSchema<any>, in out Defi
     query: UnwrapSchema<Schema['query'], Definitions>;
     params: UnwrapSchema<Schema['params'], Definitions>;
     cookie: UnwrapSchema<Schema['cookie'], Definitions>;
-    response: Schema['response'] extends TSchema | string ? UnwrapSchema<Schema['response'], Definitions> : Schema['response'] extends SuccessfulResponse<TAnySchema | string> ? {
-        [k in keyof Schema['response']]: UnwrapSchema<Schema['response'][k], Definitions>;
+    response: Schema['response'] extends TSchema | string ? CoExist<UnwrapSchema<Schema['response'], Definitions>, File, BunFile> : Schema['response'] extends SuccessfulResponse<TAnySchema | string> ? {
+        [k in keyof Schema['response']]: CoExist<UnwrapSchema<Schema['response'][k], Definitions>, File, BunFile>;
     } : unknown | void;
 }
 export interface UnwrapGroupGuardRoute<in out Schema extends InputSchema<any>, in out Definitions extends Record<string, unknown> = {}, Path extends string = ''> {
@@ -235,6 +236,12 @@ export type Handler<in out Route extends RouteSchema = {}, in out Singleton exte
     derive: {};
     resolve: {};
 }, Path extends string = ''> = (context: Context<Route, Singleton, Path>) => Route['response'] extends SuccessfulResponse ? Response | MaybePromise<Route['response'][keyof Route['response']]> : Response | MaybePromise<Route['response']>;
+export type Replace<Original, Target, With> = Original extends Record<string, unknown> ? {
+    [K in keyof Original]: Original[K] extends Target ? With : Original[K];
+} : Original extends Target ? With : Original;
+export type CoExist<Original, Target, With> = Original extends Record<string, unknown> ? {
+    [K in keyof Original]: Original[K] extends Target ? Original[K] | With : Original[K];
+} : Original extends Target ? Original | With : Original;
 export type InlineHandler<Route extends RouteSchema = {}, Singleton extends SingletonBase = {
     decorator: {};
     store: {};
@@ -572,7 +579,7 @@ type _CreateEden<Path extends string, Property extends Record<string, unknown> =
     [x in Path]: Property;
 };
 export type CreateEden<Path extends string, Property extends Record<string, unknown> = {}> = Path extends `/${infer Rest}` ? _CreateEden<Rest, Property> : Path extends '' ? _CreateEden<'index', Property> : _CreateEden<Path, Property>;
-export type ComposeElysiaResponse<Response, Handle> = Handle extends (...a: any[]) => infer A ? _ComposeElysiaResponse<Response, Awaited<A>> : _ComposeElysiaResponse<Response, Awaited<Handle>>;
+export type ComposeElysiaResponse<Response, Handle> = Handle extends (...a: any[]) => infer A ? _ComposeElysiaResponse<Response, Replace<Awaited<A>, BunFile, File>> : _ComposeElysiaResponse<Response, Replace<Awaited<Handle>, BunFile, File>>;
 type _ComposeElysiaResponse<Response, Handle> = Prettify<unknown extends Response ? {
     200: Exclude<Handle, {
         [ELYSIA_RESPONSE]: any;

package/dist/utils.d.ts

@@ -1,8 +1,13 @@
+/// <reference types="node" />
+/// <reference types="bun-types" />
+/// <reference types="bun-types" />
+/// <reference types="bun-types" />
 import { TSchema } from '@sinclair/typebox';
 import { TypeCheck } from '@sinclair/typebox/compiler';
-import type { LifeCycleStore, LocalHook, MaybeArray, InputSchema, LifeCycleType, HookContainer } from './types';
+import type { LifeCycleStore, LocalHook, MaybeArray, InputSchema, LifeCycleType, HookContainer, Replace } from './types';
 import type { CookieOptions } from './cookies';
 import { Sucrose } from './sucrose';
+import { BunFile } from 'bun';
 export declare const replaceUrlPath: (url: string, pathname: string) => string;
 export declare const mergeDeep: <A extends Record<string, any>, B extends Record<string, any>>(target: A, source: B, { skipKeys }?: {
     skipKeys?: string[];
@@ -210,5 +215,12 @@ export declare const cloneInference: (inference: {
  * @param url URL to redirect to
  * @param HTTP status code to send,
  */
-export declare const redirect: (url: string, status?: number) => import("undici-types").Response;
+export declare const redirect: (url: string, status?: 301 | 302 | 303 | 307 | 308) => import("undici-types").Response;
 export type redirect = typeof redirect;
+export declare const ELYSIA_FORM_DATA: unique symbol;
+export type ELYSIA_FORM_DATA = typeof ELYSIA_FORM_DATA;
+type ElysiaFormData<T extends Record<string | number, unknown>> = FormData & {
+    [ELYSIA_FORM_DATA]: Replace<T, BunFile, File>;
+};
+export declare const form: <const T extends Record<string | number, unknown>>(items: T) => ElysiaFormData<T>;
+export {};

package/dist/utils.mjs

@@ -337,7 +337,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) => {
@@ -483,7 +483,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -1233,13 +1233,27 @@ var cloneInference = (inference) => ({
     set: inference.trace.set
   }
 });
-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;
+};
 export {
+  ELYSIA_FORM_DATA,
   InvertedStatusMap,
   PromiseGroup,
   StatusMap,
@@ -1249,6 +1263,7 @@ export {
   createMacroManager,
   filterGlobalHook,
   fnToContainer,
+  form,
   getCookieValidator,
   getResponseSchemaValidator,
   getSchemaValidator,