elysia 1.0.21 → 1.0.23

package/dist/cjs/compose.js

@@ -87,8 +87,10 @@ var separateFunction = (code) => {
   }
   const start = code.indexOf("(");
   if (start !== -1) {
-    const [parameter, body] = code.split("\n", 2);
+    const sep = code.indexOf("\n", 2);
+    const parameter = code.slice(0, sep);
     const end = parameter.lastIndexOf(")") + 1;
+    const body = code.slice(sep + 1);
     return [
       parameter.slice(start, end),
       "{" + body,
@@ -344,6 +346,8 @@ var validateInferencedQueries = (queries) => {
       return false;
     if (query.indexOf("	") !== -1)
       return false;
+    if (query.indexOf("(") !== -1)
+      return false;
   }
   return true;
 };
@@ -735,6 +739,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 {
@@ -875,9 +885,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"
@@ -951,6 +973,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;
@@ -991,6 +1015,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) {
@@ -1010,13 +1036,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",
@@ -1063,6 +1100,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, {
@@ -1074,6 +1113,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) {
@@ -1117,9 +1158,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"
@@ -1191,6 +1247,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);
@@ -1231,6 +1289,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) {
@@ -1250,13 +1310,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",
@@ -1302,6 +1373,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, {
@@ -1313,6 +1386,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) {
@@ -1341,13 +1416,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",
@@ -1387,6 +1472,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, {
@@ -1398,6 +1485,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) {
@@ -1626,7 +1715,7 @@ var validateFile = (options, value) => {
     }
   return true;
 };
-var File = import_typebox.TypeRegistry.Get("Files") ?? import_system.TypeSystem.Type("File", validateFile);
+var File2 = import_typebox.TypeRegistry.Get("Files") ?? import_system.TypeSystem.Type("File", validateFile);
 var Files = import_typebox.TypeRegistry.Get("Files") ?? import_system.TypeSystem.Type(
   "Files",
   (options, value) => {
@@ -1772,7 +1861,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -1899,7 +1988,7 @@ var getSchemaValidator = (s, {
   models = {},
   dynamic = false,
   normalize = false,
-  additionalProperties = normalize
+  additionalProperties = false
 } = {}) => {
   if (!s)
     return void 0;
@@ -1920,7 +2009,7 @@ var getSchemaValidator = (s, {
       Errors: (value) => import_value3.Value.Errors(schema, value),
       Code: () => ""
     };
-    if (normalize && schema.additionalProperties === true)
+    if (normalize && schema.additionalProperties === false)
       validator.Clean = cleaner;
     if (schema.config) {
       validator.config = schema.config;
@@ -2097,12 +2186,25 @@ var lifeCycleToFn = (a) => {
     stop: a.stop?.map((x) => x.fn)
   };
 };
-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/compose.ts
 var headersHasToJSON = new Headers().toJSON;
@@ -2692,7 +2794,7 @@ const traceDone = Promise.all([`;
   if (validator) {
     fnLiteral += "\n";
     if (validator.headers) {
-      if (hasProperty("default", validator.headers.params))
+      if (hasProperty("default", validator.headers.schema))
         for (const [key, value] of Object.entries(
           import_value4.Value.Default(
             // @ts-ignore
@@ -2700,7 +2802,7 @@ const traceDone = Promise.all([`;
             {}
           )
         )) {
-          const parsed = typeof value === "object" ? JSON.stringify(value) : `'${value}'`;
+          const parsed = typeof value === "object" ? JSON.stringify(value) : typeof value === "string" ? `'${value}'` : value;
           if (parsed)
             fnLiteral += `c.headers['${key}'] ??= ${parsed}
 `;
@@ -2722,7 +2824,7 @@ c.headers = headers.Decode(c.headers)
             {}
           )
         )) {
-          const parsed = typeof value === "object" ? JSON.stringify(value) : `'${value}'`;
+          const parsed = typeof value === "object" ? JSON.stringify(value) : typeof value === "string" ? `'${value}'` : value;
           if (parsed)
             fnLiteral += `c.params['${key}'] ??= ${parsed}
 `;
@@ -2746,11 +2848,26 @@ c.params = params.Decode(c.params)
             {}
           )
         )) {
-          const parsed = typeof value === "object" ? JSON.stringify(value) : `'${value}'`;
+          const parsed = typeof value === "object" ? JSON.stringify(value) : typeof value === "string" ? `'${value}'` : value;
           if (parsed)
             fnLiteral += `c.query['${key}'] ??= ${parsed}
 `;
         }
+      for (const [key, value] of Object.entries(
+        // @ts-ignore
+        validator.query.schema?.properties
+      )) {
+        const { type, anyOf } = value;
+        if (type === "object" || type === "array") {
+          fnLiteral += `c.query['${key}'] = JSON.parse(c.query['${key}'])
+`;
+          continue;
+        }
+        if (anyOf) {
+          fnLiteral += `if(typeof c.query['${key}'] === "object") c.query['${key}'] = JSON.parse(c.query['${key}'])
+`;
+        }
+      }
       fnLiteral += `if(query.Check(c.query) === false) {
 				${composeValidation("query")}
 			}`;
@@ -2762,21 +2879,32 @@ c.query = query.Decode(Object.assign({}, c.query))
     if (validator.body) {
       if (normalize)
         fnLiteral += "c.body = body.Clean(c.body);\n";
-      if (hasProperty("default", validator.body.schema))
+      if (hasProperty("default", validator.body.schema)) {
         fnLiteral += `if(body.Check(c.body) === false) {
-    				c.body = Object.assign(${JSON.stringify(
+					if (typeof c.body === 'object') {
+						c.body = Object.assign(${JSON.stringify(
           import_value4.Value.Default(
             // @ts-ignore
             validator.body.schema,
-            null
+            {}
           ) ?? {}
         )}, c.body)
-
-    				if(body.Check(c.query) === false) {
+					} else {`;
+        const defaultValue = import_value4.Value.Default(
+          // @ts-ignore
+          validator.body.schema,
+          void 0
+        );
+        if (typeof defaultValue === "string")
+          fnLiteral += `c.body = '${defaultValue}'`;
+        else
+          fnLiteral += `c.body = ${defaultValue}`;
+        fnLiteral += `}
+    				if(body.Check(c.body) === false) {
         				${composeValidation("body")}
      			}
             }`;
-      else
+      } else
         fnLiteral += `if(body.Check(c.body) === false) {
 			${composeValidation("body")}
 		}`;
@@ -2785,7 +2913,11 @@ c.query = query.Decode(Object.assign({}, c.query))
 c.body = body.Decode(c.body)
 `;
     }
-    if (isNotEmpty(cookieValidator?.schema?.properties ?? cookieValidator?.schema?.schema ?? {})) {
+    if (isNotEmpty(
+      // @ts-ignore
+      cookieValidator?.schema?.properties ?? // @ts-ignore
+      cookieValidator?.schema?.schema ?? {}
+    )) {
       fnLiteral += `const cookieValue = {}
     			for(const [key, value] of Object.entries(c.cookie))
     				cookieValue[key] = value.value

package/dist/cjs/cookies.js

@@ -362,7 +362,7 @@ var validateFile = (options, value) => {
     }
   return true;
 };
-var File = import_typebox.TypeRegistry.Get("Files") ?? import_system.TypeSystem.Type("File", validateFile);
+var File2 = import_typebox.TypeRegistry.Get("Files") ?? import_system.TypeSystem.Type("File", validateFile);
 var Files = import_typebox.TypeRegistry.Get("Files") ?? import_system.TypeSystem.Type(
   "Files",
   (options, value) => {
@@ -508,7 +508,7 @@ var ElysiaType = {
       return JSON.stringify(value);
     });
   },
-  File,
+  File: File2,
   Files: (options = {}) => t.Transform(Files(options)).Decode((value) => {
     if (Array.isArray(value))
       return value;
@@ -715,6 +715,7 @@ var isNumericString = (message) => {
   }
   return false;
 };
+var ELYSIA_FORM_DATA = Symbol("ElysiaFormData");
 
 // src/cookies.ts
 var Cookie = class {
@@ -887,6 +888,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 {