elysia 1.4.30 → 1.4.32

package/dist/dynamic-handle.mjs

@@ -7,76 +7,19 @@ import {
   ValidationError
 } from "./error.mjs";
 import { parseQuery } from "./parse-query.mjs";
-import { getSchemaProperties } from "./schema.mjs";
-import { hasSetImmediate, redirect, StatusMap, signCookie } from "./utils.mjs";
-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 = getSchemaProperties(schema);
-  if (properties)
-    for (const [key, keySchema] of Object.entries(properties))
-      obj[key] ??= keySchema.default;
-};
+import { parseFormData } from "./form-data.mjs";
+import {
+  applySchemaDefaults,
+  getSchemaProperties
+} from "./schema.mjs";
+import {
+  hasSetImmediate,
+  mergeCookie,
+  redirect,
+  safeAssign,
+  StatusMap,
+  signCookie
+} from "./utils.mjs";
 async function validateStandardSchema(type, validator, value) {
   const result = await validator.Validate(value);
   if (result.issues)
@@ -124,10 +67,10 @@ const createDynamicHandler = (app) => {
       if (!handler)
         throw context.query = qi === -1 ? {} : parseQuery(url.substring(qi + 1)), new 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":
@@ -143,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 = parseFormData(await request.formData());
               break;
             }
           }
@@ -186,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 = parseFormData(
+                        await request.formData()
+                      );
                       break;
                     }
                     default: {
@@ -237,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 = parseFormData(
+                    await request.formData()
+                  );
                   break;
                 }
               }
@@ -256,29 +173,29 @@ const createDynamicHandler = (app) => {
       context.route = route, context.body = body, context.params = handler?.params || void 0, context.query = qi === -1 ? {} : 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 ? 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 parseCookie(
         context.set,
@@ -286,11 +203,23 @@ const createDynamicHandler = (app) => {
         cookieMeta
       );
       const headerValidator = validator?.createHeaders?.();
-      headerValidator && injectDefaultValues(headerValidator, context.headers);
+      headerValidator?.hasDefault && (context.headers = applySchemaDefaults(
+        headerValidator,
+        context.headers,
+        !0
+      ));
       const paramsValidator = validator?.createParams?.();
-      paramsValidator && injectDefaultValues(paramsValidator, context.params);
+      paramsValidator?.hasDefault && (context.params = applySchemaDefaults(
+        paramsValidator,
+        context.params,
+        !0
+      ));
       const queryValidator = validator?.createQuery?.();
-      if (queryValidator && injectDefaultValues(queryValidator, context.query), hooks.transform)
+      if (queryValidator?.hasDefault && (context.query = 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);
@@ -299,7 +228,7 @@ const createDynamicHandler = (app) => {
             if (result)
               return context.response = result;
           }
-          hook.subType === "derive" && Object.assign(context, response2);
+          hook.subType === "derive" && safeAssign(context, response2);
         }
       if (validator) {
         if (headerValidator) {
@@ -359,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 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 = applySchemaDefaults(bodyValidator, body), context.body = body), bodyValidator?.provider === "standard")
           context.body = await validateStandardSchema(
             "body",
             bodyValidator,
@@ -409,7 +340,7 @@ const createDynamicHandler = (app) => {
               return context.response = result;
           }
           if (hook.subType === "resolve") {
-            Object.assign(context, response2);
+            safeAssign(context, response2);
             continue;
           }
           if (response2 !== void 0) {
@@ -525,7 +456,9 @@ const createDynamicHandler = (app) => {
                 secret
               );
         } else {
-          const properties = getSchemaProperties(validator?.cookie?.schema);
+          const properties = 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 signCookie(

package/dist/error.d.ts

@@ -111,6 +111,12 @@ export declare const mapValueError: (error: ValueError | undefined) => ValueErro
  * Maximum amount of validation error
  */
 export declare const MAX_ERRORS = 64;
+export declare const MAX_VALIDATION_ERROR_DEPTH = 16;
+export declare const MAX_VALIDATION_ERROR_NODES = 8192;
+export declare const MAX_VALIDATION_ERROR_ENTRIES = 4096;
+export declare const MAX_VALIDATION_ERROR_CONTAINER_ENTRIES = 512;
+export declare const MAX_VALIDATION_ERROR_STRING_LENGTH = 4096;
+export declare const MAX_VALIDATION_ERROR_OUTPUT_LENGTH = 65536;
 export declare class InvalidFileType extends Error {
     property: string;
     expected: string | string[];
@@ -178,24 +184,6 @@ export declare class ValidationError extends Error {
      *		})
      * ```
      */
-    detail(message: unknown, allowUnsafeValidatorDetails?: boolean): string | {
-        type: string;
-        on: string;
-        found: unknown;
-        message: unknown;
-        property?: undefined;
-        summary?: undefined;
-        expected?: undefined;
-        errors?: undefined;
-    } | {
-        type: string;
-        on: string;
-        property: string;
-        message: unknown;
-        summary: string | undefined;
-        found: unknown;
-        expected: unknown;
-        errors: ValueErrorWithSummary[];
-    };
+    detail(message: unknown, allowUnsafeValidatorDetails?: boolean): unknown;
 }
 export {};