elysia 1.4.29 → 1.4.31

package/dist/dynamic-handle.js

@@ -19,75 +19,20 @@ __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;
-}, createDynamicHandler = (app) => {
+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)
+    throw new import_error.ValidationError(
+      type,
+      validator,
+      value,
+      !1,
+      result.issues
+    );
+  return result.value;
+}
+const createDynamicHandler = (app) => {
   const { mapResponse, mapEarlyResponse } = app["~adapter"].handler, defaultHeader = app.setHeaders;
   return async (request) => {
     const url = request.url, s = url.indexOf("/", 11), qi = url.indexOf("?", s + 1), path = qi === -1 ? url.substring(s) : url.substring(s, qi), set = {
@@ -122,10 +67,10 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
       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":
@@ -141,17 +86,7 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
               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;
             }
           }
@@ -184,17 +119,9 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
                       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: {
@@ -235,17 +162,9 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
                   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;
                 }
               }
@@ -254,29 +173,29 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
       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,
@@ -284,11 +203,23 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
         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);
@@ -297,27 +228,42 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
             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) {
           const _header = structuredClone(context.headers);
           for (const [key, value] of request.headers)
             _header[key] = value;
-          if (validator.headers.Check(_header) === !1)
+          if (headerValidator.provider === "standard")
+            context.headers = await validateStandardSchema(
+              "header",
+              headerValidator,
+              _header
+            );
+          else if (validator.headers.Check(_header) === !1)
             throw new import_error.ValidationError(
               "header",
               validator.headers,
               _header
             );
         } else validator.headers?.Decode && (context.headers = validator.headers.Decode(context.headers));
-        if (paramsValidator?.Check(context.params) === !1)
-          throw new import_error.ValidationError(
+        if (paramsValidator?.provider === "standard")
+          context.params = await validateStandardSchema(
             "params",
-            validator.params,
+            paramsValidator,
             context.params
           );
-        if (validator.params?.Decode && (context.params = validator.params.Decode(context.params)), validator.query?.schema) {
+        else {
+          if (paramsValidator?.Check(context.params) === !1)
+            throw new import_error.ValidationError(
+              "params",
+              validator.params,
+              context.params
+            );
+          validator.params?.Decode && (context.params = validator.params.Decode(context.params));
+        }
+        if (validator.query?.schema) {
           let schema = validator.query.schema;
           schema.$defs?.[schema.$ref] && (schema = schema.$defs[schema.$ref]);
           const properties = (0, import_schema.getSchemaProperties)(schema);
@@ -327,31 +273,61 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
               (value.type === "array" || value.items?.type === "string") && typeof context.query[property] == "string" && context.query[property] && (context.query[property] = context.query[property].split(","));
             }
         }
-        if (queryValidator?.Check(context.query) === !1)
-          throw new import_error.ValidationError(
+        if (queryValidator?.provider === "standard")
+          context.query = await validateStandardSchema(
             "query",
-            validator.query,
+            queryValidator,
             context.query
           );
-        if (validator.query?.Decode && (context.query = validator.query.Decode(context.query)), validator.createCookie?.()) {
+        else {
+          if (queryValidator?.Check(context.query) === !1)
+            throw new import_error.ValidationError(
+              "query",
+              validator.query,
+              context.query
+            );
+          validator.query?.Decode && (context.query = validator.query.Decode(context.query));
+        }
+        if (cookieValidator) {
           let cookieValue = {};
           for (const [key, value] of Object.entries(context.cookie))
             cookieValue[key] = value.value;
-          if (validator.cookie.Check(cookieValue) === !1)
-            throw new import_error.ValidationError(
+          if (cookieValidator.provider === "standard") {
+            cookieValue = await validateStandardSchema(
               "cookie",
-              validator.cookie,
+              cookieValidator,
               cookieValue
             );
-          validator.cookie?.Decode && (cookieValue = validator.cookie.Decode(
-            cookieValue
-          ));
+            for (const key of Object.keys(cookieValue))
+              context.cookie[key].value = cookieValue[key];
+          } else {
+            if (cookieValidator.Check(cookieValue) === !1)
+              throw new import_error.ValidationError(
+                "cookie",
+                cookieValidator,
+                cookieValue
+              );
+            if (cookieValidator.Decode) {
+              cookieValue = cookieValidator.Decode(cookieValue);
+              for (const key of Object.keys(cookieValue))
+                context.cookie[key].value = cookieValue[key];
+            }
+          }
         }
-        if (validator.createBody?.()?.Check(body) === !1)
-          throw new import_error.ValidationError("body", validator.body, body);
-        if (validator.body?.Decode) {
-          let decoded = validator.body.Decode(body);
-          decoded instanceof Promise && (decoded = await decoded), context.body = decoded?.value ?? decoded;
+        const bodyValidator = validator.createBody?.();
+        if (bodyValidator?.hasDefault && (body = (0, import_schema.applySchemaDefaults)(bodyValidator, body), context.body = body), bodyValidator?.provider === "standard")
+          context.body = await validateStandardSchema(
+            "body",
+            bodyValidator,
+            body
+          );
+        else {
+          if (bodyValidator?.Check(body) === !1)
+            throw new import_error.ValidationError("body", validator.body, body);
+          if (validator.body?.Decode) {
+            let decoded = validator.body.Decode(body);
+            decoded instanceof Promise && (decoded = await decoded), context.body = decoded?.value ?? decoded;
+          }
         }
       }
       if (hooks.beforeHandle)
@@ -364,7 +340,7 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
               return context.response = result;
           }
           if (hook.subType === "resolve") {
-            Object.assign(context, response2);
+            (0, import_utils.safeAssign)(context, response2);
             continue;
           }
           if (response2 !== void 0) {
@@ -390,7 +366,13 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
           const isCustomStatuResponse = response2 instanceof import_error.ElysiaCustomStatusResponse, status2 = isCustomStatuResponse ? response2.code : set.status ? typeof set.status == "string" ? import_utils.StatusMap[set.status] : set.status : 200;
           isCustomStatuResponse && (set.status = status2, response2 = response2.response);
           const responseValidator = validator?.createResponse?.()?.[status2];
-          if (responseValidator?.Check(response2) === !1)
+          if (responseValidator?.provider === "standard")
+            response2 = await validateStandardSchema(
+              "response",
+              responseValidator,
+              response2
+            );
+          else if (responseValidator?.Check(response2) === !1)
             if (responseValidator?.Clean)
               try {
                 const temp = responseValidator.Clean(response2);
@@ -426,7 +408,13 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
         const isCustomStatuResponse = response instanceof import_error.ElysiaCustomStatusResponse, status2 = isCustomStatuResponse ? response.code : set.status ? typeof set.status == "string" ? import_utils.StatusMap[set.status] : set.status : 200;
         isCustomStatuResponse && (set.status = status2, response = response.response);
         const responseValidator = validator?.createResponse?.()?.[status2];
-        if (responseValidator?.Check(response) === !1)
+        if (responseValidator?.provider === "standard")
+          response = await validateStandardSchema(
+            "response",
+            responseValidator,
+            response
+          );
+        else if (responseValidator?.Check(response) === !1)
           if (responseValidator?.Clean)
             try {
               const temp = responseValidator.Clean(response);
@@ -468,7 +456,9 @@ const ARRAY_INDEX_REGEX = /^(.+)\[(\d+)\]$/, DANGEROUS_KEYS = /* @__PURE__ */ ne
                 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)(