befly 3.13.7 → 3.13.8

package/dist/befly.js

@@ -83,30 +83,6 @@ function normalizePositiveInt(value, fallback, min, max) {
     return max;
   return v;
 }
-function isEmpty(value) {
-  if (value === null || value === undefined) {
-    return true;
-  }
-  if (typeof value === "string") {
-    return value.trim().length === 0;
-  }
-  if (typeof value === "number") {
-    return value === 0 || Number.isNaN(value);
-  }
-  if (typeof value === "boolean") {
-    return value === false;
-  }
-  if (Array.isArray(value)) {
-    return value.length === 0;
-  }
-  if (value instanceof Map || value instanceof Set) {
-    return value.size === 0;
-  }
-  if (isPlainObject(value)) {
-    return Object.keys(value).length === 0;
-  }
-  return false;
-}
 function forOwn(obj, iteratee) {
   if (typeof iteratee !== "function") {
     return;
@@ -203,17 +179,6 @@ var keysToCamel = (obj) => {
   if (!arr || !Array.isArray(arr))
     return arr;
   return arr.map((item) => keysToCamel(item));
-}, pickFields = (obj, keys) => {
-  if (!obj || !isPlainObject(obj) && !Array.isArray(obj)) {
-    return {};
-  }
-  const result = {};
-  for (const key of keys) {
-    if (key in obj) {
-      result[key] = obj[key];
-    }
-  }
-  return result;
 };
 var init_util = () => {};
 
@@ -12127,7 +12092,6 @@ class XMLParser {
 }
 
 // hooks/parser.ts
-init_util();
 var xmlParser = new XMLParser;
 var parserHook = {
   name: "parser",
@@ -12143,11 +12107,7 @@ var parserHook = {
     if (ctx.req.method === "GET") {
       const url = new URL(ctx.req.url);
       const params = Object.fromEntries(url.searchParams);
-      if (isPlainObject(ctx.api.fields) && !isEmpty(ctx.api.fields)) {
-        ctx.body = pickFields(params, Object.keys(ctx.api.fields));
-      } else {
-        ctx.body = params;
-      }
+      ctx.body = params;
     } else if (ctx.req.method === "POST") {
       const contentType = ctx.req.headers.get("content-type") || "";
       const url = new URL(ctx.req.url);
@@ -12156,22 +12116,14 @@ var parserHook = {
         if (contentType.includes("application/json")) {
           const body = await ctx.req.json();
           const merged = { ...queryParams, ...body };
-          if (isPlainObject(ctx.api.fields) && !isEmpty(ctx.api.fields)) {
-            ctx.body = pickFields(merged, Object.keys(ctx.api.fields));
-          } else {
-            ctx.body = merged;
-          }
+          ctx.body = merged;
         } else if (contentType.includes("application/xml") || contentType.includes("text/xml")) {
           const text = await ctx.req.text();
           const parsed = xmlParser.parse(text);
           const rootKey = Object.keys(parsed)[0];
           const body = rootKey && typeof parsed[rootKey] === "object" ? parsed[rootKey] : parsed;
           const merged = { ...queryParams, ...body };
-          if (isPlainObject(ctx.api.fields) && !isEmpty(ctx.api.fields)) {
-            ctx.body = pickFields(merged, Object.keys(ctx.api.fields));
-          } else {
-            ctx.body = merged;
-          }
+          ctx.body = merged;
         } else {
           ctx.response = ErrorResponse(ctx, "\u65E0\u6548\u7684\u8BF7\u6C42\u53C2\u6570\u683C\u5F0F", 1, null, {
             location: "content-type",
@@ -12326,7 +12278,7 @@ class Validator {
     }
     for (const field of required) {
       const value = data[field];
-      if (value === undefined || value === null || value === "") {
+      if (value === undefined || value === null) {
         const label = rules[field]?.name || field;
         fieldErrors[field] = `${label}\u4E3A\u5FC5\u586B\u9879`;
       }
@@ -12499,6 +12451,7 @@ class Validator {
 }
 
 // hooks/validator.ts
+init_util();
 var validatorHook = {
   name: "validator",
   enable: true,
@@ -12509,10 +12462,25 @@ var validatorHook = {
     if (!ctx.api.fields) {
       return;
     }
-    for (const [field, fieldDef] of Object.entries(ctx.api.fields)) {
-      if (ctx.body[field] === undefined && fieldDef?.default !== undefined && fieldDef?.default !== null) {
-        ctx.body[field] = fieldDef.default;
+    if (isPlainObject(ctx.api.fields)) {
+      const rawBody = isPlainObject(ctx.body) ? ctx.body : {};
+      const nextBody = {};
+      for (const [field, fieldDef] of Object.entries(ctx.api.fields)) {
+        let value = rawBody[field];
+        if (value === undefined) {
+          const snakeField = snakeCase(field);
+          if (rawBody[snakeField] !== undefined) {
+            value = rawBody[snakeField];
+          }
+        }
+        if (value === undefined && fieldDef?.default !== undefined && fieldDef?.default !== null) {
+          value = fieldDef.default;
+        }
+        if (value !== undefined) {
+          nextBody[field] = value;
+        }
       }
+      ctx.body = nextBody;
     }
     const result = Validator.validate(ctx.body, ctx.api.fields, ctx.api.required || []);
     if (result.code !== 0) {