befly 3.10.19 → 3.11.1

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/dist/utils/{processFields.js → processAtSymbol.js}

@@ -1,8 +1,8 @@
-import { presetFields } from "../configs/presetFields.js";
+import { presetFields } from "../configs/presetFields";
 /**
  * 处理字段定义：将 @ 符号引用替换为实际字段定义
  */
-export function processFields(fields, apiName, routePath) {
+export function processAtSymbol(fields, apiName, routePath) {
     if (!fields || typeof fields !== "object")
         return fields;
     const processed = {};

package/dist/utils/response.d.ts

@@ -1,4 +1,4 @@
-import type { RequestContext } from "../types/context.ts";
+import type { RequestContext } from "../types/context";
 /**
  * 创建错误响应（专用于 Hook 中间件）
  * 在钩子中提前拦截请求时使用

package/dist/utils/response.js

@@ -1,4 +1,4 @@
-import { Logger } from "../lib/logger.js";
+import { Logger } from "../lib/logger";
 /**
  * 创建错误响应（专用于 Hook 中间件）
  * 在钩子中提前拦截请求时使用

package/dist/utils/scanAddons.js

@@ -1,8 +1,8 @@
 import { existsSync, readdirSync } from "node:fs";
-import { camelCase } from "es-toolkit/string";
 import { join, resolve } from "pathe";
-import { appAddonsDir, appDir } from "../paths.js";
-import { isDirentDirectory } from "./isDirentDirectory.js";
+import { appAddonsDir, appDir } from "../paths";
+import { isDirentDirectory } from "./isDirentDirectory";
+import { camelCase } from "./util";
 /** 扫描 node_modules/@befly-addon + 项目 addons/（项目优先级更高） */
 export const scanAddons = () => {
     const addonMap = new Map();

package/dist/utils/scanConfig.js

@@ -9,9 +9,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 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";
+import { mergeAndConcat } from "./mergeAndConcat";
+import { getByPath, isPlainObject, setByPath } from "./util";
 /**
  * 扫描并合并配置文件（矩阵搜索：dirs × files）
  * @param options - 加载选项
@@ -68,9 +67,9 @@ export async function scanConfig(options) {
                             if (paths && paths.length > 0) {
                                 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;
@@ -94,9 +93,9 @@ export async function scanConfig(options) {
     if (paths && paths.length > 0) {
         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;

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.js

@@ -1,8 +1,7 @@
 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.js";
+import { importDefault } from "./importDefault";
+import { camelCase, forOwn } from "./util";
 function parseAddonNameFromPath(normalizedPath) {
     // 期望路径中包含：/node_modules/@befly-addon/<addonName>/...
     const parts = normalizedPath.split("/").filter(Boolean);
@@ -14,6 +13,18 @@ function parseAddonNameFromPath(normalizedPath) {
         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;
+    return addonName;
+}
 /**
  * 扫描指定目录下的文件
  * @param dir 目录路径
@@ -55,13 +66,15 @@ export async function scanFiles(dir, source, type, pattern) {
             let addonName = "";
             let moduleName = "";
             if (source === "core") {
-                moduleName = baseName;
+                // core：不做任何命名转换，直接使用文件名作为 moduleName（例如 auth / rate_limit）。
+                addonName = "";
+                moduleName = fileName;
             }
             else if (source === "app") {
                 moduleName = `app_${baseName}`;
             }
             else {
-                const parsedAddonName = parseAddonNameFromPath(normalizedFile);
+                const parsedAddonName = parseAddonNameFromPath(normalizedFile) || parseLocalAddonNameFromPath(normalizedFile);
                 if (!parsedAddonName) {
                     throw new Error(`scanFiles addon moduleName 解析失败：未找到 @befly-addon/<addon>/ 段落：${normalizedFile}`);
                 }
@@ -101,7 +114,7 @@ export async function scanFiles(dir, source, type, pattern) {
                 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);

package/dist/utils/scanSources.d.ts

@@ -1,5 +1,5 @@
-import type { AddonInfo } from "./scanAddons.ts";
-import type { ScanFileResult } from "./scanFiles.ts";
+import type { AddonInfo } from "./scanAddons";
+import type { ScanFileResult } from "./scanFiles";
 export type ScanSourcesResult = {
     hooks: ScanFileResult[];
     plugins: ScanFileResult[];

package/dist/utils/scanSources.js

@@ -1,7 +1,8 @@
 import { join } from "pathe";
-import { coreDistDir, appDir } from "../paths.js";
-import { scanAddons } from "./scanAddons.js";
-import { scanFiles } from "./scanFiles.js";
+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 = [];
@@ -14,23 +15,27 @@ export const scanSources = async () => {
         tables.push(...(await scanFiles(join(addon.fullPath, "tables"), "addon", "table", "*.json")));
     }
     // 处理插件
-    plugins.push(...(await scanFiles(join(coreDistDir, "plugins"), "core", "plugin", "*.js")));
+    // 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}")));
     }
-    // 处理接口
-    apis.push(...(await scanFiles(join(coreDistDir, "apis"), "core", "api", "**/*.js")));
-    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}")));
-    }
     // 处理钩子
-    hooks.push(...(await scanFiles(join(coreDistDir, "hooks"), "core", "hook", "*.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,

package/dist/utils/sortModules.js

@@ -1,5 +1,5 @@
-import { camelCase } from "es-toolkit/string";
-import { Logger } from "../lib/logger.js";
+import { Logger } from "../lib/logger";
+import { camelCase } from "./util";
 /**
  * 按 deps 拓扑排序 scanSources 扫描得到的插件/钩子。
  *

package/dist/utils/util.d.ts

@@ -0,0 +1,84 @@
+/**
+ * 注意：本文件用于集中维护 core 内部通用 utils。
+ * - 按项目规范：避免零散小文件噪音；实现集中在本文件，而不是做 re-export 聚合。
+ * - 仅在 packages/core 内部使用；core 对外不承诺这些路径导出。
+ */
+export declare function isPlainObject(value: unknown): value is Record<string, any>;
+/**
+ * 激进空值判断（项目约定）：
+ * - null/undefined => empty
+ * - "" / 全空白字符串 => empty
+ * - 0 / NaN => empty
+ * - false => empty
+ * - Array => length === 0
+ * - Map/Set => size === 0
+ * - plain object => 无自有 key
+ * - 其他类型 => false
+ */
+export declare function isEmpty(value: unknown): boolean;
+export declare function forOwn(obj: unknown, iteratee: (value: any, key: string) => void): void;
+/**
+ * 把字符串转为小驼峰。
+ * - 主要用于文件名/目录名（例如 my_plugin / my-plugin / my plugin）。
+ */
+export declare function camelCase(input: string): string;
+/**
+ * 把字符串转为 snake_case。
+ * - 主要用于表名/字段名（例如 userId -> user_id）。
+ */
+export declare function snakeCase(input: string): string;
+/**
+ * 对象字段名转小驼峰
+ * @param obj - 源对象
+ * @returns 字段名转为小驼峰格式的新对象
+ *
+ * @example
+ * keysToCamel({ user_id: 123, user_name: 'John' }) // { userId: 123, userName: 'John' }
+ * keysToCamel({ created_at: 1697452800000 }) // { createdAt: 1697452800000 }
+ */
+export declare const keysToCamel: <T = any>(obj: Record<string, any>) => T;
+/**
+ * 对象字段名转下划线
+ * @param obj - 源对象
+ * @returns 字段名转为下划线格式的新对象
+ *
+ * @example
+ * keysToSnake({ userId: 123, userName: 'John' }) // { user_id: 123, user_name: 'John' }
+ * keysToSnake({ createdAt: 1697452800000 }) // { created_at: 1697452800000 }
+ */
+export declare const keysToSnake: <T = any>(obj: Record<string, any>) => T;
+/**
+ * 数组对象字段名批量转小驼峰
+ * @param arr - 源数组
+ * @returns 字段名转为小驼峰格式的新数组
+ *
+ * @example
+ * arrayKeysToCamel([
+ *   { user_id: 1, user_name: 'John' },
+ *   { user_id: 2, user_name: 'Jane' }
+ * ])
+ * // [{ userId: 1, userName: 'John' }, { userId: 2, userName: 'Jane' }]
+ */
+export declare const arrayKeysToCamel: <T = any>(arr: Record<string, any>[]) => T[];
+export declare function getByPath(obj: unknown, path: string): unknown;
+export declare function setByPath(target: Record<string, any>, path: string, value: unknown): void;
+/**
+ * 返回一个移除指定 key 的浅拷贝。
+ * - 仅处理 plain object；其他类型返回空对象，避免日志场景抛错。
+ */
+export declare function omit<T extends Record<string, any>>(obj: unknown, keys: string[]): Partial<T>;
+/**
+ * 挑选指定字段
+ */
+export declare const pickFields: <T extends Record<string, any>>(obj: T, keys: string[]) => Partial<T>;
+export declare function keyBy<T>(items: T[], getKey: (item: T) => string): Record<string, T>;
+/**
+ * 生成短 ID
+ * 由时间戳（base36）+ 随机字符组成，约 13 位
+ * - 前 8 位：时间戳（可排序）
+ * - 后 5 位：随机字符（防冲突）
+ * @returns 短 ID 字符串
+ * @example
+ * genShortId() // "lxyz1a2b3c4"
+ */
+export declare function genShortId(): string;