@oj-module/cli 0.1.17 → 0.1.20

package/package.json

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

package/shell-dist/assets/contract.js

@@ -9,63 +9,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 // ../runtime/dist/contract/index.js
 var contract_exports = {};
 __export(contract_exports, {
-  API_DEF: () => API_DEF,
   ContractApiError: () => ContractApiError,
-  defineApi: () => defineApi,
   z: () => external_exports
 });
 
-// ../runtime/dist/contract/define-api.js
-var PARAM_SEGMENT = /^\{\*?[a-z_]\w*\}$/i;
-function fail(route, reason) {
-  throw new Error(`[\u5951\u7EA6] \u7AEF\u70B9\u5B9A\u4E49\u975E\u6CD5\uFF08route: ${route}\uFF09\uFF1A${reason}`);
-}
-function validateDefinition(def) {
-  const { apiPrefix, route } = def;
-  if (!apiPrefix?.startsWith("/")) {
-    throw new Error(`[\u5951\u7EA6] apiPrefix \u5FC5\u987B\u4EE5 "/" \u5F00\u5934\uFF08\u6536\u5230: ${apiPrefix}\uFF09\u2014\u2014\u5982 "/order"\uFF1Buni-dev \u5F62\u6001\u8BF7\u4E0E oj \u6A21\u5757\u6BB5\u540D\u4FDD\u6301\u4E00\u81F4\uFF08AC-D9\uFF09\u3002`);
-  }
-  if (def.urlPrefix !== void 0 && !def.urlPrefix.startsWith("/"))
-    fail(route, `urlPrefix \u5FC5\u987B\u4EE5 "/" \u5F00\u5934\uFF08\u6536\u5230: ${def.urlPrefix}\uFF09\u3002`);
-  if (!route?.startsWith("/"))
-    fail(route, `route \u5FC5\u987B\u4EE5 "/" \u5F00\u5934\uFF08\u6536\u5230: ${route}\uFF09\uFF0C\u4E14\u4E00\u5F8B\u76F8\u5BF9 apiPrefix\u2014\u2014\u4E0D\u652F\u6301 oj \u7684\u6839\u7EDD\u5BF9\u5199\u6CD5\uFF08\u6A21\u5757\u624B\u518C D11 \u524D\u7F00\u6536\u655B\uFF09\u3002`);
-  if (route.split("/").some((seg) => seg === ".." || seg === "." || seg === "\\"))
-    fail(route, "route \u542B\u8DEF\u5F84\u7A7F\u8D8A\u6BB5\uFF08.././\\\uFF09\uFF0C\u8BF7\u6539\u4E3A\u6B63\u5E38\u9759\u6001\u6BB5\u3002");
-  for (const seg of route.split("/")) {
-    if (seg.includes("{") && !PARAM_SEGMENT.test(seg))
-      fail(route, `\u53C2\u6570\u6BB5 "${seg}" \u6DF7\u5165\u5B57\u9762\u91CF\u2014\u2014matchit \u7EA6\u675F\uFF1A\u53C2\u6570\u6BB5\u5FC5\u987B\u6574\u6BB5\u4E3A {name} \u6216 {*name}\uFF0C\u9700\u8981\u524D\u7F00/\u540E\u7F00\u5B57\u9762\u65F6\u8BF7\u62C6\u6210\u9759\u6001\u591A\u6BB5\u3002`);
-  }
-  if (def.data && def.response === "raw")
-    fail(route, 'data schema \u4E0E response:"raw" \u4E92\u65A5\u2014\u2014raw \u7AEF\u70B9\u4E0D\u89E3\u5305\u4FE1\u5C01\uFF0C\u4E0D\u9700\u8981 data schema\u3002');
-  if (def.form && def.body)
-    fail(route, "form \u4E0E body \u4E92\u65A5\u2014\u2014\u4E00\u4E2A\u7AEF\u70B9\u53EA\u6709\u4E00\u79CD\u8BF7\u6C42\u4F53\u5F62\u6001\uFF1Amultipart/form-data\uFF08form\uFF09\u4E0E JSON\uFF08body\uFF09\u58F0\u660E\u5176\u4E00\uFF0C\u6587\u672C\u5B57\u6BB5\u8BF7\u5199\u8FDB form.fields\u3002");
-  if (def.form) {
-    const files = def.form.files ?? [];
-    if (!def.form.fields && files.length === 0)
-      fail(route, "form \u81F3\u5C11\u9700\u8981 fields \u6216\u4E00\u9879 files\u2014\u2014\u7A7A multipart \u8BF7\u6C42\u4F53\u65E0\u610F\u4E49\uFF1B\u65E0\u8BF7\u6C42\u4F53\u8BF7\u5220\u6389 form\uFF08\u6539\u7528 query/params\uFF09\u3002");
-    const seen = /* @__PURE__ */ new Set();
-    for (const file2 of files) {
-      if (!file2?.name)
-        fail(route, "form.files \u6BCF\u9879\u5FC5\u987B\u6709 name\u2014\u2014\u5B83\u65E2\u662F FormData \u7684 append key\uFF0C\u4E5F\u662F oj \u4FA7 http.files[].field \u7684\u5B57\u6BB5\u540D\u3002");
-      if (seen.has(file2.name))
-        fail(route, `form.files \u5B57\u6BB5\u540D "${file2.name}" \u91CD\u590D\u2014\u2014\u540C\u540D\u591A\u6587\u4EF6\u8BF7\u7528 multiple: true\u3002`);
-      seen.add(file2.name);
-    }
-  }
-  if (def.response !== void 0 && def.response !== "raw")
-    fail(route, `response \u4EC5\u652F\u6301 "raw"\uFF08\u6536\u5230: ${String(def.response)}\uFF09\u3002`);
-  if (def.method === "OPTIONS")
-    fail(route, "OPTIONS \u4E0D\u5728\u652F\u6301\u8303\u56F4\uFF08ky/oj \u5747\u65E0\u5BF9\u5E94\u65B9\u6CD5\uFF09\u2014\u2014\u9884\u68C0\u8BF7\u6C42\u7531 fetch/CORS \u5C42\u5904\u7406\uFF0C\u5951\u7EA6\u4E0D\u8868\u8FBE\u3002");
-  if (def.method === "HEAD" && def.data)
-    fail(route, "HEAD \u7AEF\u70B9\u65E0\u54CD\u5E94\u4F53\uFF0C\u4E0D\u80FD\u58F0\u660E data schema\u2014\u2014\u9700\u8981\u54CD\u5E94\u4F53\u8BF7\u6539\u7528 GET\u3002");
-}
-var API_DEF = /* @__PURE__ */ Symbol.for("ojm.api.def");
-function defineApi(def) {
-  validateDefinition(def);
-  Object.defineProperty(def, API_DEF, { value: true, enumerable: false });
-  return def;
-}
-
 // ../runtime/dist/contract/errors.js
 var ContractApiError = class extends Error {
   constructor(code, msg) {
@@ -18947,9 +18894,7 @@ function date4(params) {
 // shell/.ojm-shim-contract.mjs
 var ojm_shim_contract_default = void 0 ?? contract_exports;
 export {
-  API_DEF,
   ContractApiError,
   ojm_shim_contract_default as default,
-  defineApi,
   external_exports as z
 };

package/shell-dist/assets/runtime.js

@@ -255,10 +255,10 @@ function getAppInfo() {
 	return {
 		"pkg": {
 			"name": "@oj-module/runtime",
-			"version": "0.1.17",
+			"version": "0.1.20",
 			"license": "MIT"
 		},
-		"lastBuildTime": "2026-10-13 22:01:51"
+		"lastBuildTime": "2026-10-15 16:50:57"
 	};
 }
 var init_get_app_info = __esmMin((() => {}));
@@ -3580,7 +3580,7 @@ var init_use_layout_style = __esmMin((() => {
 }));
 //#endregion
 //#region src/store/tabs.ts
-var initialState$3, useTabsStore;
+var initialState$3, closingKeys, useTabsStore;
 var init_tabs = __esmMin((() => {
 	init_preferences$3();
 	init_get_app_namespace();
@@ -3606,224 +3606,218 @@ var init_tabs = __esmMin((() => {
 		*/
 		isMaximize: false
 	};
-	useTabsStore = create()(persist((set) => ({
-		...initialState$3,
+	closingKeys = /* @__PURE__ */ new Set();
+	useTabsStore = create()(persist((set, get) => {
 		/**
-		* @zh 设置标签页是否处于刷新状态
-		* @en Set whether the tab is in a refresh state.
+		* 关闭前守卫：待关闭集合里任一标签页声明了 beforeClose 且返回 false / 抛错时，整体中止。
+		* fail-safe：守卫抛错按中止处理，防误关丢内容；console.error 留排查线索。
 		*/
-		setIsRefresh: (state) => {
-			set({ isRefresh: state });
-		},
-		/**
-		* @zh 设置标签页
-		* @en Set the tab.
-		*/
-		setActiveKey: (routePath) => {
-			set({ activeKey: routePath });
-		},
-		/**
-		* @zh 在最前面插入标签页
-		* @en Insert a tab at the front.
-		*/
-		insertBeforeTab: (routePath, tabProps) => {
-			set((state) => {
-				if (routePath?.length) {
-					const newMap = /* @__PURE__ */ new Map([[routePath, tabProps]]);
-					for (const [key, value] of state.openTabs) newMap.set(key, value);
-					return { openTabs: newMap };
-				}
-				return state;
-			});
-		},
-		/**
-		* @zh 添加标签页
-		* @en Add a tab.
-		*/
-		addTab: (routePath, tabProps) => {
-			set((state) => {
-				if (routePath?.length) {
-					const newTabs = new Map(state.openTabs);
-					/**
-					* 1. 如果 tab 已经存在，则更新 historyState 属性，所以不去重，且 ...newTabs.get(routePath) 是为了保证首页的 closable 属性不被覆盖
-					* 2. 如果 tab 不存在，则添加到 Map 中
-					*/
-					newTabs.set(routePath, {
-						...newTabs.get(routePath),
-						...tabProps
-					});
-					return { openTabs: newTabs };
+		const guardClose = async (keys) => {
+			for (const key of keys) {
+				const fn = get().openTabs.get(key)?.beforeClose;
+				if (fn == null) continue;
+				const fns = Array.isArray(fn) ? fn : [fn];
+				for (const f of fns) try {
+					if (!await f()) return false;
+				} catch (e) {
+					console.error("[tabs] beforeClose 守卫抛错，按中止关闭处理", e);
+					return false;
 				}
-				return state;
-			});
-		},
+			}
+			return true;
+		};
 		/**
-		* @zh 移除标签页
-		* @en Remove a tab.
+		* 共用关闭路径：in-flight 去重 → 守卫 → 精确删除获批集合（TOCTOU 防护：
+		* 不对 live state 重算，await 期间新开的 tab 不受影响）→ activeKey 修正。
 		*/
-		removeTab: (routePath) => {
-			set((state) => {
+		const guardAndClose = async (removed, fallbackActive) => {
+			if (removed.length === 0) return;
+			for (const k of removed) closingKeys.add(k);
+			try {
+				if (!await guardClose(removed)) return;
+				set((state) => {
+					const toClose = new Set(removed);
+					const newTabs = new Map([...state.openTabs].filter(([k]) => !toClose.has(k)));
+					if (newTabs.size === state.openTabs.size) return state;
+					const remaining = [...newTabs.keys()];
+					return {
+						openTabs: newTabs,
+						activeKey: toClose.has(state.activeKey) || !newTabs.has(state.activeKey) ? fallbackActive(remaining) : state.activeKey
+					};
+				});
+			} finally {
+				for (const k of removed) closingKeys.delete(k);
+			}
+		};
+		return {
+			...initialState$3,
+			/**
+			* @zh 设置标签页是否处于刷新状态
+			* @en Set whether the tab is in a refresh state.
+			*/
+			setIsRefresh: (state) => {
+				set({ isRefresh: state });
+			},
+			/**
+			* @zh 设置标签页
+			* @en Set the tab.
+			*/
+			setActiveKey: (routePath) => {
+				set({ activeKey: routePath });
+			},
+			/**
+			* @zh 在最前面插入标签页
+			* @en Insert a tab at the front.
+			*/
+			insertBeforeTab: (routePath, tabProps) => {
+				set((state) => {
+					if (routePath?.length) {
+						const newMap = /* @__PURE__ */ new Map([[routePath, tabProps]]);
+						for (const [key, value] of state.openTabs) newMap.set(key, value);
+						return { openTabs: newMap };
+					}
+					return state;
+				});
+			},
+			/**
+			* @zh 添加标签页
+			* @en Add a tab.
+			*/
+			addTab: (routePath, tabProps) => {
+				set((state) => {
+					if (routePath?.length) {
+						const newTabs = new Map(state.openTabs);
+						/**
+						* 1. 如果 tab 已经存在，则更新 historyState 属性，所以不去重，且 ...newTabs.get(routePath) 是为了保证首页的 closable 属性不被覆盖
+						* 2. 如果 tab 不存在，则添加到 Map 中
+						* 3. beforeClose 是注册语义而非覆盖语义：数组 concat + 按引用去重
+						*    （keep-alive 重挂载重复注册不叠加）；null 显式清除全部守卫
+						*/
+						const prev = newTabs.get(routePath);
+						const merged = {
+							...prev,
+							...tabProps
+						};
+						if (tabProps.beforeClose === null) merged.beforeClose = void 0;
+						else if (prev?.beforeClose != null && tabProps.beforeClose !== void 0) merged.beforeClose = [...Array.isArray(prev.beforeClose) ? prev.beforeClose : [prev.beforeClose], ...Array.isArray(tabProps.beforeClose) ? tabProps.beforeClose : [tabProps.beforeClose]].filter((f, i, a) => a.indexOf(f) === i);
+						newTabs.set(routePath, merged);
+						return { openTabs: newTabs };
+					}
+					return state;
+				});
+			},
+			/**
+			* @zh 移除标签页
+			* @en Remove a tab.
+			*/
+			removeTab: async (routePath) => {
 				const homePath = "/home";
-				if (routePath === homePath) return state;
-				const newTabs = new Map(state.openTabs);
-				newTabs.delete(routePath);
-				let newActiveKey = state.activeKey;
-				if (routePath === state.activeKey) newActiveKey = Array.from(newTabs.keys()).at(-1) || homePath;
-				if (newTabs.size === 0) {
-					newTabs.set(homePath, state.openTabs.get(homePath));
-					newActiveKey = homePath;
-				}
-				return {
-					openTabs: newTabs,
-					activeKey: newActiveKey
-				};
-			});
-		},
-		/**
-		* @zh 关闭右侧标签页
-		* @en Close tabs on the right.
-		*/
-		closeRightTabs: (routePath) => {
-			set((state) => {
-				const newTabs = /* @__PURE__ */ new Map();
-				let found = false;
-				let activeKeyFound = false;
-				let newActiveKey = state.activeKey;
-				for (const [key, value] of state.openTabs) {
-					if (found) break;
-					newTabs.set(key, value);
-					if (key === routePath) found = true;
-					if (key === state.activeKey) activeKeyFound = true;
-				}
-				if (!activeKeyFound) newActiveKey = routePath;
-				return {
-					openTabs: newTabs,
-					activeKey: newActiveKey
-				};
-			});
-		},
-		/**
-		* @zh 关闭左侧标签页
-		* @en Close tabs on the left.
-		*/
-		closeLeftTabs: (routePath) => {
-			set((state) => {
-				const newTabs = /* @__PURE__ */ new Map();
+				if (!routePath?.length || routePath === homePath || closingKeys.has(routePath)) return;
+				await guardAndClose([routePath], (keys) => keys.at(-1) ?? homePath);
+			},
+			/**
+			* @zh 关闭右侧标签页
+			* @en Close tabs on the right.
+			*/
+			closeRightTabs: async (routePath) => {
+				if (closingKeys.has(routePath)) return;
+				const keys = [...get().openTabs.keys()];
+				const idx = keys.indexOf(routePath);
+				if (idx < 0) return;
+				await guardAndClose(keys.slice(idx + 1), () => routePath);
+			},
+			/**
+			* @zh 关闭左侧标签页
+			* @en Close tabs on the left.
+			*/
+			closeLeftTabs: async (routePath) => {
+				if (closingKeys.has(routePath)) return;
 				const homePath = "/home";
-				let found = false;
-				let newActiveKey = state.activeKey;
-				let activeKeyOnRight = false;
-				newTabs.set(homePath, state.openTabs.get(homePath));
-				for (const [key, value] of state.openTabs) {
-					if (key === homePath) continue;
-					if (found || key === routePath) {
-						newTabs.set(key, value);
-						found = true;
-					}
-					if (key === state.activeKey && found) activeKeyOnRight = true;
-				}
-				if (!activeKeyOnRight) newActiveKey = routePath;
-				return {
-					openTabs: newTabs,
-					activeKey: newActiveKey
-				};
-			});
-		},
-		/**
-		* @zh 关闭其他标签页
-		* @en Close other tabs.
-		*/
-		closeOtherTabs: (routePath) => {
-			set((state) => {
-				const newTabs = /* @__PURE__ */ new Map();
+				const keys = [...get().openTabs.keys()];
+				const idx = keys.indexOf(routePath);
+				if (idx < 0) return;
+				await guardAndClose(keys.slice(0, idx).filter((k) => k !== homePath), () => routePath);
+			},
+			/**
+			* @zh 关闭其他标签页
+			* @en Close other tabs.
+			*/
+			closeOtherTabs: async (routePath) => {
+				if (closingKeys.has(routePath)) return;
 				const homePath = "/home";
-				newTabs.set(homePath, state.openTabs.get(homePath));
-				if (routePath !== homePath && state.openTabs.has(routePath)) newTabs.set(routePath, state.openTabs.get(routePath));
-				let newActiveKey = state.activeKey;
-				if (!newTabs.has(state.activeKey)) newActiveKey = routePath;
-				return {
-					openTabs: newTabs,
-					activeKey: newActiveKey
-				};
-			});
-		},
-		/**
-		* @zh 关闭所有标签页
-		* @en Close all tabs.
-		*/
-		closeAllTabs: () => {
-			set((state) => {
-				const newTabs = /* @__PURE__ */ new Map();
+				await guardAndClose([...get().openTabs.keys()].filter((k) => k !== homePath && k !== routePath), () => routePath);
+			},
+			/**
+			* @zh 关闭所有标签页
+			* @en Close all tabs.
+			*/
+			closeAllTabs: async () => {
 				const homePath = "/home";
-				newTabs.set(homePath, state.openTabs.get(homePath));
-				return {
-					openTabs: newTabs,
-					activeKey: homePath
-				};
-			});
-		},
-		/**
-		* @zh 更改标签页顺序
-		* @en Change tab order.
-		*/
-		changeTabOrder: (from, to) => {
-			set((state) => {
-				const newTabs = Array.from(state.openTabs.entries());
-				const [movedTab] = newTabs.splice(from, 1);
-				newTabs.splice(to, 0, movedTab);
-				return { openTabs: new Map(newTabs) };
-			});
-		},
-		/**
-		* @zh 切换标签页最大化状态
-		* @en Toggle tab maximization status
-		* @param {boolean} state - 最大化状态
-		*/
-		toggleMaximize: (state) => {
-			set({ isMaximize: state });
-		},
-		/**
-		* @zh 设置标签页标题
-		* @en Set the tab title
-		*/
-		setTableTitle: (routePath, title) => {
-			set((state) => {
-				const newTabs = new Map(state.openTabs);
-				const targetTab = newTabs.get(routePath);
-				if (targetTab) {
-					targetTab.newTabTitle = title;
-					newTabs.set(routePath, targetTab);
-					return { openTabs: newTabs };
-				}
-				return state;
-			});
-		},
-		/**
-		* @zh 重置标签页标题（删除自定义的标题）
-		* @en Reset the tab title (delete custom titles)
-		*/
-		resetTableTitle: (routePath) => {
-			set((state) => {
-				const newTabs = new Map(state.openTabs);
-				const targetTab = newTabs.get(routePath);
-				if (targetTab) {
-					delete targetTab.newTabTitle;
-					newTabs.set(routePath, targetTab);
-					return { openTabs: newTabs };
-				}
-				return state;
-			});
-		},
-		/**
-		* @zh 重置所有标签页的状态
-		* @en Reset all tab states
-		*/
-		resetTabs: () => {
-			set(() => {
-				return { ...initialState$3 };
-			});
-		}
-	}), {
+				await guardAndClose([...get().openTabs.keys()].filter((k) => k !== homePath), () => homePath);
+			},
+			/**
+			* @zh 更改标签页顺序
+			* @en Change tab order.
+			*/
+			changeTabOrder: (from, to) => {
+				set((state) => {
+					const newTabs = Array.from(state.openTabs.entries());
+					const [movedTab] = newTabs.splice(from, 1);
+					newTabs.splice(to, 0, movedTab);
+					return { openTabs: new Map(newTabs) };
+				});
+			},
+			/**
+			* @zh 切换标签页最大化状态
+			* @en Toggle tab maximization status
+			* @param {boolean} state - 最大化状态
+			*/
+			toggleMaximize: (state) => {
+				set({ isMaximize: state });
+			},
+			/**
+			* @zh 设置标签页标题
+			* @en Set the tab title
+			*/
+			setTableTitle: (routePath, title) => {
+				set((state) => {
+					const newTabs = new Map(state.openTabs);
+					const targetTab = newTabs.get(routePath);
+					if (targetTab) {
+						targetTab.newTabTitle = title;
+						newTabs.set(routePath, targetTab);
+						return { openTabs: newTabs };
+					}
+					return state;
+				});
+			},
+			/**
+			* @zh 重置标签页标题（删除自定义的标题）
+			* @en Reset the tab title (delete custom titles)
+			*/
+			resetTableTitle: (routePath) => {
+				set((state) => {
+					const newTabs = new Map(state.openTabs);
+					const targetTab = newTabs.get(routePath);
+					if (targetTab) {
+						delete targetTab.newTabTitle;
+						newTabs.set(routePath, targetTab);
+						return { openTabs: newTabs };
+					}
+					return state;
+				});
+			},
+			/**
+			* @zh 重置所有标签页的状态
+			* @en Reset all tab states
+			*/
+			resetTabs: () => {
+				set(() => {
+					return { ...initialState$3 };
+				});
+			}
+		};
+	}, {
 		name: getAppNamespace("tabbar"),
 		/**
 		* activeKey 不需要持久化存储

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-cEEui3MttOAqCTHlBg5Xog=='; 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-aMxR7a5yEi7eE8DlhFuiNg=='; 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="cEEui3MttOAqCTHlBg5Xog==">{
+		<script type="importmap" nonce="aMxR7a5yEi7eE8DlhFuiNg==">{
   "imports": {
     "react": "/assets/react.js",
     "react/jsx-runtime": "/assets/jsx-runtime.js",

package/shell-dist/versions.json

@@ -7,11 +7,11 @@
   "react-router": "7.18.2",
   "react-router/dom": "7.18.2",
   "@tanstack/react-query": "5.102.8",
-  "@oj-module/runtime": "0.1.17",
-  "@oj-module/runtime/contract": "0.1.17",
-  "@oj-module/runtime/contract/errors": "0.1.17",
-  "@plane/kit": "0.1.17",
-  "@plane/editor": "0.1.17",
+  "@oj-module/runtime": "0.1.20",
+  "@oj-module/runtime/contract": "0.1.20",
+  "@oj-module/runtime/contract/errors": "0.1.20",
+  "@plane/kit": "0.1.20",
+  "@plane/editor": "0.1.20",
   "antd": "6.6.1",
   "antd/locale/en_US": "6.6.1",
   "antd/locale/zh_CN": "6.6.1",

package/src/build.ts

@@ -42,6 +42,7 @@ export const AntdApp = _fn;
 export const ErrorBoundary = _fn;
 export const PageError = _fn;
 // api
+export const notify = _obj;
 export const fetchPie = _fn;
 export const fetchLine = _fn;
 export const fetchLogin = _fn;

package/src/contract/__tests__/check-api.test.ts

@@ -0,0 +1,74 @@
+import type { OpenApiDoc } from "../openapi-ir";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { checkApi } from "../check";
+import { runApi } from "../run";
+
+let dir: string;
+beforeEach(() => {
+	dir = mkdtempSync(join(tmpdir(), "ojm-check-"));
+});
+afterEach(() => {
+	rmSync(dir, { recursive: true, force: true });
+});
+
+const DOC: OpenApiDoc = {
+	openapi: "3.1.0",
+	paths: {
+		"/v1/api/wiki/collections/{id}": {
+			get: {
+				operationId: "wiki_collections__id__get",
+				tags: ["wiki"],
+				parameters: [{ name: "id", in: "path", required: true, schema: { type: "integer" } }],
+				responses: {
+					200: {
+						"description": "OK",
+						"x-oj-response-enforced": false,
+						"content": { "application/json": { schema: { type: "object", required: ["code", "msg", "data"], properties: { code: { type: "integer" }, msg: { type: "string" }, data: { type: "string" } } } } },
+					},
+				},
+			},
+		},
+	},
+};
+
+describe("checkApi 消费 openapi.json（新口径 Task #5）", () => {
+	it("__client 缺失 → artifact-stale 报错", async () => {
+		writeFileSync(join(dir, "openapi.json"), JSON.stringify(DOC));
+		const { violations } = await checkApi({ cwd: dir });
+		expect(violations.some(v => v.kind === "artifact-stale")).toBe(true);
+	});
+
+	it("ojm api 生成后重跑 --check → 无 artifact-stale", async () => {
+		writeFileSync(join(dir, "openapi.json"), JSON.stringify(DOC));
+		mkdirSync(join(dir, "web/src/wiki/__client"), { recursive: true });
+		await runApi({ cwd: dir, openapi: "openapi.json" });
+		const { violations } = await checkApi({ cwd: dir });
+		expect(violations.filter(v => v.kind === "artifact-stale").length).toBe(0);
+	});
+});
+
+describe("checkApi 豁免清单（D12/F19）覆盖契约→handler 侧", () => {
+	it("豁免模块的根级路由（route=\"/\" 但 handler .route 为模块名）不误报 route-params-mismatch", async () => {
+		// 模拟 api/.ojm-api-exempt.json 豁免 notifications 模块：oj 为根级兜底端点
+		// 生成 /api/notifications（route 推导为 "/"），而 handler 落在 api/src/notifications
+		// 模块根（实际 .route 即模块名 notifications）——两侧表示不同但线径一致，历史上误报
+		// route-params-mismatch；修复后「契约→handler」侧同样按豁免跳过。
+		writeFileSync(join(dir, "openapi.json"), JSON.stringify({
+			openapi: "3.1.0",
+			paths: {
+				"/v1/api/notifications": {
+					get: { operationId: "notifications_get", tags: ["notifications"], responses: { 200: { description: "OK" } } },
+				},
+			},
+		} satisfies OpenApiDoc));
+		mkdirSync(join(dir, "api/src/notifications"), { recursive: true });
+		writeFileSync(join(dir, "api/src/notifications/api.ts"), "export default { async get() { json.ok([]); } };\n");
+		mkdirSync(join(dir, "api"), { recursive: true });
+		writeFileSync(join(dir, "api/.ojm-api-exempt.json"), JSON.stringify({ modules: ["notifications"], paths: [] }));
+		const { violations } = await checkApi({ cwd: dir });
+		expect(violations.some(v => v.kind === "route-params-mismatch")).toBe(false);
+	});
+});