befly 3.9.38 → 3.9.40

package/tests/redisKeys.test.ts

@@ -1,76 +1,9 @@
 /**
- * RedisKeys 和 RedisTTL 测试
+ * 已弃用：原文件内容与 cacheKeys.test.ts 重复。
+ *
+ * 说明：
+ * - 优先保留并维护 cacheKeys.test.ts
+ * - 这里保留空文件仅为兼容历史文件名（避免某些工具/脚本引用路径时报错）
  */
 
-import { describe, expect, test } from 'bun:test';
-import { RedisKeys, RedisTTL } from 'befly-shared/redisKeys';
-
-describe('RedisKeys - Key 生成函数', () => {
-    test('apisAll - 返回固定的接口缓存键', () => {
-        expect(RedisKeys.apisAll()).toBe('befly:apis:all');
-    });
-
-    test('menusAll - 返回固定的菜单缓存键', () => {
-        expect(RedisKeys.menusAll()).toBe('befly:menus:all');
-    });
-
-    test('roleInfo - 返回带角色代码的缓存键', () => {
-        expect(RedisKeys.roleInfo('admin')).toBe('befly:role:info:admin');
-        expect(RedisKeys.roleInfo('user')).toBe('befly:role:info:user');
-    });
-
-    test('roleApis - 返回带角色代码的权限缓存键', () => {
-        expect(RedisKeys.roleApis('admin')).toBe('befly:role:apis:admin');
-        expect(RedisKeys.roleApis('guest')).toBe('befly:role:apis:guest');
-    });
-
-    test('tableColumns - 返回带表名的结构缓存键', () => {
-        expect(RedisKeys.tableColumns('user')).toBe('befly:table:columns:user');
-        expect(RedisKeys.tableColumns('addon_admin_role')).toBe('befly:table:columns:addon_admin_role');
-    });
-
-    test('roleInfo - 特殊字符处理', () => {
-        expect(RedisKeys.roleInfo('super-admin')).toBe('befly:role:info:super-admin');
-        expect(RedisKeys.roleInfo('role_1')).toBe('befly:role:info:role_1');
-    });
-
-    test('tableColumns - 空字符串', () => {
-        expect(RedisKeys.tableColumns('')).toBe('befly:table:columns:');
-    });
-});
-
-describe('RedisTTL - 过期时间常量', () => {
-    test('tableColumns - 1小时 (3600秒)', () => {
-        expect(RedisTTL.tableColumns).toBe(3600);
-    });
-
-    test('roleApis - 24小时 (86400秒)', () => {
-        expect(RedisTTL.roleApis).toBe(86400);
-    });
-
-    test('roleInfo - 24小时 (86400秒)', () => {
-        expect(RedisTTL.roleInfo).toBe(86400);
-    });
-
-    test('apisAll - 永久 (null)', () => {
-        expect(RedisTTL.apisAll).toBeNull();
-    });
-
-    test('menusAll - 永久 (null)', () => {
-        expect(RedisTTL.menusAll).toBeNull();
-    });
-
-    test('所有 TTL 值都是数字或 null', () => {
-        for (const [key, value] of Object.entries(RedisTTL)) {
-            expect(value === null || typeof value === 'number').toBe(true);
-        }
-    });
-
-    test('数字类型的 TTL 都是正数', () => {
-        for (const [key, value] of Object.entries(RedisTTL)) {
-            if (typeof value === 'number') {
-                expect(value).toBeGreaterThan(0);
-            }
-        }
-    });
-});
+export {};

package/tests/scanConfig.test.ts

