@oj-module/cli 0.2.17 → 0.2.18

package/devkit/manual.md

@@ -1837,7 +1837,7 @@ export default defineModule({
 
 ### 13.3 menu.main 统一 + 路径助手
 
-- 模块根菜单标题与 /system 下的管理子组标题**共用** `<模块>:menu.main` 一个 i18n key（嵌套在 `menu.main`，缺则构建期 fail-fast）。旧 `menu.group` key 已废弃。
+- 模块根菜单标题与 /system 下的管理子组标题**共用** `<模块>:menu.main` 一个 i18n key（嵌套在 `menu.main`，是模块级标题的唯一真源，缺则构建期 fail-fast）。
 - 模块内所有前端路径——`navigate` / `Link to` / `useMatch`·`matchPath` / `currentActiveMenu` / SEO 正则——统一从模块基路径助手（如 `paths.ts` 的 `wikiPath(...)` / `wikiBase`）派生，不散落 `/wiki/...` 字面量；`currentActiveMenu` 必须写绝对路径（指向真实菜单 key）。`tree/bus.ts` 的 room 名是后端 WS 契约，非前端路由，不动。
 
 ### 13.4 开发者的该做 / 别做

package/devkit/menu-rules.md

@@ -156,7 +156,6 @@ export default defineModule({
 - 必须**嵌套**在 `menu.main`，不能平铺成 `"<模块名>:menu.main": "..."`（i18next 点路径取值）。
 - 缺这条 key → 构建期契约校验直接 fail（构建期 fail-fast）。
 - 普通子项（space / status / collections 等）的 `title` 仍各自匹配 `<模块名>:menu.*`（如 `wiki:menu.space`）。
-- 旧设计的 `menu.group` key 已废弃：`menu.main` 取代它成为根标题与管理子组标题的统一真源。
 
 ---
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oj-module/cli",
   "type": "module",
-  "version": "0.2.17",
+  "version": "0.2.18",
   "description": "React Antd Admin 模块工程命令行工具（含预构建宿主 shell-dist）",
   "license": "MIT",
   "exports": {
@@ -49,7 +49,7 @@
   ],
   "dependencies": {
     "@faker-js/faker": "^10.4.0",
-    "@oj-module/runtime": "0.2.17",
+    "@oj-module/runtime": "0.2.18",
     "@redocly/cli": "^2.51.0",
     "@tailwindcss/vite": "^4.3.0",
     "esbuild": "^0.28.2",

package/shell-dist/assets/runtime.js

@@ -303,10 +303,10 @@ function getAppInfo() {
 	return {
 		"pkg": {
 			"name": "@oj-module/runtime",
-			"version": "0.2.17",
+			"version": "0.2.18",
 			"license": "MIT"
 		},
-		"lastBuildTime": "2026-10-21 21:54:09"
+		"lastBuildTime": "2026-10-21 22:40:24"
 	};
 }
 var init_get_app_info = __esmMin((() => {}));

package/shell-dist/index.html

@@ -5,9 +5,9 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<link rel="icon" href="/favicon.ico" />
 		<title>React Antd Admin · Shell</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' https://modules.cdn.example.com 'wasm-unsafe-eval' 'nonce-NKdPzzWoLWlLgH/F6SaXrg=='; script-src-attr 'none'; connect-src 'self' data: https://modules.cdn.example.com; style-src 'self' https://modules.cdn.example.com 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; frame-src https://ant.design https://react.dev https://condorheroblog.github.io; form-action 'none'; base-uri 'none'; object-src 'none'; upgrade-insecure-requests" />
+		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'self' https://modules.cdn.example.com 'wasm-unsafe-eval' 'nonce-NpuwH1G8uW9SNQdyFsPFYQ=='; script-src-attr 'none'; connect-src 'self' data: https://modules.cdn.example.com; style-src 'self' https://modules.cdn.example.com 'unsafe-inline'; img-src 'self' data: https:; font-src 'self' data:; frame-src https://ant.design https://react.dev https://condorheroblog.github.io; form-action 'none'; base-uri 'none'; object-src 'none'; upgrade-insecure-requests" />
 
-		<script type="importmap" nonce="NKdPzzWoLWlLgH/F6SaXrg==">{
+		<script type="importmap" nonce="NpuwH1G8uW9SNQdyFsPFYQ==">{
   "imports": {
     "react": "/assets/react.js",
     "react/jsx-runtime": "/assets/jsx-runtime.js",

package/shell-dist/versions.json

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

package/src/lifecycle/__tests__/manifest-contract.test.ts

@@ -14,7 +14,7 @@ import { parse } from "yaml";
 // 跨端引用（双端一致钉）：被测实现同仓分居两运行时（计划 §1「两运行时取舍」），
 // 测试直接互调，比「两套件各读同一夹具」更强——漂移即本文件红。
 import { preflight } from "../../../templates/api/src/_platform/_lifecycle/steps/preflight";
-import { checkLocalesComplete, checkTablesAgainstSchema, groupI18nKeys, parseManifest, validateContract } from "../../manifest-contract";
+import { checkLocalesComplete, checkTablesAgainstSchema, parseManifest, validateContract } from "../../manifest-contract";
 
 const FIXTURES = join(dirname(fileURLToPath(import.meta.url)), "fixtures");
 const readText = (p: string) => readFileSync(join(FIXTURES, p), "utf8");
@@ -214,72 +214,31 @@ describe("checkLocalesComplete（C2-25：构建期缺 key fail-fast）", () => {
 	});
 });
 
-// ── C2-43 归组父标题 i18n（solution menu grouping；纯内容入参）──
+// ── 归组父标题不再进引用面（0.2.18：`menu.main` 是模块级标题的唯一真源）──
 
-describe("c2-43 归组父标题 i18n（solution menu grouping）", () => {
+describe("main/admin 路由不再要求归组父标题", () => {
 	const baseManifest = (): any => ({
 		name: "demo-solution",
 		version: "0.1.0",
 		routes: [
 			{ path: "/demo-solution", category: "main", order: 200, title_key: "demo-solution:menu.main" },
+			{ path: "/demo-solution/users", category: "admin", order: 210, title_key: "demo-solution:menu.users" },
 		],
 	});
-	const ZH_FULL = JSON.stringify({ menu: { main: "主", group: "分组" } });
-	const EN_FULL = JSON.stringify({ menu: { main: "Main", group: "Group" } });
 
-	it("groupI18nKeys：声明 main/admin 路由才产一条 <name>:menu.group", () => {
-		expect(groupI18nKeys(baseManifest())).toEqual(["demo-solution:menu.group"]);
+	it("声明 main/admin 路由、locale 只有 menu.main → 零违规", () => {
+		const zh = JSON.stringify({ menu: { main: "主", users: "用户" } });
+		const en = JSON.stringify({ menu: { main: "Main", users: "Users" } });
+		expect(checkLocalesComplete(baseManifest(), zh, en)).toEqual([]);
 	});
 
-	it("groupI18nKeys：多条 main 路由去重只产一条（C5）", () => {
-		const m = baseManifest();
-		m.routes = [
-			{ path: "/a", category: "main", order: 200, title_key: "demo-solution:menu.a" },
-			{ path: "/b", category: "main", order: 210, title_key: "demo-solution:menu.b" },
-		];
-		expect(groupI18nKeys(m)).toEqual(["demo-solution:menu.group"]);
-	});
-
-	it("groupI18nKeys：仅 hidden 路由不产 group key（C3）", () => {
-		const m = baseManifest();
-		m.routes = [{ path: "/x", category: "hidden", order: 210, title_key: "demo-solution:menu.x" }];
-		expect(groupI18nKeys(m)).toEqual([]);
-	});
-
-	it("c1 正例：menu.group 双语齐备 → 零违规", () => {
-		expect(checkLocalesComplete(baseManifest(), ZH_FULL, EN_FULL)).toEqual([]);
-	});
-
-	it("c2 反例：zh-CN 缺 menu.group → C2-43（非 C2-25，去重生效）", () => {
-		const zh = JSON.stringify({ menu: { main: "主" } });
-		const v = checkLocalesComplete(baseManifest(), zh, EN_FULL);
-		const hit = v.find(x => x.includes("C2-43"));
-		expect(hit, `期望 C2-43，实际：\n${v.join("\n")}`).toBeTruthy();
-		expect(hit).not.toContain("C2-25");
-		expect(hit).toContain("menu.group");
-	});
-
-	it("c4 反例：en-US 缺 menu.group → C2-43 指明 en-US", () => {
-		const en = JSON.stringify({ menu: { main: "Main" } });
-		const v = checkLocalesComplete(baseManifest(), ZH_FULL, en);
-		const hit = v.find(x => x.includes("C2-43"));
-		expect(hit).toBeTruthy();
-		expect(hit).toContain("en-US");
-	});
-
-	it("去重：多条 main 路由只产一条 group key，缺失时按语言各报一次（非按路由重复）", () => {
-		const m = baseManifest();
-		m.routes = [
-			{ path: "/a", category: "main", order: 200, title_key: "demo-solution:menu.a" },
-			{ path: "/b", category: "main", order: 210, title_key: "demo-solution:menu.b" },
-		];
-		const v = checkLocalesComplete(m, JSON.stringify({ menu: { main: "主" } }), JSON.stringify({ menu: { main: "Main" } }));
-		const c243 = v.filter(x => x.includes("C2-43"));
-		// 关键：2 条路由只产 1 个 group key → 缺失时按语言各报 1 次 = 2 条 C2-43，
-		// 而非 2 路由 × 2 语言 = 4 条（去重生效的判据是「< 路由数 × 语言数」）
-		expect(c243.length).toBe(2);
-		expect(c243.some(x => x.includes("zh-CN 缺少归组父标题 key「demo-solution:menu.group」"))).toBe(true);
-		expect(c243.some(x => x.includes("en-US 缺少归组父标题 key「demo-solution:menu.group」"))).toBe(true);
+	it("根标题 menu.main 仍受 C2-25 约束：缺则报 C2-25", () => {
+		const zh = JSON.stringify({ menu: { users: "用户" } });
+		const en = JSON.stringify({ menu: { main: "Main", users: "Users" } });
+		const v = checkLocalesComplete(baseManifest(), zh, en);
+		expect(v).toHaveLength(1);
+		expect(v[0]).toContain("C2-25");
+		expect(v[0]).toContain("demo-solution:menu.main");
 	});
 });
 

package/src/manifest-contract.ts

@@ -1,5 +1,5 @@
 // bundle 级 manifest.yaml 契约校验（P1-11，`ojm build --bundle` 构建期执行点）。
-// 规则真源：docs/prd/solution/202610171254-lifecycle-manifest-contract.md §2/§4（C2-01~33 构建列；C2-34~42 为归档签名与信任，见 sign.ts；本文件新增 C2-43）；
+// 规则真源：docs/prd/solution/202610171254-lifecycle-manifest-contract.md §2/§4（C2-01~33 构建列；C2-34~42 为归档签名与信任，见 sign.ts）；
 // 期望真源：src/lifecycle/__tests__/fixtures/（fixture-valid 零违规 / fixture-invalid 七码齐报）。
 // 双端一致：本实现与 isolate 侧 preflight（templates/api/.../steps/preflight.ts）共享同一组夹具，
 // 正则与规则**逐字一致**（§4.1 矩阵构建列 vs 安装列的执行点差异见各规则注释）——
@@ -581,15 +581,6 @@ export function validateContract(m: unknown): string[] {
 	return v0;
 }
 
-/** C2-43 引用面：声明 main/admin 路由的方案须提供归组父标题 `<name>:menu.group`（单 bundle 单 name，去重只产一条） */
-export function groupI18nKeys(m: BundleManifest): string[] {
-	if (!isObj(m) || typeof m.name !== "string")
-		return [];
-	const routes = Array.isArray(m.routes) ? m.routes : [];
-	const hasGroupable = routes.some(r => isObj(r) && (r.category === "main" || r.category === "admin"));
-	return hasGroupable ? [`${m.name}:menu.group`] : [];
-}
-
 /** 收集 manifest 引用的全部 i18n key（C2-25 locales 齐备检查的引用面；bundle.ts 以此判定 locales 文件是否必查） */
 export function referencedI18nKeys(m: BundleManifest): string[] {
 	const keys: string[] = [];
@@ -620,10 +611,6 @@ export function referencedI18nKeys(m: BundleManifest): string[] {
 			}
 		}
 	}
-	// C2-43：归组父标题纳入引用面，交由 checkLocalesComplete 双语齐备（改报 C2-43）
-	for (const k of groupI18nKeys(m)) {
-		keys.push(k);
-	}
 	return keys;
 }
 
@@ -646,12 +633,9 @@ export function checkLocalesComplete(m: unknown, zhText: string, enText: string)
 	if (!isObj(m))
 		return [v("C2-25", "manifest 不是键值对象，无法核对 locales 引用")];
 	const locales: [string, Record<string, unknown> | null][] = [["zh-CN", parseJson(zhText)], ["en-US", parseJson(enText)]];
-	// group key 识别（C2-43）：归组父标题缺失须归因 C2-43 而非笼统 C2-25，避免重复报错
-	const groupKeys = new Set(groupI18nKeys(m));
 	const out: string[] = [];
 	for (const key of referencedI18nKeys(m)) {
 		const nsKey = key.includes(":") ? key.slice(key.indexOf(":") + 1) : key;
-		const isGroup = groupKeys.has(key);
 		for (const [lang, tree] of locales) {
 			if (tree === null) {
 				out.push(v("C2-25", `${lang} locale 不是合法 JSON 对象，无法核对引用 key`));
@@ -659,14 +643,7 @@ export function checkLocalesComplete(m: unknown, zhText: string, enText: string)
 			}
 			const val = lookupKey(tree, nsKey);
 			if (typeof val !== "string" || val === "") {
-				out.push(
-					v(
-						isGroup ? "C2-43" : "C2-25",
-						isGroup
-							? `${lang} 缺少归组父标题 key「${key}」（须为嵌套 menu.group，C2-43；声明 main/admin 路由即须提供）`
-							: `${lang} 缺少 manifest 引用的 key「${key}」（双语齐备，D4；构建期 fail-fast）`,
-					),
-				);
+				out.push(v("C2-25", `${lang} 缺少 manifest 引用的 key「${key}」（双语齐备，D4；构建期 fail-fast）`));
 			}
 		}
 	}

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.17",
-		"@oj-module/runtime/contract": "0.2.17",
-		"@oj-module/runtime/contract/errors": "0.2.17",
+		"@oj-module/runtime": "0.2.18",
+		"@oj-module/runtime/contract": "0.2.18",
+		"@oj-module/runtime/contract/errors": "0.2.18",
 		"@plane/kit": "0.1.20",
 		"@plane/editor": "0.1.20",
 		"antd": "6.6.1",