befly 3.13.7 → 3.13.9

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 = () => {};
 
@@ -1013,6 +978,43 @@ var init_logger = __esm(() => {
   Logger = new LoggerFacade;
 });
 
+// utils/importDefault.ts
+import { isAbsolute } from "path";
+import { pathToFileURL } from "url";
+function isWindowsAbsPath(file) {
+  return /^[a-zA-Z]:[\\/]/.test(file);
+}
+function toFileImportUrl(file) {
+  if (isAbsolute(file) || isWindowsAbsPath(file)) {
+    return pathToFileURL(file).href;
+  }
+  return file;
+}
+async function importDefault(file, defaultValue) {
+  try {
+    const isJson = file.endsWith(".json");
+    const mod = isJson ? await import(toFileImportUrl(file), { with: { type: "json" } }) : await import(file);
+    const value = mod?.default;
+    if (value === null || value === undefined) {
+      return defaultValue;
+    }
+    const expectedType = getTypeTag(defaultValue);
+    const actualType = getTypeTag(value);
+    if (expectedType !== actualType) {
+      Logger.warn({ file, msg: "importDefault \u5BFC\u5165\u7C7B\u578B\u4E0E\u9ED8\u8BA4\u503C\u4E0D\u4E00\u81F4\uFF0C\u5DF2\u56DE\u9000\u5230\u9ED8\u8BA4\u503C", expectedType, actualType });
+      return defaultValue;
+    }
+    return value;
+  } catch (err) {
+    Logger.warn({ err, file, msg: "importDefault \u5BFC\u5165\u5931\u8D25\uFF0C\u5DF2\u56DE\u9000\u5230\u9ED8\u8BA4\u503C" });
+    return defaultValue;
+  }
+}
+var init_importDefault = __esm(() => {
+  init_logger();
+  init_util();
+});
+
 // ../../node_modules/.bun/pathe@2.0.3/node_modules/pathe/dist/shared/pathe.M-eThtNZ.mjs
 function normalizeWindowsPath(input = "") {
   if (!input) {
@@ -1240,31 +1242,18 @@ var init_isDirentDirectory = __esm(() => {
 
 // utils/loadMenuConfigs.ts
 import { existsSync as existsSync2 } from "fs";
-import { readdir, readFile } from "fs/promises";
-function cleanDirName(name) {
-  return String(name).replace(/_\d+$/, "");
-}
-function extractScriptSetupBlock(vueContent) {
-  const openTag = /<script\b[^>]*\bsetup\b[^>]*>/i.exec(vueContent);
-  if (!openTag) {
-    return null;
-  }
-  const start = openTag.index + openTag[0].length;
-  const closeIndex = vueContent.indexOf("</script>", start);
-  if (closeIndex < 0) {
+import { readdir } from "fs/promises";
+function normalizeViewDirMeta(input) {
+  if (!input || typeof input !== "object") {
     return null;
   }
-  return vueContent.slice(start, closeIndex);
-}
-function extractDefinePageMetaFromScriptSetup(scriptSetup) {
-  const titleMatch = scriptSetup.match(/definePage\s*\([\s\S]*?meta\s*:\s*\{[\s\S]*?title\s*:\s*(["'`])([^"'`]+)\1/);
-  if (!titleMatch) {
+  if (typeof input.title !== "string" || !input.title) {
     return null;
   }
-  const orderMatch = scriptSetup.match(/definePage\s*\([\s\S]*?meta\s*:\s*\{[\s\S]*?order\s*:\s*(\d+)/);
+  const order = typeof input.order === "number" && Number.isFinite(input.order) && Number.isInteger(input.order) && input.order >= 0 ? input.order : undefined;
   return {
-    title: titleMatch[2],
-    order: orderMatch ? Number(orderMatch[1]) : undefined
+    title: input.title,
+    order
   };
 }
 async function scanViewsDirToMenuConfigs(viewsDir, prefix, parentPath = "") {
@@ -1278,31 +1267,26 @@ async function scanViewsDirToMenuConfigs(viewsDir, prefix, parentPath = "") {
       continue;
     }
     const dirPath = join2(viewsDir, entry.name);
+    const metaJsonPath = join2(dirPath, "meta.json");
     const indexVuePath = join2(dirPath, "index.vue");
+    let meta = null;
+    if (!existsSync2(metaJsonPath)) {
+      continue;
+    }
     if (!existsSync2(indexVuePath)) {
+      Logger.warn({ path: dirPath, msg: "\u76EE\u5F55\u5B58\u5728 meta.json \u4F46\u7F3A\u5C11 index.vue\uFF0C\u5DF2\u8DF3\u8FC7\u8BE5\u76EE\u5F55\u83DC\u5355\u540C\u6B65" });
       continue;
     }
-    let meta = null;
-    try {
-      const content = await readFile(indexVuePath, "utf-8");
-      const scriptSetup = extractScriptSetupBlock(content);
-      if (!scriptSetup) {
-        Logger.warn({ path: indexVuePath, msg: "index.vue \u7F3A\u5C11 <script setup>\uFF0C\u5DF2\u8DF3\u8FC7\u8BE5\u76EE\u5F55\u83DC\u5355\u540C\u6B65" });
-        continue;
-      }
-      meta = extractDefinePageMetaFromScriptSetup(scriptSetup);
-      if (!meta?.title) {
-        Logger.warn({ path: indexVuePath, msg: "index.vue \u672A\u58F0\u660E definePage({ meta: { title, order? } })\uFF0C\u5DF2\u8DF3\u8FC7\u8BE5\u76EE\u5F55\u83DC\u5355\u540C\u6B65" });
-        continue;
-      }
-    } catch (error) {
-      Logger.warn({ err: error, path: indexVuePath, msg: "\u8BFB\u53D6 index.vue \u5931\u8D25" });
+    const metaRaw = await importDefault(metaJsonPath, {});
+    meta = normalizeViewDirMeta(metaRaw);
+    if (!meta?.title) {
+      Logger.warn({ path: metaJsonPath, msg: "meta.json \u7F3A\u5C11\u6709\u6548\u7684 title\uFF08\u4EE5\u53CA\u53EF\u9009 order:number\uFF09\uFF0C\u5DF2\u8DF3\u8FC7\u8BE5\u76EE\u5F55\u83DC\u5355\u540C\u6B65" });
       continue;
     }
     if (!meta?.title) {
       continue;
     }
-    const cleanName = cleanDirName(entry.name);
+    const cleanName = String(entry.name).replace(/_\d+$/, "");
     let menuPath;
     if (cleanName === "index") {
       menuPath = parentPath;
@@ -1360,16 +1344,11 @@ async function loadMenuConfigs(addons) {
   }
   const menusJsonPath = join2(process.cwd(), "menus.json");
   if (existsSync2(menusJsonPath)) {
-    try {
-      const content = await readFile(menusJsonPath, "utf-8");
-      const appMenus = JSON.parse(content);
-      if (Array.isArray(appMenus) && appMenus.length > 0) {
-        for (const menu of appMenus) {
-          allMenus.push(menu);
-        }
+    const appMenus = await importDefault(menusJsonPath, []);
+    if (Array.isArray(appMenus) && appMenus.length > 0) {
+      for (const menu of appMenus) {
+        allMenus.push(menu);
       }
-    } catch (error) {
-      Logger.warn({ err: error, msg: "\u8BFB\u53D6\u9879\u76EE menus.json \u5931\u8D25" });
     }
   }
   return allMenus;
@@ -1377,6 +1356,7 @@ async function loadMenuConfigs(addons) {
 var init_loadMenuConfigs = __esm(() => {
   init_dist();
   init_logger();
+  init_importDefault();
   init_isDirentDirectory();
 });
 
@@ -7443,43 +7423,9 @@ var require_src = __commonJS((exports, module) => {
 });
 
 // befly.config.ts
+init_importDefault();
 import { join } from "path";
 
-// utils/importDefault.ts
-init_logger();
-init_util();
-import { isAbsolute } from "path";
-import { pathToFileURL } from "url";
-function isWindowsAbsPath(file) {
-  return /^[a-zA-Z]:[\\/]/.test(file);
-}
-function toFileImportUrl(file) {
-  if (isAbsolute(file) || isWindowsAbsPath(file)) {
-    return pathToFileURL(file).href;
-  }
-  return file;
-}
-async function importDefault(file, defaultValue) {
-  try {
-    const isJson = file.endsWith(".json");
-    const mod = isJson ? await import(toFileImportUrl(file), { with: { type: "json" } }) : await import(file);
-    const value = mod?.default;
-    if (value === null || value === undefined) {
-      return defaultValue;
-    }
-    const expectedType = getTypeTag(defaultValue);
-    const actualType = getTypeTag(value);
-    if (expectedType !== actualType) {
-      Logger.warn({ file, msg: "importDefault \u5BFC\u5165\u7C7B\u578B\u4E0E\u9ED8\u8BA4\u503C\u4E0D\u4E00\u81F4\uFF0C\u5DF2\u56DE\u9000\u5230\u9ED8\u8BA4\u503C", expectedType, actualType });
-      return defaultValue;
-    }
-    return value;
-  } catch (err) {
-    Logger.warn({ err, file, msg: "importDefault \u5BFC\u5165\u5931\u8D25\uFF0C\u5DF2\u56DE\u9000\u5230\u9ED8\u8BA4\u503C" });
-    return defaultValue;
-  }
-}
-
 // utils/mergeAndConcat.ts
 init_util();
 function cloneDeepLoose(value) {
@@ -8851,7 +8797,7 @@ async function syncApi(ctx, apis) {
   }
   const allDbApis = await ctx.db.getAll({
     table: tableName,
-    fields: ["id", "routePath", "name", "addonName", "state"],
+    fields: ["id", "routePath", "name", "addonName", "auth", "state"],
     where: { state$gte: 0 }
   });
   const dbLists = allDbApis.data.lists || [];
@@ -8865,16 +8811,24 @@ async function syncApi(ctx, apis) {
     if (apiType && apiType !== "api") {
       continue;
     }
-    const routePath = api.routePath;
-    apiRouteKeys.add(api.routePath);
+    const normalizedAuth = api.auth === 0 || api.auth === false ? 0 : 1;
+    const normalizedApi = {
+      name: api.name,
+      routePath: api.routePath,
+      addonName: api.addonName,
+      auth: normalizedAuth
+    };
+    const routePath = normalizedApi.routePath;
+    apiRouteKeys.add(routePath);
     const item = allDbApiMap[routePath];
     if (item) {
-      const shouldUpdate = api.name !== item.name || api.routePath !== item.routePath || api.addonName !== item.addonName;
+      const dbAuth = item.auth === 0 || item.auth === false ? 0 : 1;
+      const shouldUpdate = normalizedApi.name !== item.name || normalizedApi.routePath !== item.routePath || normalizedApi.addonName !== item.addonName || normalizedAuth !== dbAuth;
       if (shouldUpdate) {
-        updData.push({ id: item.id, api });
+        updData.push({ id: item.id, api: normalizedApi });
       }
     } else {
-      insData.push(api);
+      insData.push(normalizedApi);
     }
   }
   for (const record of dbLists) {
@@ -8890,7 +8844,8 @@ async function syncApi(ctx, apis) {
           data: {
             name: item.api.name,
             routePath: item.api.routePath,
-            addonName: item.api.addonName
+            addonName: item.api.addonName,
+            auth: item.api.auth === 0 || item.api.auth === false ? 0 : 1
           }
         };
       }));
@@ -8904,7 +8859,8 @@ async function syncApi(ctx, apis) {
         return {
           name: api.name,
           routePath: api.routePath,
-          addonName: api.addonName
+          addonName: api.addonName,
+          auth: api.auth === 0 || api.auth === false ? 0 : 1
         };
       }));
     } catch (error) {
@@ -12127,7 +12083,6 @@ class XMLParser {
 }
 
 // hooks/parser.ts
-init_util();
 var xmlParser = new XMLParser;
 var parserHook = {
   name: "parser",
@@ -12143,11 +12098,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 +12107,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 +12269,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 +12442,7 @@ class Validator {
 }
 
 // hooks/validator.ts
+init_util();
 var validatorHook = {
   name: "validator",
   enable: true,
@@ -12509,10 +12453,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) {
@@ -15120,8 +15079,9 @@ function scanCoreBuiltinHooks() {
 
 // utils/scanFiles.ts
 init_dist();
-import { existsSync as existsSync4 } from "fs";
+init_importDefault();
 init_util();
+import { existsSync as existsSync4 } from "fs";
 function parseAddonNameFromPath(normalizedPath) {
   const parts = normalizedPath.split("/").filter(Boolean);
   const idx = parts.indexOf("@befly-addon");