elysia 1.4.30 → 1.4.31

package/dist/compose.mjs

@@ -1,5 +1,5 @@
 import { Cookie } from "./index.mjs";
-import { Value, TransformDecodeError } from "@sinclair/typebox/value";
+import { TransformDecodeError } from "@sinclair/typebox/value";
 import {
   Kind,
   TypeBoxError
@@ -10,6 +10,7 @@ import {
   parseQueryFromURL,
   parseQueryStandardSchema
 } from "./parse-query.mjs";
+import { parseFormData } from "./form-data.mjs";
 import {
   ELYSIA_REQUEST_ID,
   getLoosePath,
@@ -21,6 +22,7 @@ import {
   isNotEmpty,
   encodePath,
   mergeCookie,
+  safeAssign,
   getResponseLength
 } from "./utils.mjs";
 import { isBun } from "./universal/utils.mjs";
@@ -33,6 +35,8 @@ import {
 } from "./error.mjs";
 import { ELYSIA_TRACE } from "./trace.mjs";
 import {
+  applySchemaDefaults,
+  cloneSchemaInput,
   getSchemaProperties,
   getSchemaValidator,
   hasElysiaMeta,
@@ -255,7 +259,7 @@ return function(){return a}`
   inference.server && (fnLiteral += `Object.defineProperty(c,'server',{get:function(){return getServer()}})
 `), validator.createBody?.(), validator.createQuery?.(), validator.createHeaders?.(), validator.createParams?.(), validator.createCookie?.(), validator.createResponse?.();
   const hasValidation = !!validator.body || !!validator.headers || !!validator.params || !!validator.query || !!validator.cookie || !!validator.response, hasQuery = inference.query || !!validator.query, requestNoBody = hooks.parse?.length === 1 && // @ts-expect-error
-  hooks.parse[0].fn === "none", hasBody = method !== "" && method !== "GET" && method !== "HEAD" && (inference.body || !!validator.body || !!hooks.parse?.length) && !requestNoBody, defaultHeaders = app.setHeaders, hasDefaultHeaders = defaultHeaders && !!Object.keys(defaultHeaders).length, hasHeaders = inference.headers || !!validator.headers || adapter.preferWebstandardHeaders !== !0 && inference.body, hasCookie = inference.cookie || !!validator.cookie, cookieMeta = validator.cookie?.config ? mergeCookie(validator?.cookie?.config, app.config.cookie) : app.config.cookie;
+  hooks.parse[0].fn === "none", hasBody = method !== "" && method !== "GET" && method !== "HEAD" && (inference.body || !!validator.body || !!hooks.parse?.length) && !requestNoBody, defaultHeaders = app.setHeaders, hasDefaultHeaders = defaultHeaders && !!Object.keys(defaultHeaders).length, hasHeaders = inference.headers || !!validator.headers || adapter.preferWebstandardHeaders !== !0 && inference.body, hasCookie = inference.cookie || !!validator.cookie, defaultCookie = hooks.config?.cookie ? mergeCookie(app.config.cookie ?? {}, hooks.config.cookie) : app.config.cookie, cookieMeta = validator.cookie?.config ? mergeCookie(validator?.cookie?.config, defaultCookie) : defaultCookie;
   let _encodeCookie = "";
   const encodeCookie = () => {
     if (_encodeCookie) return _encodeCookie;
@@ -327,7 +331,7 @@ c.cookie=await parseCookie(c.set,c.request.headers.get('cookie'),${options})
     hasArrayProperty ? "," + JSON.stringify(arrayProperties) : hasObjectProperty ? ",undefined" : ""}${//
     hasObjectProperty ? "," + JSON.stringify(objectProperties) : ""})}`;
   }
-  const isAsyncHandler = typeof handler == "function" && isAsync(handler), saveResponse = hasTrace || hooks.afterResponse?.length ? "c.response=c.responseValue= " : "", responseKeys = Object.keys(validator.response ?? {}), hasMultipleResponses = responseKeys.length > 1, hasSingle200 = responseKeys.length === 0 || responseKeys.length === 1 && responseKeys[0] === "200", maybeAsync = hasCookie || hasBody || isAsyncHandler || !!hooks.parse?.length || !!hooks.afterHandle?.some(isAsync) || !!hooks.beforeHandle?.some(isAsync) || !!hooks.transform?.some(isAsync) || !!hooks.mapResponse?.some(isAsync) || validator.body?.provider === "standard" || validator.headers?.provider === "standard" || validator.query?.provider === "standard" || validator.params?.provider === "standard" || validator.cookie?.provider === "standard" || Object.values(validator.response ?? {}).find(
+  const isAsyncHandler = typeof handler == "function" && isAsync(handler), saveResponse = hasTrace || hooks.afterResponse?.length ? "c.response=c.responseValue= " : "", responseKeys = Object.keys(validator.response ?? {}), hasMultipleResponses = responseKeys.length > 1, hasSingle200 = responseKeys.length === 0 || responseKeys.length === 1 && responseKeys[0] === "200", isAsyncBeforeHandle = (hook) => isAsync(hook) || hook.fn.toString().includes("[native code]"), maybeAsync = hasCookie || hasBody || isAsyncHandler || !!hooks.parse?.length || !!hooks.afterHandle?.some(isAsync) || !!hooks.beforeHandle?.some(isAsyncBeforeHandle) || !!hooks.transform?.some(isAsync) || !!hooks.mapResponse?.some(isAsync) || validator.body?.provider === "standard" || validator.headers?.provider === "standard" || validator.query?.provider === "standard" || validator.params?.provider === "standard" || validator.cookie?.provider === "standard" || Object.values(validator.response ?? {}).find(
     (x) => x.provider === "standard"
   ), maybeStream = (typeof handler == "function" ? isGenerator(handler) : !1) || !!hooks.beforeHandle?.some(isGenerator) || !!hooks.afterHandle?.some(isGenerator) || !!hooks.transform?.some(isGenerator), hasSet = inference.cookie || inference.set || hasHeaders || hasTrace || hasMultipleResponses || !hasSingle200 || isHandleFn && hasDefaultHeaders || maybeStream;
   let _afterResponse;
@@ -364,7 +368,7 @@ ${prefix}e.afterResponse[${i}](c)
 `;
     return after ? `const _res=${response}` + after + "return _res" : `return ${response}`;
   }, mapResponseContext = adapter.mapResponseContext ? `,${adapter.mapResponseContext}` : "";
-  (hasTrace || inference.route) && (fnLiteral += `c.route=\`${path}\`
+  (hasTrace || inference.route) && (fnLiteral += `c.route=${JSON.stringify(path)}
 `), (hasTrace || hooks.afterResponse?.length) && (fnLiteral += `let afterHandlerStreamListener
 `);
   const parseReporter = report("parse", {
@@ -536,7 +540,7 @@ transformed.url=c.url
 transformed.redirect=c.redirect
 transformed.set=c.set
 transformed.error=c.error
-c=transformed}` : fnLiteral += "if(transformed instanceof ElysiaCustomStatusResponse){" + mapResponse("transformed") + `}else Object.assign(c,transformed)
+c=transformed}` : fnLiteral += "if(transformed instanceof ElysiaCustomStatusResponse){" + mapResponse("transformed") + `}else safeAssign(c,transformed)
 `, endUnit();
       }
     }
@@ -545,24 +549,15 @@ c=transformed}` : fnLiteral += "if(transformed instanceof ElysiaCustomStatusResp
   const fileUnions = [];
   if (validator) {
     if (validator.headers) {
-      if (validator.headers.hasDefault)
-        for (const [key, value] of Object.entries(
-          Value.Default(
-            // @ts-ignore
-            validator.headers.schema,
-            {}
-          )
-        )) {
-          const parsed = typeof value == "object" || typeof value == "string" ? JSON.stringify(value) : value;
-          parsed !== void 0 && (fnLiteral += `c.headers[${JSON.stringify(key)}]??=${parsed}
-`);
-        }
-      fnLiteral += composeCleaner({
+      const cleanHeaders = composeCleaner({
         name: "c.headers",
         schema: validator.headers,
         type: "headers",
         normalize
-      }), validator.headers.isOptional && (fnLiteral += "if(isNotEmpty(c.headers)){"), validator.headers?.provider === "standard" ? fnLiteral += `let vah=validator.headers.Validate(c.headers)
+      });
+      cleanHeaders && validator.headers.hasDefault && (fnLiteral += `c.headers=cloneSchemaInput(c.headers)
+`), fnLiteral += cleanHeaders, validator.headers.hasDefault && (fnLiteral += `c.headers=applySchemaDefaults(validator.headers,c.headers,true)
+`), validator.headers.isOptional && (fnLiteral += "if(isNotEmpty(c.headers)){"), validator.headers?.provider === "standard" ? fnLiteral += `let vah=validator.headers.Validate(c.headers)
 if(vah instanceof Promise)vah=await vah
 if(vah.issues){` + validation.validate("headers", void 0, "vah.issues") + `}else{c.headers=vah.value}
 ` : validator.headers?.schema?.noValidate !== !0 && (fnLiteral += "if(validator.headers.Check(c.headers) === false){" + validation.validate("headers") + "}"), validator.headers.hasTransform && (fnLiteral += coerceTransformDecodeError(
@@ -572,48 +567,25 @@ if(vah.issues){` + validation.validate("headers", void 0, "vah.issues") + `}else
         allowUnsafeValidationDetails
       )), validator.headers.isOptional && (fnLiteral += "}");
     }