@@ -0,0 +1,144 @@
+import { describe, expect, test, beforeAll, afterAll, beforeEach } from "bun:test";
+import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
+import { join } from "node:path";
+
+import { scanConfig } from "../utils/scanConfig";
+
+const tempRootDir = join(process.cwd(), "temp", "test-scan-config");
+
+function writeJson(filePath: string, data: Record<string, any>) {
+    const json = JSON.stringify(data, null, 4);
+    writeFileSync(filePath, json, { encoding: "utf8" });
+}
+
+function createCaseDirs(): { caseRootDir: string; dirA: string; dirB: string } {
+    const caseRootDir = join(tempRootDir, `case-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+    const dirA = join(caseRootDir, "a");
+    const dirB = join(caseRootDir, "b");
+
+    if (!existsSync(dirA)) {
+        mkdirSync(dirA, { recursive: true });
+    }
+    if (!existsSync(dirB)) {
+        mkdirSync(dirB, { recursive: true });
+    }
+
+    return {
+        caseRootDir: caseRootDir,
+        dirA: dirA,
+        dirB: dirB
+    };
+}
+
+afterAll(() => {
+    if (existsSync(tempRootDir)) {
+        rmSync(tempRootDir, { recursive: true, force: true });
+    }
+});
+
+describe("utils - scanConfig", () => {
+    beforeAll(() => {
+        if (!existsSync(tempRootDir)) {
+            mkdirSync(tempRootDir, { recursive: true });
+        }
+    });
+
+    beforeEach(() => {
+        // 无需清空：每个用例使用唯一目录，避免 import cache 干扰
+    });
+
+    test("mode=first：返回搜索到的第一个配置（按 dirs 顺序）", async () => {
+        const { caseRootDir, dirA, dirB } = createCaseDirs();
+
+        writeJson(join(dirA, "cfg.json"), {
+            foo: 1,
+            database: { host: "a" }
+        });
+        writeJson(join(dirB, "cfg.json"), {
+            foo: 2,
+            database: { host: "b" }
+        });
+
+        const config = await scanConfig({
+            cwd: caseRootDir,
+            dirs: ["a", "b"],
+            files: ["cfg"],
+            extensions: [".json"],
+            mode: "first"
+        });
+
+        expect(config).toEqual({
+            foo: 1,
+            database: { host: "a" }
+        });
+    });
+
+    test("mode=merge：按 defaults ← a ← b 合并（数组拼接，标量后者覆盖）", async () => {
+        const { caseRootDir, dirA, dirB } = createCaseDirs();
+
+        writeJson(join(dirA, "cfg.json"), {
+            foo: 1,
+            menus: ["a"],
+            database: { host: "a", port: 3306 },
+            nested: { a: 1 }
+        });
+        writeJson(join(dirB, "cfg.json"), {
+            foo: 2,
+            menus: ["b"],
+            database: { host: "b" },
+            nested: { b: 2 }
+        });
+
+        const config = await scanConfig({
+            cwd: caseRootDir,
+            dirs: ["a", "b"],
+            files: ["cfg"],
+            extensions: [".json"],
+            mode: "merge",
+            defaults: {
+                foo: 0,
+                menus: ["default"],
+                database: { host: "default", port: 1111 },
+                nested: { z: 9 }
+            }
+        });
+
+        // merge-anything 的 mergeAndConcat：数组拼接；对象深合并；标量后者覆盖
+        expect(config.foo).toBe(2);
+        expect(config.menus).toEqual(["default", "a", "b"]);
+        expect(config.database).toEqual({
+            host: "b",
+            port: 3306
+        });
+        expect(config.nested).toEqual({
+            z: 9,
+            a: 1,
+            b: 2
+        });
+    });
+
+    test("paths：只返回指定路径字段", async () => {
+        const { caseRootDir, dirA } = createCaseDirs();
+
+        writeJson(join(dirA, "cfg.json"), {
+            foo: 1,
+            menus: ["a"],
+            database: { host: "a", port: 3306 },
+            secret: "should-not-return"
+        });
+
+        const config = await scanConfig({
+            cwd: caseRootDir,
+            dirs: ["a"],
+            files: ["cfg"],
+            extensions: [".json"],
+            mode: "first",
+            paths: ["menus", "database.host", "not.exists"]
+        });
+
+        expect(config).toEqual({
+            menus: ["a"],
+            database: { host: "a" }
+        });
+    });
+});