befly 3.10.18 → 3.11.1

package/{utils/loadMenuConfigs.ts → dist/utils/loadMenuConfigs.js}

@@ -1,90 +1,110 @@
-import type { MenuConfig } from "../types/sync.ts";
-import type { AddonInfo } from "./scanAddons.ts";
-import type { ViewDirMeta } from "befly-shared/utils/scanViewsDir";
-
 import { existsSync } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
-
-import { cleanDirName, extractDefinePageMetaFromScriptSetup, extractScriptSetupBlock } from "befly-shared/utils/scanViewsDir";
 import { join } from "pathe";
-
-import { Logger } from "../lib/logger.ts";
-import { isDirentDirectory } from "./isDirentDirectory.ts";
-
-export async function scanViewsDirToMenuConfigs(viewsDir: string, prefix: string, parentPath: string = ""): Promise<MenuConfig[]> {
+import { Logger } from "../lib/logger";
+import { isDirentDirectory } from "./isDirentDirectory";
+/**
+ * 清理目录名中的数字后缀
+ * 如：login_1 → login, index_2 → index
+ */
+export function cleanDirName(name) {
+    return String(name).replace(/_\d+$/, "");
+}
+/**
+ * 只取第一个 <script ... setup ...> 块
+ */
+export 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) {
+        return null;
+    }
+    return vueContent.slice(start, closeIndex);
+}
+/**
+ * 从 <script setup> 中提取 definePage({ meta })
+ *
+ * 简化约束：
+ * - 每个页面只有一个 definePage
+ * - title 是纯字符串字面量
+ * - order 是数字字面量（可选）
+ * - 不考虑变量/表达式/多段 meta 组合
+ */
+export function extractDefinePageMetaFromScriptSetup(scriptSetup) {
+    const titleMatch = scriptSetup.match(/definePage\s*\([\s\S]*?meta\s*:\s*\{[\s\S]*?title\s*:\s*(["'`])([^"'`]+)\1/);
+    if (!titleMatch) {
+        return null;
+    }
+    const orderMatch = scriptSetup.match(/definePage\s*\([\s\S]*?meta\s*:\s*\{[\s\S]*?order\s*:\s*(\d+)/);
+    return {
+        title: titleMatch[2],
+        order: orderMatch ? Number(orderMatch[1]) : undefined
+    };
+}
+export async function scanViewsDirToMenuConfigs(viewsDir, prefix, parentPath = "") {
     if (!existsSync(viewsDir)) {
         return [];
     }
-
-    const menus: MenuConfig[] = [];
+    const menus = [];
     const entries = await readdir(viewsDir, { withFileTypes: true });
-
     for (const entry of entries) {
         if (!isDirentDirectory(viewsDir, entry) || entry.name === "components") {
             continue;
         }
-
         const dirPath = join(viewsDir, entry.name);
         const indexVuePath = join(dirPath, "index.vue");
-
         if (!existsSync(indexVuePath)) {
             continue;
         }
-
-        let meta: ViewDirMeta | null = null;
+        let meta = null;
         try {
             const content = await readFile(indexVuePath, "utf-8");
-
             const scriptSetup = extractScriptSetupBlock(content);
             if (!scriptSetup) {
                 Logger.warn({ path: indexVuePath }, "index.vue 缺少 <script setup>，已跳过该目录菜单同步");
                 continue;
             }
-
             meta = extractDefinePageMetaFromScriptSetup(scriptSetup);
             if (!meta?.title) {
                 Logger.warn({ path: indexVuePath }, "index.vue 未声明 definePage({ meta: { title, order? } })，已跳过该目录菜单同步");
                 continue;
             }
-        } catch (error: any) {
+        }
+        catch (error) {
             Logger.warn({ err: error, path: indexVuePath }, "读取 index.vue 失败");
             continue;
         }
-
         if (!meta?.title) {
             continue;
         }
-
         const cleanName = cleanDirName(entry.name);
-        let menuPath: string;
+        let menuPath;
         if (cleanName === "index") {
             menuPath = parentPath;
-        } else {
+        }
+        else {
             menuPath = parentPath ? `${parentPath}/${cleanName}` : `/${cleanName}`;
         }
-
         const fullPath = prefix ? (menuPath ? `${prefix}${menuPath}` : prefix) : menuPath || "/";
-
-        const menu: MenuConfig = {
+        const menu = {
             name: meta.title,
             path: fullPath,
             sort: meta.order ?? 999999
         };
-
         const children = await scanViewsDirToMenuConfigs(dirPath, prefix, menuPath);
         if (children.length > 0) {
             menu.children = children;
         }
-
         menus.push(menu);
     }
-
     menus.sort((a, b) => (a.sort ?? 999999) - (b.sort ?? 999999));
-
     return menus;
 }
-
-export function getParentPath(path: string): string {
+export function getParentPath(path) {
     // "/a/b" => "/a"
     // "/a" => ""
     const parts = path.split("/").filter((p) => !!p);
@@ -93,10 +113,8 @@ export function getParentPath(path: string): string {
     }
     return `/${parts.slice(0, -1).join("/")}`;
 }
-
-export async function loadMenuConfigs(addons: AddonInfo[]): Promise<MenuConfig[]> {
-    const allMenus: MenuConfig[] = [];
-
+export async function loadMenuConfigs(addons) {
+    const allMenus = [];
     for (const addon of addons) {
         const adminViewsDirByTopLevel = join(addon.fullPath, "adminViews");
         const adminViewsDirByViews = join(addon.fullPath, "views", "admin");
@@ -104,7 +122,6 @@ export async function loadMenuConfigs(addons: AddonInfo[]): Promise<MenuConfig[]
         if (!adminViewsDir) {
             continue;
         }
-
         try {
             const prefix = `/${addon.source}/${addon.name}`;
             const menus = await scanViewsDirToMenuConfigs(adminViewsDir, prefix);
@@ -113,19 +130,16 @@ export async function loadMenuConfigs(addons: AddonInfo[]): Promise<MenuConfig[]
                     allMenus.push(menu);
                 }
             }
-        } catch (error: any) {
-            Logger.warn(
-                {
-                    err: error,
-                    addon: addon.name,
-                    addonSource: addon.source,
-                    dir: adminViewsDir
-                },
-                "扫描 addon views 目录失败"
-            );
+        }
+        catch (error) {
+            Logger.warn({
+                err: error,
+                addon: addon.name,
+                addonSource: addon.source,
+                dir: adminViewsDir
+            }, "扫描 addon views 目录失败");
         }
     }
-
     const menusJsonPath = join(process.cwd(), "menus.json");
     if (existsSync(menusJsonPath)) {
         try {
@@ -136,10 +150,10 @@ export async function loadMenuConfigs(addons: AddonInfo[]): Promise<MenuConfig[]
                     allMenus.push(menu);
                 }
             }
-        } catch (error: any) {
+        }
+        catch (error) {
             Logger.warn({ err: error }, "读取项目 menus.json 失败");
         }
     }
-
     return allMenus;
 }

package/dist/utils/mergeAndConcat.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 深度合并对象，并对数组执行 concat（保持 scanConfig 现有语义）。
+ * - undefined 会被忽略
+ * - plain object 深合并
+ * - array 与 array 合并为新数组（保持输入不被污染）
+ */
+export declare function mergeAndConcat(...items: any[]): any;

package/dist/utils/mergeAndConcat.js

@@ -0,0 +1,72 @@
+import { isPlainObject } from "./util";
+function cloneDeepLoose(value) {
+    if (Array.isArray(value)) {
+        const arr = [];
+        for (const item of value) {
+            arr.push(cloneDeepLoose(item));
+        }
+        return arr;
+    }
+    if (isPlainObject(value)) {
+        const out = {};
+        for (const key of Object.keys(value)) {
+            out[key] = cloneDeepLoose(value[key]);
+        }
+        return out;
+    }
+    return value;
+}
+function mergeInto(target, source) {
+    if (source === undefined) {
+        return target;
+    }
+    if (Array.isArray(target) && Array.isArray(source)) {
+        for (const item of source) {
+            target.push(cloneDeepLoose(item));
+        }
+        return target;
+    }
+    if (isPlainObject(target) && isPlainObject(source)) {
+        for (const key of Object.keys(source)) {
+            const srcVal = source[key];
+            if (srcVal === undefined) {
+                continue;
+            }
+            const curVal = target[key];
+            if (Array.isArray(curVal) && Array.isArray(srcVal)) {
+                const nextArr = [];
+                for (const item of curVal) {
+                    nextArr.push(cloneDeepLoose(item));
+                }
+                for (const item of srcVal) {
+                    nextArr.push(cloneDeepLoose(item));
+                }
+                target[key] = nextArr;
+                continue;
+            }
+            if (isPlainObject(curVal) && isPlainObject(srcVal)) {
+                target[key] = mergeInto(cloneDeepLoose(curVal), srcVal);
+                continue;
+            }
+            target[key] = cloneDeepLoose(srcVal);
+        }
+        return target;
+    }
+    return cloneDeepLoose(source);
+}
+/**
+ * 深度合并对象，并对数组执行 concat（保持 scanConfig 现有语义）。
+ * - undefined 会被忽略
+ * - plain object 深合并
+ * - array 与 array 合并为新数组（保持输入不被污染）
+ */
+export function mergeAndConcat(...items) {
+    let acc = {};
+    for (const item of items) {
+        if (item === undefined) {
+            continue;
+        }
+        acc = mergeInto(acc, item);
+    }
+    return acc;
+}

package/dist/utils/processAtSymbol.d.ts

@@ -0,0 +1,4 @@
+/**
+ * 处理字段定义：将 @ 符号引用替换为实际字段定义
+ */
+export declare function processAtSymbol(fields: Record<string, any>, apiName: string, routePath: string): Record<string, any>;

package/{utils/processFields.ts → dist/utils/processAtSymbol.js}

@@ -1,25 +1,21 @@
-import { presetFields } from "../configs/presetFields.ts";
-
+import { presetFields } from "../configs/presetFields";
 /**
  * 处理字段定义：将 @ 符号引用替换为实际字段定义
  */
-export function processFields(fields: Record<string, any>, apiName: string, routePath: string): Record<string, any> {
-    if (!fields || typeof fields !== "object") return fields;
-
-    const processed: Record<string, any> = {};
+export function processAtSymbol(fields, apiName, routePath) {
+    if (!fields || typeof fields !== "object")
+        return fields;
+    const processed = {};
     for (const [key, value] of Object.entries(fields)) {
         if (typeof value === "string" && value.startsWith("@")) {
             if (presetFields[value]) {
                 processed[key] = presetFields[value];
                 continue;
             }
-
             const validKeys = Object.keys(presetFields).join(", ");
             throw new Error(`API [${apiName}] (${routePath}) 字段 [${key}] 引用了未定义的预设字段 "${value}"。可用的预设字段有: ${validKeys}`);
         }
-
         processed[key] = value;
     }
-
     return processed;
 }

package/dist/utils/processInfo.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 进程角色信息
+ */
+export interface ProcessRole {
+    /** 进程角色：primary（主进程）或 worker（工作进程） */
+    role: "primary" | "worker";
+    /** 实例 ID（PM2 或 Bun Worker） */
+    instanceId: string | null;
+    /** 运行环境：bun-cluster、pm2-cluster 或 standalone */
+    env: "bun-cluster" | "pm2-cluster" | "standalone";
+}
+/**
+ * 获取当前进程角色信息
+ * @returns 进程角色、实例 ID 和运行环境
+ */
+export declare function getProcessRole(): ProcessRole;
+/**
+ * 检测当前进程是否为主进程
+ * 用于集群模式下避免重复执行同步任务
+ * - Bun 集群：BUN_WORKER_ID 为空时是主进程
+ * - PM2 集群：PM2_INSTANCE_ID 为 '0' 或不存在时是主进程
+ * @returns 是否为主进程
+ */
+export declare function isPrimaryProcess(): boolean;

package/{utils/process.ts → dist/utils/processInfo.js}

@@ -1,23 +1,10 @@
-/**
- * 进程角色信息
- */
-export interface ProcessRole {
-    /** 进程角色：primary（主进程）或 worker（工作进程） */
-    role: "primary" | "worker";
-    /** 实例 ID（PM2 或 Bun Worker） */
-    instanceId: string | null;
-    /** 运行环境：bun-cluster、pm2-cluster 或 standalone */
-    env: "bun-cluster" | "pm2-cluster" | "standalone";
-}
-
 /**
  * 获取当前进程角色信息
  * @returns 进程角色、实例 ID 和运行环境
  */
-export function getProcessRole(): ProcessRole {
+export function getProcessRole() {
     const bunWorkerId = process.env.BUN_WORKER_ID;
     const pm2InstanceId = process.env.PM2_INSTANCE_ID;
-
     // Bun 集群模式
     if (bunWorkerId !== undefined) {
         return {
@@ -26,7 +13,6 @@ export function getProcessRole(): ProcessRole {
             env: "bun-cluster"
         };
     }
-
     // PM2 集群模式
     if (pm2InstanceId !== undefined) {
         return {
@@ -35,7 +21,6 @@ export function getProcessRole(): ProcessRole {
             env: "pm2-cluster"
         };
     }
-
     // 单进程模式
     return {
         role: "primary",
@@ -43,7 +28,6 @@ export function getProcessRole(): ProcessRole {
         env: "standalone"
     };
 }
-
 /**
  * 检测当前进程是否为主进程
  * 用于集群模式下避免重复执行同步任务
@@ -51,6 +35,6 @@ export function getProcessRole(): ProcessRole {
  * - PM2 集群：PM2_INSTANCE_ID 为 '0' 或不存在时是主进程
  * @returns 是否为主进程
  */
-export function isPrimaryProcess(): boolean {
+export function isPrimaryProcess() {
     return getProcessRole().role === "primary";
 }

package/dist/utils/response.d.ts

@@ -0,0 +1,20 @@
+import type { RequestContext } from "../types/context";
+/**
+ * 创建错误响应（专用于 Hook 中间件）
+ * 在钩子中提前拦截请求时使用
+ * @param ctx - 请求上下文
+ * @param msg - 错误消息
+ * @param code - 错误码，默认 1
+ * @param data - 附加数据，默认 null
+ * @param detail - 详细信息，用于标记具体提示位置，默认 null
+ * @param reasonCode - 拦截原因标识（用于统计/聚合），默认 null
+ * @returns Response 对象
+ */
+export declare function ErrorResponse(ctx: RequestContext, msg: string, code?: number, data?: any, detail?: any, reasonCode?: string | null): Response;
+/**
+ * 创建最终响应（专用于 API 路由结尾）
+ * 自动处理 ctx.response/ctx.result，并记录请求日志
+ * @param ctx - 请求上下文
+ * @returns Response 对象
+ */
+export declare function FinalResponse(ctx: RequestContext): Response;

package/{utils/response.ts → dist/utils/response.js}

@@ -1,7 +1,4 @@
-import type { RequestContext } from "../types/context.ts";
-
-import { Logger } from "../lib/logger.ts";
-
+import { Logger } from "../lib/logger";
 /**
  * 创建错误响应（专用于 Hook 中间件）
  * 在钩子中提前拦截请求时使用
@@ -13,62 +10,48 @@ import { Logger } from "../lib/logger.ts";
  * @param reasonCode - 拦截原因标识（用于统计/聚合），默认 null
  * @returns Response 对象
  */
-export function ErrorResponse(ctx: RequestContext, msg: string, code: number = 1, data: any = null, detail: any = null, reasonCode: string | null = null): Response {
+export function ErrorResponse(ctx, msg, code = 1, data = null, detail = null, reasonCode = null) {
     // 记录拦截日志
     if (ctx.requestId) {
         // requestId/route/user/duration 等字段由 ALS 统一注入，避免在 msg 中重复拼接
-        Logger.info(
-            {
-                event: "request_blocked",
-                reason: msg,
-                reasonCode: reasonCode,
-                code: code,
-                detail: detail
-            },
-            "request blocked"
-        );
-    }
-
-    return Response.json(
-        {
+        Logger.info({
+            event: "request_blocked",
+            reason: msg,
+            reasonCode: reasonCode,
             code: code,
-            msg: msg,
-            data: data,
             detail: detail
-        },
-        {
-            headers: ctx.corsHeaders
-        }
-    );
+        }, "request blocked");
+    }
+    return Response.json({
+        code: code,
+        msg: msg,
+        data: data,
+        detail: detail
+    }, {
+        headers: ctx.corsHeaders
+    });
 }
-
 /**
  * 创建最终响应（专用于 API 路由结尾）
  * 自动处理 ctx.response/ctx.result，并记录请求日志
  * @param ctx - 请求上下文
  * @returns Response 对象
  */
-export function FinalResponse(ctx: RequestContext): Response {
+export function FinalResponse(ctx) {
     // 记录请求日志
     if (ctx.api && ctx.requestId) {
         // requestId/route/user/duration 等字段由 ALS 统一注入，避免在 msg 中重复拼接
-        Logger.info(
-            {
-                event: "request_done"
-            },
-            "request done"
-        );
+        Logger.info({
+            event: "request_done"
+        }, "request done");
     }
-
     // 1. 如果已经有 response，直接返回
     if (ctx.response) {
         return ctx.response;
     }
-
     // 2. 如果有 result，格式化为响应
     if (ctx.result !== undefined) {
         let result = ctx.result;
-
         // 如果是字符串，自动包裹为成功响应
         if (typeof result === "string") {
             result = {
@@ -85,7 +68,6 @@ export function FinalResponse(ctx: RequestContext): Response {
                 };
             }
         }
-
         // 处理 BigInt 序列化问题
         if (result && typeof result === "object") {
             const jsonString = JSON.stringify(result, (key, value) => (typeof value === "bigint" ? value.toString() : value));
@@ -95,21 +77,18 @@ export function FinalResponse(ctx: RequestContext): Response {
                     "Content-Type": "application/json"
                 }
             });
-        } else {
+        }
+        else {
             return Response.json(result, {
                 headers: ctx.corsHeaders
             });
         }
     }
-
     // 3. 默认响应：没有生成响应
-    return Response.json(
-        {
-            code: 1,
-            msg: "未生成响应"
-        },
-        {
-            headers: ctx.corsHeaders
-        }
-    );
+    return Response.json({
+        code: 1,
+        msg: "未生成响应"
+    }, {
+        headers: ctx.corsHeaders
+    });
 }

package/dist/utils/scanAddons.d.ts

@@ -0,0 +1,17 @@
+export type AddonSource = "addon" | "app";
+export interface AddonInfo {
+    /** addon 来源 */
+    source: AddonSource;
+    /** addon 来源中文名 */
+    sourceName: string;
+    /** addon 名称（目录名，通常是 demo/admin 等） */
+    name: string;
+    /** camelCase(name) */
+    camelName: string;
+    /** addon 根目录绝对路径 */
+    rootDir: string;
+    /** 兼容字段：历史上使用 fullPath 表示 rootDir */
+    fullPath: string;
+}
+/** 扫描 node_modules/@befly-addon + 项目 addons/（项目优先级更高） */
+export declare const scanAddons: () => AddonInfo[];

package/{utils/scanAddons.ts → dist/utils/scanAddons.js}

@@ -1,55 +1,25 @@
 import { existsSync, readdirSync } from "node:fs";
-
-import { camelCase } from "es-toolkit/string";
 import { join, resolve } from "pathe";
-
-import { appAddonsDir, appDir } from "../paths.ts";
-import { isDirentDirectory } from "./isDirentDirectory.ts";
-
-export type AddonSource = "addon" | "app";
-
-export interface AddonInfo {
-    /** addon 来源 */
-    source: AddonSource;
-
-    /** addon 来源中文名 */
-    sourceName: string;
-
-    /** addon 名称（目录名，通常是 demo/admin 等） */
-    name: string;
-
-    /** camelCase(name) */
-    camelName: string;
-
-    /** addon 根目录绝对路径 */
-    rootDir: string;
-
-    /** 兼容字段：历史上使用 fullPath 表示 rootDir */
-    fullPath: string;
-}
-
+import { appAddonsDir, appDir } from "../paths";
+import { isDirentDirectory } from "./isDirentDirectory";
+import { camelCase } from "./util";
 /** 扫描 node_modules/@befly-addon + 项目 addons/（项目优先级更高） */
-export const scanAddons = (): AddonInfo[] => {
-    const addonMap = new Map<string, AddonInfo>();
-
-    const scanBaseDir = (baseDir: string, source: AddonSource, sourceName: string) => {
+export const scanAddons = () => {
+    const addonMap = new Map();
+    const scanBaseDir = (baseDir, source, sourceName) => {
         if (!existsSync(baseDir)) {
             return;
         }
-
         const entries = readdirSync(baseDir, { withFileTypes: true });
         for (const entry of entries) {
             if (entry.name.startsWith("_")) {
                 continue;
             }
-
             if (!isDirentDirectory(baseDir, entry)) {
                 continue;
             }
-
             const rootDir = resolve(baseDir, entry.name);
-
-            const info: AddonInfo = {
+            const info = {
                 source: source,
                 sourceName: sourceName,
                 name: entry.name,
@@ -57,16 +27,12 @@ export const scanAddons = (): AddonInfo[] => {
                 rootDir: rootDir,
                 fullPath: rootDir
             };
-
             addonMap.set(entry.name, info);
         }
     };
-
     // node_modules 中的 @befly-addon
     scanBaseDir(join(appDir, "node_modules", "@befly-addon"), "addon", "组件");
-
     // 项目本地 addons（同名覆盖 node_modules）
     scanBaseDir(appAddonsDir, "app", "项目");
-
     return Array.from(addonMap.values());
 };

package/dist/utils/scanConfig.d.ts

@@ -0,0 +1,26 @@
+/**
+ * 加载配置选项
+ * - 该类型为 scanConfig 专用：按“就近放置”原则直接与实现放在同文件，避免拆到单独的 *Types.ts 造成目录噪音。
+ */
+export interface LoadConfigOptions {
+    /** 当前工作目录，默认 process.cwd() */
+    cwd?: string;
+    /** 目录数组：要搜索的目录路径（相对于 cwd） */
+    dirs: string[];
+    /** 文件数组：要匹配的文件名 */
+    files: string[];
+    /** 文件扩展名，默认 ['.js', '.ts', '.json'] */
+    extensions?: string[];
+    /** 加载模式：'first' = 返回第一个找到的配置（默认），'merge' = 合并所有配置 */
+    mode?: "merge" | "first";
+    /** 指定要提取的字段路径数组，如 ['menus', 'database.host']，为空则返回完整对象 */
+    paths?: string[];
+    /** 默认配置，会与找到的配置合并（优先级最低） */
+    defaults?: Record<string, any>;
+}
+/**
+ * 扫描并合并配置文件（矩阵搜索：dirs × files）
+ * @param options - 加载选项
+ * @returns 合并后的配置对象（或第一个找到的配置）
+ */
+export declare function scanConfig(options: LoadConfigOptions): Promise<Record<string, any>>;