@oj-module/cli 0.2.56 → 0.2.57

package/templates/tests/lifecycle/role-title-translate.spec.ts

@@ -0,0 +1,171 @@
+// BDD：solution 角色 title 落库时同步翻译（R1–R6，计划 docs/plans/20261103-0948-role-title-translate）。
+// title = 解析文本（站点默认语言）、title_key = 原文（UI 实时翻译锚）；解析失败回退裸 key，
+// 绝不失败安装（R1）；升级元数据覆盖 = 重解析（R3）；迁移 0018 对存量 solution 角色回填、
+// builtin 不动（R2/AC4）；sys_permission 不变（R5）；name/code/绑定不变（R6）。
+/* eslint-disable test/prefer-lowercase-title -- AC 编号是验收锚点，保留大写（register.spec 同约定） */
+import { createRequire } from "node:module";
+import { fileURLToPath } from "node:url";
+import { afterEach, beforeAll, describe, expect, it } from "vitest";
+import { registerSolution, resolveDeclTitles, siteLanguage } from "../../src/app/api/_platform/_lifecycle/steps/register";
+import { installDb } from "../fixture";
+
+const req = createRequire(import.meta.url);
+const { DatabaseSync } = req("node:sqlite");
+const { readFileSync } = req("node:fs");
+const { dirname, join } = req("node:path");
+
+const HERE = dirname(fileURLToPath(import.meta.url));
+const enc = new TextEncoder();
+
+let dbo: ReturnType<typeof installDb>;
+const g = globalThis as any;
+
+beforeAll(() => {
+	dbo = installDb();
+	g.http = {};
+});
+
+afterEach(() => {
+	g.http = {};
+	dbo.exec("DELETE FROM sys_role_permission");
+	dbo.exec("DELETE FROM sys_user_role");
+	dbo.exec("DELETE FROM sys_permission");
+	dbo.exec("DELETE FROM sys_role");
+	dbo.exec("DELETE FROM sys_solution_route");
+	dbo.exec("DELETE FROM sys_setting");
+	dbo.exec("DELETE FROM sys_oplog");
+});
+
+function roleRows() {
+	return dbo.prepare("SELECT name, title, title_key FROM sys_role ORDER BY name").all() as Array<{ name: string, title: string | null, title_key: string | null }>;
+}
+
+/** readFile 假面：包内 locales 按路径精确映射，未命中即「文件不存在」 */
+function fakeReadFile(staging: string, files: Record<string, string>) {
+	return async (p: string) => {
+		const hit = files[p];
+		if (hit === undefined)
+			throw new Error(`ENOENT: ${p}`);
+		return enc.encode(hit);
+	};
+}
+
+const STAGING = "/staging";
+const PM_LOCALES = {
+	[`${STAGING}/web/modules/pm/locales/zh-CN.json`]: JSON.stringify({ role: { sales: "销售", admin: "方案管理员" } }),
+	[`${STAGING}/web/modules/pm/locales/en-US.json`]: JSON.stringify({ role: { sales: "Sales", admin: "Solution Admin" } }),
+};
+
+function pmDecl(title: string) {
+	return {
+		module: "pm",
+		version: "1.0.0",
+		roles: [{ name: "pm.sales", title, title_key: title, permissions: ["pm.doc.create"] as string[] }],
+		permissions: ["pm.doc.create"],
+	};
+}
+
+describe("R4 语言取值", () => {
+	it("缺省 zh-CN（sys_setting 无 site.language 行）", async () => {
+		expect(await siteLanguage()).toBe("zh-CN");
+	});
+
+	it("站点设置 site.language 生效（R4：站点默认语言）", async () => {
+		await g.db.table("sys_setting").insert({ key: "site.language", module: "framework", group: "site", type: "string", value: "en-US", update_time: Date.now(), deprecated: 0 }).run();
+		expect(await siteLanguage()).toBe("en-US");
+	});
+});
+
+describe("R1 注册时解析（resolveDeclTitles）", () => {
+	it("AC1 首装：title_key 解析为站点语言 locale 文本", async () => {
+		const resolved = await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", fakeReadFile(STAGING, PM_LOCALES));
+		expect(resolved.roles[0]!.title).toBe("销售");
+		expect(resolved.roles[0]!.title_key).toBe("pm:role.sales");
+	});
+
+	it("R4：语言参数决定读取的 locale 文件", async () => {
+		const resolved = await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "en-US", fakeReadFile(STAGING, PM_LOCALES));
+		expect(resolved.roles[0]!.title).toBe("Sales");
+	});
+
+	it("AC3 缺 key：保留裸 key（title 原样），绝不抛错", async () => {
+		const files = { [`${STAGING}/web/modules/pm/locales/zh-CN.json`]: JSON.stringify({ role: { sales: "销售" } }) };
+		const resolved = await resolveDeclTitles(pmDecl("pm:role.admin"), STAGING, "zh-CN", fakeReadFile(STAGING, files));
+		expect(resolved.roles[0]!.title).toBe("pm:role.admin");
+	});
+
+	it("R1 边界：locale 文件缺失 / 坏 JSON / 非 string 值 / 空 key 形状不符 → 原文保留", async () => {
+		const noFile = await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", fakeReadFile(STAGING, {}));
+		expect(noFile.roles[0]!.title).toBe("pm:role.sales");
+
+		const badJson = await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", fakeReadFile(STAGING, { [`${STAGING}/web/modules/pm/locales/zh-CN.json`]: "{not-json" }));
+		expect(badJson.roles[0]!.title).toBe("pm:role.sales");
+
+		const nonString = await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", fakeReadFile(STAGING, { [`${STAGING}/web/modules/pm/locales/zh-CN.json`]: JSON.stringify({ role: { sales: 42 } }) }));
+		expect(nonString.roles[0]!.title).toBe("pm:role.sales");
+
+		// 非 key 形状（中文文本）不做解析尝试——已解析文本二次注册不被误改
+		const plain = await resolveDeclTitles(pmDecl("销售"), STAGING, "zh-CN", fakeReadFile(STAGING, PM_LOCALES));
+		expect(plain.roles[0]!.title).toBe("销售");
+	});
+
+	it("R1 边界：ns ≠ 模块名不越界解析（跨 ns 无本包 locale）", async () => {
+		const decl = { ...pmDecl("wiki:role.sales"), module: "pm" };
+		const resolved = await resolveDeclTitles(decl, STAGING, "zh-CN", fakeReadFile(STAGING, PM_LOCALES));
+		expect(resolved.roles[0]!.title).toBe("wiki:role.sales");
+	});
+});
+
+describe("R1–R3 落库（registerSolution 消费解析后的 decl）", () => {
+	it("AC1 首装：sys_role 落 (title=销售, title_key=pm:role.sales)，权限点照常", async () => {
+		const resolved = await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", fakeReadFile(STAGING, PM_LOCALES));
+		const r = await registerSolution(resolved);
+		expect(r.ok).toBe(true);
+		const rows = roleRows();
+		expect(rows).toEqual([{ name: "pm.sales", title: "销售", title_key: "pm:role.sales" }]);
+		const perms = dbo.prepare("SELECT code FROM sys_permission").all() as Array<{ code: string }>;
+		expect(perms.map(p => p.code)).toEqual(["pm.doc.create"]);
+	});
+
+	it("AC2 升级：元数据覆盖写新解析文本 + title_key 刷新（R3 locale 改进随升级传播）", async () => {
+		await registerSolution(await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", fakeReadFile(STAGING, PM_LOCALES)));
+		const improved = fakeReadFile(STAGING, { [`${STAGING}/web/modules/pm/locales/zh-CN.json`]: JSON.stringify({ role: { sales: "销售冠军" } }) });
+		const r = await registerSolution(await resolveDeclTitles(pmDecl("pm:role.sales"), STAGING, "zh-CN", improved));
+		expect(r.ok).toBe(true);
+		expect(roleRows()).toEqual([{ name: "pm.sales", title: "销售冠军", title_key: "pm:role.sales" }]);
+	});
+
+	it("AC3 缺 key：注册不失败，title = 裸 key（现行回退形态）", async () => {
+		const r = await registerSolution(await resolveDeclTitles(pmDecl("pm:role.viewer"), STAGING, "zh-CN", fakeReadFile(STAGING, PM_LOCALES)));
+		expect(r.ok).toBe(true);
+		expect(roleRows()).toEqual([{ name: "pm.sales", title: "pm:role.viewer", title_key: "pm:role.viewer" }]);
+	});
+});
+
+describe("R2 迁移 0018（sys_role.title_key 回填）", () => {
+	it("AC4 夹具真实迁移后 sys_role 带 title_key 列（列进库 ↔ schema.yaml 一致守卫的库侧半边）", () => {
+		const cols = (dbo.prepare("PRAGMA table_info(sys_role)").all() as Array<{ name: string }>).map(c => c.name);
+		expect(cols).toContain("title_key");
+	});
+
+	it("AC4 存量 solution 角色按 key 形状回填，builtin 角色不动、title 原文不改", () => {
+		const raw = new DatabaseSync(":memory:");
+		raw.exec(`
+			CREATE TABLE sys_role (
+				name TEXT PRIMARY KEY, module TEXT NOT NULL, title TEXT, description TEXT,
+				builtin INTEGER NOT NULL DEFAULT 0, deprecated INTEGER NOT NULL DEFAULT 0
+			);
+			INSERT INTO sys_role (name, module, title, builtin) VALUES
+				('pm.sales', 'pm', 'pm:role.sales', 0),
+				('wiki.admin', 'wiki', 'wiki:role.admin', 0),
+				('admin', 'framework', '系统管理员', 1);
+		`);
+		raw.exec(readFileSync(join(HERE, "../../src/app/api/_platform/migrations/0018__sys_role_title_key.sql"), "utf8"));
+		const rows = raw.prepare("SELECT name, title, title_key FROM sys_role ORDER BY name").all() as Array<{ name: string, title: string, title_key: string | null }>;
+		expect(rows).toEqual([
+			{ name: "admin", title: "系统管理员", title_key: null },
+			{ name: "pm.sales", title: "pm:role.sales", title_key: "pm:role.sales" },
+			{ name: "wiki.admin", title: "wiki:role.admin", title_key: "wiki:role.admin" },
+		]);
+	});
+});

package/templates/tests/rbac-roles.spec.ts

@@ -157,6 +157,15 @@ describe("列表支撑（C2 页面数据源）", () => {
 		expect(perms.find(p => p.code === "wiki.new")?.deprecated).toBe(false);
 	});
 
+	it("listRoles 带出 title_key（R2：solution 角色 UI 实时翻译锚；custom/builtin 为 null）", async () => {
+		// solution 角色带 title_key（0018 起）；custom 角色管理员手填 title、无 key
+		dbo.prepare("INSERT INTO sys_role (name, module, title, title_key, builtin) VALUES ('pm.sales', 'pm', '销售', 'pm:role.sales', 0)").run();
+		await createRole({ name: "custom.tk", title: "手填" });
+		const roles = await listRoles();
+		expect(roles.find(x => x.name === "pm.sales")?.title_key).toBe("pm:role.sales");
+		expect(roles.find(x => x.name === "custom.tk")?.title_key).toBe(null);
+	});
+
 	it("listRoles 原样返回 superadmin（只在 /system/roles 展示层隐去）", async () => {
 		// 成员资格页（users/roles.tsx）把 superadmin 当可授予项（仅 superadmin 可勾选），
 		// 页面数据源里少了它会让「授予超级管理员」直接不可用。过滤只做在展示层。

package/vendor/host-versions.json

@@ -8,9 +8,9 @@
 		"react-router": "7.18.2",
 		"react-router/dom": "7.18.2",
 		"@tanstack/react-query": "5.102.8",
-		"@oj-module/runtime": "0.2.56",
-		"@oj-module/runtime/contract": "0.2.56",
-		"@oj-module/runtime/contract/errors": "0.2.56",
+		"@oj-module/runtime": "0.2.57",
+		"@oj-module/runtime/contract": "0.2.57",
+		"@oj-module/runtime/contract/errors": "0.2.57",
 		"@plane/kit": "0.1.20",
 		"@plane/editor": "0.1.20",
 		"antd": "6.6.1",