befly 3.10.18 → 3.11.1

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

@@ -1,49 +1,25 @@
+var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
+    }
+    return path;
+};
 import { existsSync } from "node:fs";
 import { isAbsolute, join } from "node:path";
 import { pathToFileURL } from "node:url";
-
-import { isPlainObject } from "es-toolkit";
-import { get, set } from "es-toolkit/compat";
-import { mergeAndConcat } from "merge-anything";
-
-/**
- * 加载配置选项
- * - 该类型为 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>;
-}
-
+import { mergeAndConcat } from "./mergeAndConcat";
+import { getByPath, isPlainObject, setByPath } from "./util";
 /**
  * 扫描并合并配置文件（矩阵搜索：dirs × files）
  * @param options - 加载选项
  * @returns 合并后的配置对象（或第一个找到的配置）
  */
-export async function scanConfig(options: LoadConfigOptions): Promise<Record<string, any>> {
-    const {
-        //
-        cwd = process.cwd(),
-        dirs,
-        files,
-        extensions = [".ts", ".ts", ".json"],
-        mode = "first",
-        paths,
-        defaults = {}
-    } = options;
-
+export async function scanConfig(options) {
+    const { 
+    //
+    cwd = process.cwd(), dirs, files, extensions = [".ts", ".js", ".json"], mode = "first", paths, defaults = {} } = options;
     // 参数验证
     if (!Array.isArray(dirs) || dirs.length === 0) {
         throw new Error("dirs 必须是非空数组");
@@ -51,92 +27,78 @@ export async function scanConfig(options: LoadConfigOptions): Promise<Record<str
     if (!Array.isArray(files) || files.length === 0) {
         throw new Error("files 必须是非空数组");
     }
-
-    const configs: Record<string, any>[] = [];
-
+    const configs = [];
     // 矩阵搜索：dirs × files × extensions
     for (const dir of dirs) {
         // 如果是绝对路径则直接使用，否则拼接 cwd
         const fullDir = isAbsolute(dir) ? dir : join(cwd, dir);
-
         for (const file of files) {
             for (const ext of extensions) {
                 const fileName = file.endsWith(ext) ? file : file + ext;
                 const filePath = join(fullDir, fileName);
-
                 if (existsSync(filePath)) {
                     try {
                         const importUrl = pathToFileURL(filePath).href + `?t=${Date.now()}`;
-
                         // 动态导入配置文件（使用 import 断言处理 JSON）
-                        let data: any;
-
+                        let data;
                         if (ext === ".json") {
                             // JSON 文件使用 import 断言
-                            const module = await import(importUrl, { with: { type: "json" } });
+                            const module = await import(__rewriteRelativeImportExtension(importUrl), { with: { type: "json" } });
                             data = module.default;
-                        } else {
+                        }
+                        else {
                             // JS/TS 文件使用动态导入
-                            const module = await import(importUrl);
+                            const module = await import(__rewriteRelativeImportExtension(importUrl));
                             data = module.default || module;
-
                             // 处理 async 函数导出（如 defineAddonConfig）
                             if (data instanceof Promise) {
                                 data = await data;
                             }
                         }
-
                         // 验证配置数据
                         if (!isPlainObject(data)) {
                             continue;
                         }
-
                         configs.push(data);
-
                         // 如果模式为 'first'，找到第一个配置后立即返回
                         if (mode === "first") {
                             const firstConfig = mergeAndConcat(defaults, data);
-
                             // 如果指定了 paths，则只返回指定路径的字段
                             if (paths && paths.length > 0) {
-                                const result: Record<string, any> = {};
+                                const result = {};
                                 for (const path of paths) {
-                                    const value = get(firstConfig, path);
+                                    const value = getByPath(firstConfig, path);
                                     if (value !== undefined) {
-                                        set(result, path, value);
+                                        setByPath(result, path, value);
                                     }
                                 }
                                 return result;
                             }
-
                             return firstConfig;
                         }
-
                         // 找到后跳过同名文件的其他扩展名
                         break;
-                    } catch {
+                    }
+                    catch {
                         // 保持静默：继续尝试下一个候选配置文件
                     }
                 }
             }
         }
     }
-
     // 合并配置（使用 mergeAndConcat 深度合并）
     // 合并顺序：defaults ← configs[0] ← configs[1] ← ...
     const finalConfig = mergeAndConcat(defaults, ...configs);
-
     // 如果指定了 paths，则只返回指定路径的字段
     if (paths && paths.length > 0) {
-        const result: Record<string, any> = {};
+        const result = {};
         for (const path of paths) {
-            const value = get(finalConfig, path);
+            const value = getByPath(finalConfig, path);
             if (value !== undefined) {
-                set(result, path, value);
+                setByPath(result, path, value);
             }
         }
         return result;
     }
-
     return finalConfig;
 }

package/dist/utils/scanCoreBuiltins.d.ts

@@ -0,0 +1,3 @@
+import type { ScanFileResult } from "./scanFiles";
+export declare function scanCoreBuiltinPlugins(): ScanFileResult[];
+export declare function scanCoreBuiltinHooks(): ScanFileResult[];

package/dist/utils/scanCoreBuiltins.js

@@ -0,0 +1,65 @@
+import coreHookAuth from "../hooks/auth";
+import coreHookCors from "../hooks/cors";
+import coreHookParser from "../hooks/parser";
+import coreHookPermission from "../hooks/permission";
+import coreHookValidator from "../hooks/validator";
+import corePluginCache from "../plugins/cache";
+import corePluginCipher from "../plugins/cipher";
+import corePluginConfig from "../plugins/config";
+import corePluginDb from "../plugins/db";
+import corePluginJwt from "../plugins/jwt";
+import corePluginLogger from "../plugins/logger";
+import corePluginRedis from "../plugins/redis";
+import corePluginTool from "../plugins/tool";
+function toCoreBuiltinScanFileResult(type, item) {
+    const name = item.name;
+    return {
+        source: "core",
+        type: type,
+        sourceName: "核心",
+        filePath: `core:${type}:${name}`,
+        relativePath: name,
+        fileName: name,
+        moduleName: name,
+        addonName: "",
+        fileBaseName: name,
+        fileDir: "(builtin)",
+        name: name,
+        enable: item ? item.enable : undefined,
+        deps: Array.isArray(item && item.deps) ? item.deps : [],
+        handler: item ? item.handler : null
+    };
+}
+export function scanCoreBuiltinPlugins() {
+    const plugins = [];
+    const builtinPlugins = [
+        //
+        corePluginLogger,
+        corePluginRedis,
+        corePluginDb,
+        corePluginCache,
+        corePluginTool,
+        corePluginCipher,
+        corePluginJwt,
+        corePluginConfig
+    ];
+    for (const plugin of builtinPlugins) {
+        plugins.push(toCoreBuiltinScanFileResult("plugin", plugin));
+    }
+    return plugins;
+}
+export function scanCoreBuiltinHooks() {
+    const hooks = [];
+    const builtinHooks = [
+        //
+        coreHookAuth,
+        coreHookCors,
+        coreHookParser,
+        coreHookValidator,
+        coreHookPermission
+    ];
+    for (const hook of builtinHooks) {
+        hooks.push(toCoreBuiltinScanFileResult("hook", hook));
+    }
+    return hooks;
+}

package/dist/utils/scanFiles.d.ts

@@ -0,0 +1,30 @@
+export type ScanFileSource = "app" | "addon" | "core";
+export type ScanFileType = "api" | "table" | "plugin" | "hook";
+export interface ScanFileResultBase {
+    source: ScanFileSource;
+    type: ScanFileType;
+    sourceName: string;
+    filePath: string;
+    relativePath: string;
+    fileName: string;
+    /** 模块名（用于 deps 依赖图 key 与运行时挂载 key） */
+    moduleName: string;
+    /** addon 名：addon 来源为真实值；core/app 统一为空字符串（""） */
+    addonName: string;
+    fileBaseName: string;
+    fileDir: string;
+}
+export type ScanFileResult = (ScanFileResultBase & {
+    type: "table";
+    content: any;
+}) | (ScanFileResultBase & {
+    type: Exclude<ScanFileType, "table">;
+} & Record<string, any>);
+/**
+ * 扫描指定目录下的文件
+ * @param dir 目录路径
+ * @param source 文件来源（app/addon/core）
+ * @param type 文件类型（api/table/plugin/hook）
+ * @param pattern Glob模式
+ */
+export declare function scanFiles(dir: string, source: ScanFileSource, type: ScanFileType, pattern: string): Promise<ScanFileResult[]>;

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

@@ -1,52 +1,30 @@
 import { existsSync } from "node:fs";
-
-import { forOwn } from "es-toolkit/compat";
-import { camelCase } from "es-toolkit/string";
 import { relative, normalize, parse, join } from "pathe";
-
-import { importDefault } from "./importDefault.ts";
-
-export type ScanFileSource = "app" | "addon" | "core";
-
-export type ScanFileType = "api" | "table" | "plugin" | "hook";
-
-export interface ScanFileResultBase {
-    source: ScanFileSource; // 文件来源
-    type: ScanFileType; // 文件类型（api/table/plugin/hook）
-    sourceName: string; // 来源名称（用于日志展示）
-    filePath: string; // 绝对路径
-    relativePath: string; // 相对路径（无扩展名）
-    fileName: string; // 文件名（无扩展名）
-
-    /** 模块名（用于 deps 依赖图 key 与运行时挂载 key） */
-    moduleName: string;
-
-    /** addon 名：addon 来源为真实值；core/app 统一为空字符串（""） */
-    addonName: string;
-
-    fileBaseName: string;
-    fileDir: string;
-}
-
-export type ScanFileResult =
-    | (ScanFileResultBase & {
-          type: "table";
-          content: any;
-      })
-    | (ScanFileResultBase & {
-          type: Exclude<ScanFileType, "table">;
-      } & Record<string, any>);
-
-function parseAddonNameFromPath(normalizedPath: string): string | null {
+import { importDefault } from "./importDefault";
+import { camelCase, forOwn } from "./util";
+function parseAddonNameFromPath(normalizedPath) {
     // 期望路径中包含：/node_modules/@befly-addon/<addonName>/...
     const parts = normalizedPath.split("/").filter(Boolean);
     const idx = parts.indexOf("@befly-addon");
-    if (idx < 0) return null;
+    if (idx < 0)
+        return null;
+    const addonName = parts[idx + 1];
+    if (typeof addonName !== "string" || addonName.trim() === "")
+        return null;
+    return addonName;
+}
+function parseLocalAddonNameFromPath(normalizedPath) {
+    // 兼容项目本地 addons：/addons/<addonName>/...
+    // 注意：normalizedPath 已通过 pathe.normalize 统一为 /
+    const parts = normalizedPath.split("/").filter(Boolean);
+    const idx = parts.lastIndexOf("addons");
+    if (idx < 0)
+        return null;
     const addonName = parts[idx + 1];
-    if (typeof addonName !== "string" || addonName.trim() === "") return null;
+    if (typeof addonName !== "string" || addonName.trim() === "")
+        return null;
     return addonName;
 }
-
 /**
  * 扫描指定目录下的文件
  * @param dir 目录路径
@@ -54,13 +32,12 @@ function parseAddonNameFromPath(normalizedPath: string): string | null {
  * @param type 文件类型（api/table/plugin/hook）
  * @param pattern Glob模式
  */
-export async function scanFiles(dir: string, source: ScanFileSource, type: ScanFileType, pattern: string): Promise<ScanFileResult[]> {
-    if (!existsSync(dir)) return [];
-
+export async function scanFiles(dir, source, type, pattern) {
+    if (!existsSync(dir))
+        return [];
     const normalizedDir = normalize(dir);
     const glob = new Bun.Glob(pattern);
-    const results: ScanFileResult[] = [];
-
+    const results = [];
     try {
         const files = await glob.scan({
             cwd: dir,
@@ -68,44 +45,43 @@ export async function scanFiles(dir: string, source: ScanFileSource, type: ScanF
             absolute: true,
             followSymlinks: true
         });
-
         for await (const file of files) {
-            if (file.endsWith(".d.ts")) continue;
-
+            if (file.endsWith(".d.ts"))
+                continue;
             // 使用 pathe.normalize 统一路径分隔符为 /
             const normalizedFile = normalize(file);
-
             // 获取文件名（去除扩展名）
             const fileName = parse(normalizedFile).name;
-
             // 计算相对路径（去除扩展名）
             const relativePathWithExt = relative(normalizedDir, normalizedFile);
             const parsedRelativePath = parse(relativePathWithExt);
             const relativePath = parsedRelativePath.dir ? join(parsedRelativePath.dir, parsedRelativePath.name) : parsedRelativePath.name;
-
             // 固定默认过滤（不可关闭）：忽略下划线开头的文件/目录
-            if (fileName.startsWith("_")) continue;
-            if (relativePath.split("/").some((part) => part.startsWith("_"))) continue;
+            if (fileName.startsWith("_"))
+                continue;
+            if (relativePath.split("/").some((part) => part.startsWith("_")))
+                continue;
             const content = await importDefault(normalizedFile, {});
-
             const baseName = camelCase(fileName);
             let addonName = "";
             let moduleName = "";
-
             if (source === "core") {
-                moduleName = baseName;
-            } else if (source === "app") {
+                // core：不做任何命名转换，直接使用文件名作为 moduleName（例如 auth / rate_limit）。
+                addonName = "";
+                moduleName = fileName;
+            }
+            else if (source === "app") {
                 moduleName = `app_${baseName}`;
-            } else {
-                const parsedAddonName = parseAddonNameFromPath(normalizedFile);
+            }
+            else {
+                const parsedAddonName = parseAddonNameFromPath(normalizedFile) || parseLocalAddonNameFromPath(normalizedFile);
                 if (!parsedAddonName) {
                     throw new Error(`scanFiles addon moduleName 解析失败：未找到 @befly-addon/<addon>/ 段落：${normalizedFile}`);
                 }
                 addonName = parsedAddonName;
                 moduleName = `addon_${camelCase(addonName)}_${baseName}`;
             }
-
-            const base: Record<string, any> = {
+            const base = {
                 source: source,
                 type: type,
                 sourceName: { core: "核心", addon: "组件", app: "项目" }[source],
@@ -117,10 +93,9 @@ export async function scanFiles(dir: string, source: ScanFileSource, type: ScanF
                 fileBaseName: parse(normalizedFile).base,
                 fileDir: dir
             };
-
             if (type === "table") {
                 base.content = content;
-                results.push(base as ScanFileResult);
+                results.push(base);
                 continue;
             }
             if (type === "api") {
@@ -135,21 +110,19 @@ export async function scanFiles(dir: string, source: ScanFileSource, type: ScanF
                 base.name = "";
                 base.handler = null;
             }
-
             forOwn(content, (value, key) => {
                 base[key] = value;
             });
-
             if (type === "api") {
-                base.routePrefix = source === "core" ? "/core" : source === "app" ? "/app" : `/addon/${addonName}`;
+                base.routePrefix = source === "app" ? "/app" : `/addon/${addonName}`;
                 base.routePath = `/api${base.routePrefix}/${relativePath}`;
             }
-
-            results.push(base as ScanFileResult);
+            results.push(base);
         }
-    } catch (error: any) {
+    }
+    catch (error) {
         const wrappedError = new Error(`scanFiles failed: source=${source} type=${type} dir=${normalizedDir} pattern=${pattern}`);
-        (wrappedError as any).cause = error;
+        wrappedError.cause = error;
         throw wrappedError;
     }
     return results;

package/dist/utils/scanSources.d.ts

@@ -0,0 +1,10 @@
+import type { AddonInfo } from "./scanAddons";
+import type { ScanFileResult } from "./scanFiles";
+export type ScanSourcesResult = {
+    hooks: ScanFileResult[];
+    plugins: ScanFileResult[];
+    apis: ScanFileResult[];
+    tables: ScanFileResult[];
+    addons: AddonInfo[];
+};
+export declare const scanSources: () => Promise<ScanSourcesResult>;

package/dist/utils/scanSources.js

@@ -0,0 +1,46 @@
+import { join } from "pathe";
+import { appDir } from "../paths";
+import { scanAddons } from "./scanAddons";
+import { scanCoreBuiltinHooks, scanCoreBuiltinPlugins } from "./scanCoreBuiltins";
+import { scanFiles } from "./scanFiles";
+export const scanSources = async () => {
+    const apis = [];
+    const plugins = [];
+    const hooks = [];
+    const tables = [];
+    const addons = await scanAddons();
+    // 处理表格
+    tables.push(...(await scanFiles(join(appDir, "tables"), "app", "table", "*.json")));
+    for (const addon of addons) {
+        tables.push(...(await scanFiles(join(addon.fullPath, "tables"), "addon", "table", "*.json")));
+    }
+    // 处理插件
+    // core 内置插件：必须静态导入（支持 bun bundle 单文件）。
+    // 约束：core 插件名由 export default.name 指定。
+    plugins.push(...scanCoreBuiltinPlugins());
+    plugins.push(...(await scanFiles(join(appDir, "plugins"), "app", "plugin", "*.{ts,js}")));
+    for (const addon of addons) {
+        plugins.push(...(await scanFiles(join(addon.fullPath, "plugins"), "addon", "plugin", "*.{ts,js}")));
+    }
+    // 处理钩子
+    // core 内置钩子：必须静态导入（支持 bun bundle 单文件）。
+    // 约束：core 钩子名由 export default.name 指定。
+    hooks.push(...scanCoreBuiltinHooks());
+    hooks.push(...(await scanFiles(join(appDir, "hooks"), "app", "hook", "*.{ts,js}")));
+    for (const addon of addons) {
+        hooks.push(...(await scanFiles(join(addon.fullPath, "hooks"), "addon", "hook", "*.{ts,js}")));
+    }
+    // 处理接口
+    // 说明：core 没有内置 apis；接口只从「项目(app)」与「组件(addon)」中扫描加载。
+    apis.push(...(await scanFiles(join(appDir, "apis"), "app", "api", "**/*.{ts,js}")));
+    for (const addon of addons) {
+        apis.push(...(await scanFiles(join(addon.fullPath, "apis"), "addon", "api", "**/*.{ts,js}")));
+    }
+    return {
+        hooks: hooks,
+        plugins: plugins,
+        apis: apis,
+        tables: tables,
+        addons: addons
+    };
+};

package/dist/utils/sortModules.d.ts

@@ -0,0 +1,28 @@
+export type SortModulesByDepsOptions<T> = {
+    /**
+     * 用于日志的模块标签（如："插件"、"钩子"）
+     */
+    moduleLabel?: string;
+    /**
+     * 生成模块名（用于 deps 解析与排序 key）。
+     * 默认：camelCase(item.fileName)
+     */
+    getName?: (item: T) => string;
+    /**
+     * 获取 deps。
+     * 默认：item.deps
+     */
+    getDeps?: (item: T) => string[];
+};
+/**
+ * 按 deps 拓扑排序 scanSources 扫描得到的插件/钩子。
+ *
+ * 说明：
+ * - 输入为 scanSources/scanFiles 的条目数组：每个条目包含 fileName 与 deps。
+ * - deps 里的字符串会与 getName(item) 的结果匹配。
+ * - 若出现：重复 name、缺失依赖、循环依赖，则返回 false。
+ */
+export declare function sortModules<T extends {
+    fileName: string;
+    deps?: any;
+}>(items: T[], options?: SortModulesByDepsOptions<T>): T[] | false;