-    if (validator.params) {
-      if (validator.params.hasDefault)
-        for (const [key, value] of Object.entries(
-          Value.Default(
-            // @ts-ignore
-            validator.params.schema,
-            {}
-          )
-        )) {
-          const parsed = typeof value == "object" || typeof value == "string" ? JSON.stringify(value) : value;
-          parsed !== void 0 && (fnLiteral += `c.params[${JSON.stringify(key)}]??=${parsed}
-`);
-        }
-      validator.params.provider === "standard" ? fnLiteral += `let vap=validator.params.Validate(c.params)
+    if (validator.params && (validator.params.hasDefault && (fnLiteral += `c.params=applySchemaDefaults(validator.params,c.params,true)
+`), validator.params.provider === "standard" ? fnLiteral += `let vap=validator.params.Validate(c.params)
 if(vap instanceof Promise)vap=await vap
 if(vap.issues){` + validation.validate("params", void 0, "vap.issues") + `}else{c.params=vap.value}
 ` : validator.params?.schema?.noValidate !== !0 && (fnLiteral += "if(validator.params.Check(c.params)===false){" + validation.validate("params") + "}"), validator.params.hasTransform && (fnLiteral += coerceTransformDecodeError(
-        `c.params=validator.params.Decode(c.params)
+      `c.params=validator.params.Decode(c.params)
 `,
-        "params",
-        allowUnsafeValidationDetails
-      ));
-    }
-    if (validator.query) {
-      if (Kind in validator.query?.schema && validator.query.hasDefault)
-        for (const [key, value] of Object.entries(
-          Value.Default(
-            // @ts-ignore
-            validator.query.schema,
-            {}
-          )
-        )) {
-          const parsed = typeof value == "object" || typeof value == "string" ? JSON.stringify(value) : value;
-          parsed !== void 0 && (fnLiteral += `if(c.query[${JSON.stringify(key)}]===undefined)c.query[${JSON.stringify(key)}]=${parsed}
-`);
-        }
-      fnLiteral += composeCleaner({
+      "params",
+      allowUnsafeValidationDetails
+    ))), validator.query) {
+      const cleanQuery = composeCleaner({
         name: "c.query",
         schema: validator.query,
         type: "query",
         normalize
-      }), validator.query.isOptional && (fnLiteral += "if(isNotEmpty(c.query)){"), validator.query.provider === "standard" ? fnLiteral += `let vaq=validator.query.Validate(c.query)
+      });
+      cleanQuery && validator.query.hasDefault && (fnLiteral += `c.query=cloneSchemaInput(c.query)
+`), fnLiteral += cleanQuery, Kind in validator.query?.schema && validator.query.hasDefault && (fnLiteral += `c.query=applySchemaDefaults(validator.query,c.query)
+`), validator.query.isOptional && (fnLiteral += "if(isNotEmpty(c.query)){"), validator.query.provider === "standard" ? fnLiteral += `let vaq=validator.query.Validate(c.query)
 if(vaq instanceof Promise)vaq=await vaq
 if(vaq.issues){` + validation.validate("query", void 0, "vaq.issues") + `}else{c.query=vaq.value}
 ` : validator.query?.schema?.noValidate !== !0 && (fnLiteral += "if(validator.query.Check(c.query)===false){" + validation.validate("query") + "}"), validator.query.hasTransform && (fnLiteral += coerceTransformDecodeError(
@@ -629,32 +601,23 @@ if(vaq.issues){` + validation.validate("query", void 0, "vaq.issues") + `}else{c
       )), validator.query.isOptional && (fnLiteral += "}");
     }
     if (hasBody && validator.body) {
-      (validator.body.hasTransform || validator.body.isOptional) && (fnLiteral += `const isNotEmptyObject=c.body&&(typeof c.body==="object"&&(isNotEmpty(c.body)||c.body instanceof ArrayBuffer))
+      (validator.body.hasTransform || validator.body.isOptional) && (fnLiteral += `let isNotEmptyObject
 `);
       const hasUnion = isUnion(validator.body.schema);
       let hasNonUnionFileWithDefault = !1;
       if (validator.body.hasDefault) {
-        let value = Value.Default(
-          validator.body.schema,
-          validator.body.schema.type === "object" || unwrapImportSchema(validator.body.schema)[Kind] === "Object" ? {} : void 0
-        );
         const schema = unwrapImportSchema(validator.body.schema);
-        if (!hasUnion && value && typeof value == "object" && (hasType("File", schema) || hasType("Files", schema))) {
-          hasNonUnionFileWithDefault = !0;
-          for (const [k, v] of Object.entries(value))
-            (v === "File" || v === "Files") && delete value[k];
-          isNotEmpty(value) || (value = void 0);
-        }
-        const parsed = typeof value == "object" || typeof value == "string" ? JSON.stringify(value) : value;
-        value != null && (Array.isArray(value) ? fnLiteral += `if(!c.body)c.body=${parsed}
-` : typeof value == "object" ? fnLiteral += `c.body=Object.assign(${parsed},c.body)
-` : fnLiteral += `c.body=${parsed}
-`), fnLiteral += composeCleaner({
+        !hasUnion && (hasType("File", schema) || hasType("Files", schema)) && (hasNonUnionFileWithDefault = !0);
+        const cleanBody = composeCleaner({
           name: "c.body",
           schema: validator.body,
           type: "body",
           normalize
-        }), validator.body.provider === "standard" ? fnLiteral += `let vab=validator.body.Validate(c.body)
+        });
+        cleanBody && (fnLiteral += `c.body=cloneSchemaInput(c.body)
+`), fnLiteral += cleanBody, fnLiteral += `c.body=applySchemaDefaults(validator.body,c.body)
+`, (validator.body.hasTransform || validator.body.isOptional) && (fnLiteral += `isNotEmptyObject=c.body&&(typeof c.body==="object"&&(isNotEmpty(c.body)||c.body instanceof ArrayBuffer))
+`), validator.body.provider === "standard" ? fnLiteral += `let vab=validator.body.Validate(c.body)
 if(vab instanceof Promise)vab=await vab
 if(vab.issues){` + validation.validate("body", void 0, "vab.issues") + `}else{c.body=vab.value}
 ` : validator.body?.schema?.noValidate !== !0 && (validator.body.isOptional ? fnLiteral += "if(isNotEmptyObject&&validator.body.Check(c.body)===false){" + validation.validate("body") + "}" : fnLiteral += "if(validator.body.Check(c.body)===false){" + validation.validate("body") + "}");
@@ -664,7 +627,8 @@ if(vab.issues){` + validation.validate("body", void 0, "vab.issues") + `}else{c.
           schema: validator.body,
           type: "body",
           normalize
-        }), validator.body.provider === "standard" ? fnLiteral += `let vab=validator.body.Validate(c.body)
+        }), (validator.body.hasTransform || validator.body.isOptional) && (fnLiteral += `isNotEmptyObject=c.body&&(typeof c.body==="object"&&(isNotEmpty(c.body)||c.body instanceof ArrayBuffer))
+`), validator.body.provider === "standard" ? fnLiteral += `let vab=validator.body.Validate(c.body)
 if(vab instanceof Promise)vab=await vab
 if(vab.issues){` + validation.validate("body", void 0, "vab.issues") + `}else{c.body=vab.value}
 ` : validator.body?.schema?.noValidate !== !0 && (validator.body.isOptional ? fnLiteral += "if(isNotEmptyObject&&validator.body.Check(c.body)===false){" + validation.validate("body") + "}" : fnLiteral += "if(validator.body.Check(c.body)===false){" + validation.validate("body") + "}");
@@ -700,7 +664,7 @@ if(vab.issues){` + validation.validate("body", void 0, "vab.issues") + `}else{c.
               let validateFile = "", validatorLength = 0;
               for (let i2 = 0; i2 < iterator2.length; i2++) {
                 const [k, v] = iterator2[i2];
-                !v.extension || v[Kind] !== "File" && v[Kind] !== "Files" || (validatorLength && (validateFile += ","), validateFile += `fileType(c.body.${k},${JSON.stringify(v.extension)},'body.${k}')`, validatorLength++);
+                !v.extension || v[Kind] !== "File" && v[Kind] !== "Files" || (validatorLength && (validateFile += ","), validateFile += `fileType(c.body[${JSON.stringify(k)}],${JSON.stringify(v.extension)},${JSON.stringify("body." + k)})`, validatorLength++);
               }
               validateFile && (validatorLength === 1 ? validator2 += `await ${validateFile}
 ` : validatorLength > 1 && (validator2 += `await Promise.all([${validateFile}])
@@ -722,7 +686,7 @@ if(vab.issues){` + validation.validate("body", void 0, "vab.issues") + `}else{c.
         let i = 0;
         if (bodyProperties)
           for (const [k, v] of Object.entries(bodyProperties))
-            !v.extension || v[Kind] !== "File" && v[Kind] !== "Files" || (i && (validateFile += ","), validateFile += `fileType(c.body.${k},${JSON.stringify(v.extension)},'body.${k}')`, i++);
+            !v.extension || v[Kind] !== "File" && v[Kind] !== "Files" || (i && (validateFile += ","), validateFile += `fileType(c.body[${JSON.stringify(k)}],${JSON.stringify(v.extension)},${JSON.stringify("body." + k)})`, i++);
         i && (fnLiteral += `
 `), i === 1 ? fnLiteral += `await ${validateFile}
 ` : i > 1 && (fnLiteral += `await Promise.all([${validateFile}])
@@ -731,7 +695,7 @@ if(vab.issues){` + validation.validate("body", void 0, "vab.issues") + `}else{c.
     }
     validator.cookie && (validator.cookie.config = mergeCookie(
       validator.cookie.config,
-      app.config.cookie ?? {}
+      defaultCookie ?? {}
     ), fnLiteral += `let cookieValue={}
 for(const [key,value] of Object.entries(c.cookie))cookieValue[key]=value.value
 `, validator.cookie.isOptional && (fnLiteral += "if(isNotEmpty(c.cookie)){"), validator.cookie.provider === "standard" ? (fnLiteral += `let vac=validator.cookie.Validate(cookieValue)
@@ -751,11 +715,11 @@ if(vac.issues){` + validation.validate("cookie", void 0, "vac.issues") + `}else{
     let hasResolve = !1;
     if (hooks.beforeHandle?.length)
       for (let i = 0; i < hooks.beforeHandle.length; i++) {
-        const beforeHandle = hooks.beforeHandle[i], endUnit = reporter.resolveChild(beforeHandle.fn.name), returning = hasReturn(beforeHandle);
+        const beforeHandle = hooks.beforeHandle[i], asyncBeforeHandle = isAsyncBeforeHandle(beforeHandle), endUnit = reporter.resolveChild(beforeHandle.fn.name);
         if (beforeHandle.subType === "resolve" || beforeHandle.subType === "mapResolve")
           hasResolve || (hasResolve = !0, fnLiteral += `
 let resolved
-`), fnLiteral += isAsync(beforeHandle) ? `resolved=await e.beforeHandle[${i}](c);
+`), fnLiteral += asyncBeforeHandle ? `resolved=await e.beforeHandle[${i}](c);
 ` : `resolved=e.beforeHandle[${i}](c);
 `, beforeHandle.subType === "mapResolve" ? fnLiteral += "if(resolved instanceof ElysiaCustomStatusResponse){" + mapResponse("resolved") + `}else{resolved.request=c.request
 resolved.store=c.store
@@ -765,14 +729,10 @@ resolved.url=c.url
 resolved.redirect=c.redirect
 resolved.set=c.set
 resolved.error=c.error
-c=resolved}` : fnLiteral += "if(resolved instanceof ElysiaCustomStatusResponse){" + mapResponse("resolved") + `}else Object.assign(c, resolved)
-`, endUnit();
-        else if (!returning)
-          fnLiteral += isAsync(beforeHandle) ? `await e.beforeHandle[${i}](c)
-` : `e.beforeHandle[${i}](c)
+c=resolved}` : fnLiteral += "if(resolved instanceof ElysiaCustomStatusResponse){" + mapResponse("resolved") + `}else safeAssign(c,resolved)
 `, endUnit();
         else {
-          if (fnLiteral += isAsync(beforeHandle) ? `be=await e.beforeHandle[${i}](c)
+          if (fnLiteral += asyncBeforeHandle ? `be=await e.beforeHandle[${i}](c)
 ` : `be=e.beforeHandle[${i}](c)
 `, endUnit("be"), fnLiteral += "if(be!==undefined){", reporter.resolve(), hooks.afterHandle?.length || hasTrace) {
             report("handle", {
@@ -783,11 +743,11 @@ c=resolved}` : fnLiteral += "if(resolved instanceof ElysiaCustomStatusResponse){
             });
             if (hooks.afterHandle?.length)
               for (let i2 = 0; i2 < hooks.afterHandle.length; i2++) {
-                const hook = hooks.afterHandle[i2], returning2 = hasReturn(hook), endUnit2 = reporter2.resolveChild(
+                const hook = hooks.afterHandle[i2], returning = hasReturn(hook), endUnit2 = reporter2.resolveChild(
                   hook.fn.name
                 );
                 fnLiteral += `c.response=c.responseValue=be
-`, returning2 ? (fnLiteral += isAsync(hook.fn) ? `af=await e.afterHandle[${i2}](c)
+`, returning ? (fnLiteral += isAsync(hook.fn) ? `af=await e.afterHandle[${i2}](c)
 ` : `af=e.afterHandle[${i2}](c)
 `, fnLiteral += `if(af!==undefined) c.response=c.responseValue=be=af
 `) : fnLiteral += isAsync(hook.fn) ? `await e.afterHandle[${i2}](c, be)
@@ -975,7 +935,7 @@ if(mep!==undefined)er=mep
   }
   errorReporter.resolve(), fnLiteral += "return handleError(c,error,true)", !maybeAsync && hooks.error?.length && (fnLiteral += "})()"), fnLiteral += "}";
   const adapterVariables = adapter.inject ? Object.keys(adapter.inject).join(",") + "," : "";
-  let init = "const {handler,handleError,hooks:e, " + allocateIf("validator,", hasValidation) + "mapResponse,mapCompactResponse,mapEarlyResponse,isNotEmpty,utils:{" + allocateIf("parseQuery,", hasBody) + allocateIf("parseQueryFromURL,", hasQuery) + "},error:{" + allocateIf("ValidationError,", hasValidation) + allocateIf("ParseError", hasBody) + "},fileType,schema,definitions,tee,ERROR_CODE," + allocateIf("parseCookie,", hasCookie) + allocateIf("signCookie,", hasCookie) + allocateIf("decodeURIComponent,", hasQuery) + "ElysiaCustomStatusResponse," + allocateIf("ELYSIA_TRACE,", hasTrace) + allocateIf("ELYSIA_REQUEST_ID,", hasTrace) + allocateIf("parser,", hooks.parse?.length) + allocateIf("getServer,", inference.server) + allocateIf("fileUnions,", fileUnions.length) + adapterVariables + allocateIf("TypeBoxError", hasValidation) + `}=hooks
+  let init = "const {handler,handleError,hooks:e, " + allocateIf("validator,", hasValidation) + "mapResponse,mapCompactResponse,mapEarlyResponse,isNotEmpty,safeAssign,applySchemaDefaults,cloneSchemaInput,utils:{" + allocateIf("parseQuery,", hasBody) + allocateIf("parseQueryFromURL,", hasQuery) + allocateIf("parseFormData,", hasBody) + "},error:{" + allocateIf("ValidationError,", hasValidation) + allocateIf("ParseError", hasBody) + "},fileType,schema,definitions,tee,ERROR_CODE," + allocateIf("parseCookie,", hasCookie) + allocateIf("signCookie,", hasCookie) + allocateIf("decodeURIComponent,", hasQuery) + "ElysiaCustomStatusResponse," + allocateIf("ELYSIA_TRACE,", hasTrace) + allocateIf("ELYSIA_REQUEST_ID,", hasTrace) + allocateIf("parser,", hooks.parse?.length) + allocateIf("getServer,", inference.server) + allocateIf("fileUnions,", fileUnions.length) + adapterVariables + allocateIf("TypeBoxError", hasValidation) + `}=hooks
 const trace=e.trace
 return ${maybeAsync ? "async " : ""}function handle(c){`;
   hooks.beforeHandle?.length && (init += `let be
@@ -999,8 +959,12 @@ c.defs=definitions
       mapCompactResponse: adapterHandler.mapCompactResponse,
       mapEarlyResponse: adapterHandler.mapEarlyResponse,
       isNotEmpty,
+      safeAssign,
+      applySchemaDefaults,
+      cloneSchemaInput,
       utils: {
         parseQuery: hasBody ? parseQuery : void 0,
+        parseFormData: hasBody ? parseFormData : void 0,
         parseQueryFromURL: hasQuery ? validator.query?.provider === "standard" ? parseQueryStandardSchema : parseQueryFromURL : void 0
       },
       error: {
@@ -1140,9 +1104,9 @@ return route.store.compile()(c)
 `;
   let switchMap = "";
   for (const [path, methods] of Object.entries(router.static)) {
-    switchMap += `case'${path}':`, app.config.strictPath !== !0 && (switchMap += `case'${getLoosePath(path)}':`);
+    switchMap += `case${JSON.stringify(path)}:`, app.config.strictPath !== !0 && (switchMap += `case${JSON.stringify(getLoosePath(path))}:`);
     const encoded = encodePath(path);
-    path !== encoded && (switchMap += `case'${encoded}':`), switchMap += "switch(r.method){", ("GET" in methods || "WS" in methods) && (switchMap += "case 'GET':", "WS" in methods && (switchMap += `if(r.headers.get('upgrade')==='websocket')return ht[${methods.WS}].composed(c)
+    path !== encoded && (switchMap += `case${JSON.stringify(encoded)}:`), switchMap += "switch(r.method){", ("GET" in methods || "WS" in methods) && (switchMap += "case 'GET':", "WS" in methods && (switchMap += `if(r.headers.get('upgrade')==='websocket')return ht[${methods.WS}].composed(c)
 `, "GET" in methods || ("ALL" in methods ? switchMap += `return ht[${methods.ALL}].composed(c)
 ` : switchMap += `break map
 `)), "GET" in methods && (switchMap += `return ht[${methods.GET}].composed(c)
@@ -1151,7 +1115,7 @@ return new Response(null,{status:_ht.status,statusText:_ht.statusText,headers:_h
 }))
 `);
     for (const [method, index] of Object.entries(methods))
-      method === "ALL" || method === "GET" || method === "WS" || (switchMap += `case '${method}':return ht[${index}].composed(c)
+      method === "ALL" || method === "GET" || method === "WS" || (switchMap += `case ${JSON.stringify(method)}:return ht[${index}].composed(c)
 `);
     "ALL" in methods ? switchMap += `default:return ht[${methods.ALL}].composed(c)
 ` : switchMap += `default:break map

package/dist/dynamic-handle.js

@@ -19,75 +19,7 @@ __export(dynamic_handle_exports, {
   createDynamicHandler: () => createDynamicHandler
 });
 module.exports = __toCommonJS(dynamic_handle_exports);
-var import_value = require("@sinclair/typebox/value"), import_cookies = require('./cookies.js'), import_error = require('./error.js'), import_parse_query = require('./parse-query.js'), import_schema = require('./schema.js'), import_utils = require('./utils.js');
-const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]), isDangerousKey = (key) => {
-  if (DANGEROUS_KEYS.has(key)) return !0;
-  const match = key.match(ARRAY_INDEX_REGEX);
-  return match ? DANGEROUS_KEYS.has(match[1]) : !1;
-}, parseArrayKey = (key) => {
-  const match = key.match(ARRAY_INDEX_REGEX);
-  return match ? {
-    name: match[1],
-    index: parseInt(match[2], 10)
-  } : null;
-}, parseObjectString = (entry) => {
-  if (!(typeof entry != "string" || entry.charCodeAt(0) !== 123))
-    try {
-      const parsed = JSON.parse(entry);
-      if (parsed && typeof parsed == "object" && !Array.isArray(parsed))
-        return parsed;
-    } catch {
-      return;
-    }
-}, setNestedValue = (obj, path, value) => {
-  const keys = path.split("."), lastKey = keys.pop();
-  if (isDangerousKey(lastKey) || keys.some(isDangerousKey)) return;
-  let current = obj;
-  for (const key of keys) {
-    const arrayInfo2 = parseArrayKey(key);
-    if (arrayInfo2) {
-      Array.isArray(current[arrayInfo2.name]) || (current[arrayInfo2.name] = []);
-      const existing = current[arrayInfo2.name][arrayInfo2.index], isFile = typeof File < "u" && existing instanceof File;
-      (!existing || typeof existing != "object" || Array.isArray(existing) || isFile) && (current[arrayInfo2.name][arrayInfo2.index] = parseObjectString(existing) ?? {}), current = current[arrayInfo2.name][arrayInfo2.index];
-    } else
-      (!current[key] || typeof current[key] != "object") && (current[key] = {}), current = current[key];
-  }
-  const arrayInfo = parseArrayKey(lastKey);
-  arrayInfo ? (Array.isArray(current[arrayInfo.name]) || (current[arrayInfo.name] = []), current[arrayInfo.name][arrayInfo.index] = value) : current[lastKey] = value;
-}, normalizeFormValue = (value) => {
-  if (value.length === 1) {
-    const stringValue2 = value[0];
-    if (typeof stringValue2 == "string" && (stringValue2.charCodeAt(0) === 123 || stringValue2.charCodeAt(0) === 91))
-      try {
-        const parsed2 = JSON.parse(stringValue2);
-        if (parsed2 && typeof parsed2 == "object")
-          return parsed2;
-      } catch {
-      }
-    return value[0];
-  }
-  const stringValue = value.find(
-    (entry) => typeof entry == "string"
-  );
-  if (!stringValue || typeof File > "u") return value;
-  const files = value.filter((entry) => entry instanceof File);
-  if (!files.length || stringValue.charCodeAt(0) !== 123) return value;
-  let parsed;
-  try {
-    parsed = JSON.parse(stringValue);
-  } catch {
-    return value;
-  }
-  return typeof parsed != "object" || parsed === null ? value : (!("file" in parsed) && files.length === 1 ? parsed.file = files[0] : !("files" in parsed) && files.length > 1 && (parsed.files = files), parsed);
-}, injectDefaultValues = (typeChecker, obj) => {
-  let schema = typeChecker.schema;
-  if (!schema) return;
-  schema.$defs?.[schema.$ref] && (schema = schema.$defs[schema.$ref]);
-  const properties = (0, import_schema.getSchemaProperties)(schema);
-  if (properties)
-    for (const [key, keySchema] of Object.entries(properties))
-      obj[key] ??= keySchema.default;
-};
+var import_value = require("@sinclair/typebox/value"), import_cookies = require('./cookies.js'), import_error = require('./error.js'), import_parse_query = require('./parse-query.js'), import_form_data = require('./form-data.js'), import_schema = require('./schema.js'), import_utils = require('./utils.js');
 async function validateStandardSchema(type, validator, value) {
   const result = await validator.Validate(value);
   if (result.issues)
@@ -135,10 +67,10 @@ const createDynamicHandler = (app) => {
       if (!handler)
         throw context.query = qi === -1 ? {} : (0, import_parse_query.parseQuery)(url.substring(qi + 1)), new import_error.NotFoundError();
       const { handle, validator, content, route } = handler.store;
-      if (hooks = handler.store.hooks, hooks.config?.mount)
-        return await hooks.config.mount(request);
+      hooks = handler.store.hooks;
+      const isMount = !!hooks.config?.mount;
       let body;
-      if (request.method !== "GET" && request.method !== "HEAD")
+      if (!isMount && request.method !== "GET" && request.method !== "HEAD")
         if (content)
           switch (content) {
             case "application/json":
@@ -154,17 +86,7 @@ const createDynamicHandler = (app) => {
               body = await request.arrayBuffer();
               break;
             case "multipart/form-data": {
-              body = {};
-              const form = await request.formData(), grouped = /* @__PURE__ */ new Map();
-              form.forEach((v, k) => {
-                const list = grouped.get(k);
-                list ? list.push(v) : grouped.set(k, [v]);
-              });
-              for (const [key, value] of grouped) {
-                if (body[key]) continue;
-                const finalValue = normalizeFormValue(value);
-                key.includes(".") || key.includes("[") ? setNestedValue(body, key, finalValue) : body[key] = finalValue;
-              }
+              body = (0, import_form_data.parseFormData)(await request.formData());
               break;
             }
           }
@@ -197,17 +119,9 @@ const createDynamicHandler = (app) => {
                       break;
                     case "formdata":
                     case "multipart/form-data": {
-                      body = {};
-                      const form = await request.formData(), grouped = /* @__PURE__ */ new Map();
-                      form.forEach((v, k) => {
-                        const list = grouped.get(k);
-                        list ? list.push(v) : grouped.set(k, [v]);
-                      });
-                      for (const [key, value] of grouped) {
-                        if (body[key]) continue;
-                        const finalValue = normalizeFormValue(value);
-                        key.includes(".") || key.includes("[") ? setNestedValue(body, key, finalValue) : body[key] = finalValue;
-                      }
+                      body = (0, import_form_data.parseFormData)(
+                        await request.formData()
+                      );
                       break;
                     }
                     default: {
@@ -248,17 +162,9 @@ const createDynamicHandler = (app) => {
                   body = await request.arrayBuffer();
                   break;
                 case "multipart/form-data": {
-                  body = {};
-                  const form = await request.formData(), grouped = /* @__PURE__ */ new Map();
-                  form.forEach((v, k) => {
-                    const list = grouped.get(k);
-                    list ? list.push(v) : grouped.set(k, [v]);
-                  });
-                  for (const [key, value] of grouped) {
-                    if (body[key]) continue;
-                    const finalValue = normalizeFormValue(value);
-                    key.includes(".") || key.includes("[") ? setNestedValue(body, key, finalValue) : body[key] = finalValue;
-                  }
+                  body = (0, import_form_data.parseFormData)(
+                    await request.formData()
+                  );
                   break;
                 }
               }
@@ -267,29 +173,29 @@ const createDynamicHandler = (app) => {
       context.route = route, context.body = body, context.params = handler?.params || void 0, context.query = qi === -1 ? {} : (0, import_parse_query.parseQuery)(url.substring(qi + 1)), context.headers = {};
       for (const [key, value] of request.headers.entries())
         context.headers[key] = value;
-      const cookieMeta = {
-        domain: app.config.cookie?.domain ?? // @ts-expect-error
+      const cookieValidator = validator?.createCookie?.(), defaultCookie = hooks.config?.cookie ? (0, import_utils.mergeCookie)(app.config.cookie ?? {}, hooks.config.cookie) : app.config.cookie, cookieMeta = {
+        domain: defaultCookie?.domain ?? // @ts-expect-error
         validator?.cookie?.config.domain,
-        expires: app.config.cookie?.expires ?? // @ts-expect-error
+        expires: defaultCookie?.expires ?? // @ts-expect-error
         validator?.cookie?.config.expires,
-        httpOnly: app.config.cookie?.httpOnly ?? // @ts-expect-error
+        httpOnly: defaultCookie?.httpOnly ?? // @ts-expect-error
         validator?.cookie?.config.httpOnly,
-        maxAge: app.config.cookie?.maxAge ?? // @ts-expect-error
+        maxAge: defaultCookie?.maxAge ?? // @ts-expect-error
         validator?.cookie?.config.maxAge,
         // @ts-expect-error
-        path: app.config.cookie?.path ?? validator?.cookie?.config.path,
-        priority: app.config.cookie?.priority ?? // @ts-expect-error
+        path: defaultCookie?.path ?? validator?.cookie?.config.path,
+        priority: defaultCookie?.priority ?? // @ts-expect-error
         validator?.cookie?.config.priority,
-        partitioned: app.config.cookie?.partitioned ?? // @ts-expect-error
+        partitioned: defaultCookie?.partitioned ?? // @ts-expect-error
         validator?.cookie?.config.partitioned,
-        sameSite: app.config.cookie?.sameSite ?? // @ts-expect-error
+        sameSite: defaultCookie?.sameSite ?? // @ts-expect-error
         validator?.cookie?.config.sameSite,
-        secure: app.config.cookie?.secure ?? // @ts-expect-error
+        secure: defaultCookie?.secure ?? // @ts-expect-error
         validator?.cookie?.config.secure,
-        secrets: app.config.cookie?.secrets ?? // @ts-expect-error
+        secrets: defaultCookie?.secrets ?? // @ts-expect-error
         validator?.cookie?.config.secrets,
         // @ts-expect-error
-        sign: app.config.cookie?.sign ?? validator?.cookie?.config.sign
+        sign: defaultCookie?.sign ?? validator?.cookie?.config.sign
       }, cookieHeaderValue = request.headers.get("cookie");
       context.cookie = await (0, import_cookies.parseCookie)(
         context.set,
@@ -297,11 +203,23 @@ const createDynamicHandler = (app) => {
         cookieMeta
       );
       const headerValidator = validator?.createHeaders?.();
-      headerValidator && injectDefaultValues(headerValidator, context.headers);
+      headerValidator?.hasDefault && (context.headers = (0, import_schema.applySchemaDefaults)(
+        headerValidator,
+        context.headers,
+        !0
+      ));
       const paramsValidator = validator?.createParams?.();
-      paramsValidator && injectDefaultValues(paramsValidator, context.params);
+      paramsValidator?.hasDefault && (context.params = (0, import_schema.applySchemaDefaults)(
+        paramsValidator,
+        context.params,
+        !0
+      ));
       const queryValidator = validator?.createQuery?.();
-      if (queryValidator && injectDefaultValues(queryValidator, context.query), hooks.transform)
+      if (queryValidator?.hasDefault && (context.query = (0, import_schema.applySchemaDefaults)(
+        queryValidator,
+        context.query,
+        !0
+      )), hooks.transform)
         for (let i = 0; i < hooks.transform.length; i++) {
           const hook = hooks.transform[i];
           let response2 = hook.fn(context);
@@ -310,7 +228,7 @@ const createDynamicHandler = (app) => {
             if (result)
               return context.response = result;
           }
-          hook.subType === "derive" && Object.assign(context, response2);
+          hook.subType === "derive" && (0, import_utils.safeAssign)(context, response2);
         }
       if (validator) {
         if (headerValidator) {
@@ -370,32 +288,34 @@ const createDynamicHandler = (app) => {
             );
           validator.query?.Decode && (context.query = validator.query.Decode(context.query));
         }
-        if (validator.createCookie?.()) {
+        if (cookieValidator) {
           let cookieValue = {};
           for (const [key, value] of Object.entries(context.cookie))
             cookieValue[key] = value.value;
-          if (validator.cookie.provider === "standard") {
+          if (cookieValidator.provider === "standard") {
             cookieValue = await validateStandardSchema(
               "cookie",
-              validator.cookie,
+              cookieValidator,
               cookieValue
             );
             for (const key of Object.keys(cookieValue))
               context.cookie[key].value = cookieValue[key];
           } else {
-            if (validator.cookie.Check(cookieValue) === !1)
+            if (cookieValidator.Check(cookieValue) === !1)
               throw new import_error.ValidationError(
                 "cookie",
-                validator.cookie,
+                cookieValidator,
                 cookieValue
               );
-            validator.cookie?.Decode && (cookieValue = validator.cookie.Decode(
-              cookieValue
-            ));
+            if (cookieValidator.Decode) {
+              cookieValue = cookieValidator.Decode(cookieValue);
+              for (const key of Object.keys(cookieValue))
+                context.cookie[key].value = cookieValue[key];
+            }
           }
         }
         const bodyValidator = validator.createBody?.();
-        if (bodyValidator?.provider === "standard")
+        if (bodyValidator?.hasDefault && (body = (0, import_schema.applySchemaDefaults)(bodyValidator, body), context.body = body), bodyValidator?.provider === "standard")
           context.body = await validateStandardSchema(
             "body",
             bodyValidator,
@@ -420,7 +340,7 @@ const createDynamicHandler = (app) => {
               return context.response = result;
           }
           if (hook.subType === "resolve") {
-            Object.assign(context, response2);
+            (0, import_utils.safeAssign)(context, response2);
             continue;
           }
           if (response2 !== void 0) {
@@ -536,7 +456,9 @@ const createDynamicHandler = (app) => {
                 secret
               );
         } else {
-          const properties = (0, import_schema.getSchemaProperties)(validator?.cookie?.schema);
+          const properties = (0, import_schema.getSchemaProperties)(
+            validator?.cookie?.schema
+          );
           if (secret)
             for (const name of cookieMeta.sign)
               !properties || !(name in properties) || context.set.cookie[name]?.value && (context.set.cookie[name].value = await (0, import_utils.signCookie)(