@oj-module/cli 0.2.54 → 0.2.56

package/templates/tests/wecom-connector.spec.ts

@@ -10,12 +10,12 @@
 // deps 全注入：store 用 `enc:` 前后缀假加密（Node 侧 crypto 只读，设计 §9.1），
 // client 的 http/kv 用内存桩——真实网络与 AES 已由 wecom-crypt.spec / 运行时保证。
 /* eslint-disable test/prefer-lowercase-title -- D/AC 编号是验收锚点，保留大写 */
-import type { WecomCache, WecomHttp } from "../src/auth/api/_shared/wecom/client";
-import type { WecomConfig } from "../src/auth/api/_shared/wecom/config";
-import type { WecomStoreDeps } from "../src/auth/api/_shared/wecom/store";
+import type { WecomCache, WecomHttp } from "../src/app/api/auth/_shared/wecom/client";
+import type { WecomConfig } from "../src/app/api/auth/_shared/wecom/config";
+import type { WecomStoreDeps } from "../src/app/api/auth/_shared/wecom/store";
 
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { createWecomClient, runtimeCache } from "../src/auth/api/_shared/wecom/client";
+import { createWecomClient, runtimeCache } from "../src/app/api/auth/_shared/wecom/client";
 import {
 	assertEncKey,
 	eventUrlOf,
@@ -23,8 +23,8 @@ import {
 	readCallbackConfig,
 	readSuiteConfig,
 	siteRootOf,
-} from "../src/auth/api/_shared/wecom/config";
-import { envOfState, handleSuiteEvent } from "../src/auth/api/_shared/wecom/events";
+} from "../src/app/api/auth/_shared/wecom/config";
+import { envOfState, handleSuiteEvent } from "../src/app/api/auth/_shared/wecom/events";
 import {
 	assertUserActive,
 	buildAuthorizeUrl,
@@ -36,8 +36,8 @@ import {
 	loginLandingUrl,
 	putLoginState,
 	takeLoginState,
-} from "../src/auth/api/_shared/wecom/login";
-import { callbackFields, field } from "../src/auth/api/_shared/wecom/payload";
+} from "../src/app/api/auth/_shared/wecom/login";
+import { callbackFields, field } from "../src/app/api/auth/_shared/wecom/payload";
 import {
 	claimLoginTicket,
 	ensureTenant,
@@ -48,7 +48,7 @@ import {
 	saveProfile,
 	setProfileStatus,
 	tenantOfCorp,
-} from "../src/auth/api/_shared/wecom/store";
+} from "../src/app/api/auth/_shared/wecom/store";
 import { installDb } from "./fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/tests/wecom-corp.spec.ts

@@ -15,16 +15,16 @@
 //
 // 夹具即真实库（真迁移 + 真 sqlite）：0003__credential_kind 的默认值也一起被这层覆盖到。
 /* eslint-disable test/prefer-lowercase-title -- AC 编号是验收锚点，保留大写 */
-import type { WecomStoreDeps } from "../src/auth/api/_shared/wecom/store";
+import type { WecomStoreDeps } from "../src/app/api/auth/_shared/wecom/store";
 import { Buffer } from "node:buffer";
 import { createCipheriv, webcrypto } from "node:crypto";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { connectCorp } from "../src/auth/api/_shared/wecom/admin";
-import { createWecomClient, runtimeCache, runtimeHttp } from "../src/auth/api/_shared/wecom/client";
-import { callbackCreds, configuredKinds, corpIdentity, readBase, readCorpConfig, readSuiteConfig, wecomKinds } from "../src/auth/api/_shared/wecom/config";
-import { bytesToB64, utf8Bytes, wecomSignature } from "../src/auth/api/_shared/wecom/crypt";
-import { handleSuiteEvent } from "../src/auth/api/_shared/wecom/events";
-import { findCorpAuth, findProfile, probeProfile, saveProfile } from "../src/auth/api/_shared/wecom/store";
+import { connectCorp } from "../src/app/api/auth/_shared/wecom/admin";
+import { createWecomClient, runtimeCache, runtimeHttp } from "../src/app/api/auth/_shared/wecom/client";
+import { callbackCreds, configuredKinds, corpIdentity, readBase, readCorpConfig, readSuiteConfig, wecomKinds } from "../src/app/api/auth/_shared/wecom/config";
+import { bytesToB64, utf8Bytes, wecomSignature } from "../src/app/api/auth/_shared/wecom/crypt";
+import { handleSuiteEvent } from "../src/app/api/auth/_shared/wecom/events";
+import { findCorpAuth, findProfile, probeProfile, saveProfile } from "../src/app/api/auth/_shared/wecom/store";
 import { installDb } from "./fixture";
 
 const g = globalThis as any;
@@ -209,8 +209,8 @@ function stubUpstream(opts: { depts?: Array<{ id: string, name?: string }>, memb
 	return { calls };
 }
 
-const wecomApi = async () => (await import("../src/auth/api/wecom/api")).default;
-const adminApi = async () => (await import("../src/auth/api/wecom/admin/api")).default;
+const wecomApi = async () => (await import("../src/app/api/auth/wecom/api")).default;
+const adminApi = async () => (await import("../src/app/api/auth/wecom/admin/api")).default;
 
 /** 回调 timestamp 必须新鲜：重放守卫拒 ±5 分钟以外的报文，用固定值会让整段用例假红 */
 const nowSecs = () => String(Math.floor(Date.now() / 1000));

package/templates/tests/wecom-crypt.spec.ts

@@ -17,7 +17,7 @@ import {
 	unwrapWecomMessage,
 	utf8Bytes,
 	wecomSignature,
-} from "../src/auth/api/_shared/wecom/crypt";
+} from "../src/app/api/auth/_shared/wecom/crypt";
 
 const req = createRequire(import.meta.url);
 const nodeCrypto = req("node:crypto") as typeof import("node:crypto");

package/templates/tests/wecom-endpoints.spec.ts

@@ -11,7 +11,7 @@
 import { Buffer } from "node:buffer";
 import { createCipheriv, webcrypto } from "node:crypto";
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { bytesToB64, sha1Hex, utf8Bytes, wecomSignature } from "../src/auth/api/_shared/wecom/crypt";
+import { bytesToB64, sha1Hex, utf8Bytes, wecomSignature } from "../src/app/api/auth/_shared/wecom/crypt";
 import { installDb } from "./fixture";
 
 const g = globalThis as any;
@@ -147,7 +147,7 @@ function seedCorp(corpId = "ww_corp_a", agentId = "100001"): void {
 		.run(SUITE, corpId, agentId, corpId, `gcm(perm_${corpId})`);
 }
 
-const api = async () => (await import("../src/auth/api/wecom/api")).default;
+const api = async () => (await import("../src/app/api/auth/wecom/api")).default;
 
 beforeAll(() => {
 	dbo = installDb();

package/templates/tests/wecom-landing.spec.ts

@@ -5,7 +5,7 @@
 //   · 参数要裁剪、要能容忍少了 tenant（此时沿用本地租户，不是登录失败）；
 //   · 授权入口即使没填企业代码也要跳（后端会回 400 说明缺什么，比前端静默不动好排查）。
 import { describe, expect, it } from "vitest";
-import { parseWecomLanding, wecomAuthorizePath } from "../src/login/web/wecom";
+import { parseWecomLanding, wecomAuthorizePath } from "../src/app/web/login/wecom";
 
 describe("p2-A：回跳落地参数解析", () => {
 	it("带齐 ticket 与 tenant → 解析出两者", () => {

package/templates/tests/wecom-org-sync.spec.ts

@@ -9,15 +9,15 @@
 //   · **登录自更新节流**：上万员工每天登录，不节流就是把 user/get 打成常驻流量；
 //     但 `user/get` 拿不到（无权限/不在可见范围）时**不能**写节流键，否则这一整天都补不上资料。
 //   · **D10 不建占位部门**：登录路径若能顺手建部门，任何成员都能凭空造出组织节点。
-import type { WecomCache, WecomHttp } from "../src/auth/api/_shared/wecom/client";
-import type { WecomStoreDeps } from "../src/auth/api/_shared/wecom/store";
+import type { WecomCache, WecomHttp } from "../src/app/api/auth/_shared/wecom/client";
+import type { WecomStoreDeps } from "../src/app/api/auth/_shared/wecom/store";
 
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { upsertDepartment } from "../src/_platform/api/_shared/service/domain/org";
-import { createWecomClient, WecomApiError } from "../src/auth/api/_shared/wecom/client";
-import { handleSuiteEvent } from "../src/auth/api/_shared/wecom/events";
-import { SELF_UPDATE_TTL_SECS, selfUpdate } from "../src/auth/api/_shared/wecom/login";
-import { findProfile, probeProfile, putSuiteTicket, saveProfile, setProfileStatus } from "../src/auth/api/_shared/wecom/store";
+import { upsertDepartment } from "../src/app/api/_platform/_shared/service/domain/org";
+import { createWecomClient, WecomApiError } from "../src/app/api/auth/_shared/wecom/client";
+import { handleSuiteEvent } from "../src/app/api/auth/_shared/wecom/events";
+import { SELF_UPDATE_TTL_SECS, selfUpdate } from "../src/app/api/auth/_shared/wecom/login";
+import { findProfile, probeProfile, putSuiteTicket, saveProfile, setProfileStatus } from "../src/app/api/auth/_shared/wecom/store";
 import { installDb } from "./fixture";
 
 /* eslint-disable test/prefer-lowercase-title -- D/AC 编号是验收锚点，保留大写 */

package/templates/tests/wecom-sync.spec.ts

@@ -5,11 +5,11 @@
 //   · 权限类错码是「跳过并计数」——一旦有跳过就**不许回收**（否则一次上游抖会被读成「部门被删」）；
 //   · 限流/可恢复致命错要停在原部门（游标不前进），下一次重试同一部门；
 //   · 本地建的部门/成员一根毛都不碰（D13 归属权）。
-import type { WecomClient, WecomMember } from "../src/auth/api/_shared/wecom/client";
+import type { WecomClient, WecomMember } from "../src/app/api/auth/_shared/wecom/client";
 
 import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { WecomApiError } from "../src/auth/api/_shared/wecom/client";
-import { attachProfile, cancelSync, emptyView, startSync, syncStatus } from "../src/auth/api/_shared/wecom/sync";
+import { WecomApiError } from "../src/app/api/auth/_shared/wecom/client";
+import { attachProfile, cancelSync, emptyView, startSync, syncStatus } from "../src/app/api/auth/_shared/wecom/sync";
 import { installDb } from "./fixture";
 
 /* eslint-disable test/prefer-lowercase-title -- D/AC 编号是验收锚点，保留大写 */

package/templates/tsconfig.paths.json

@@ -1,18 +1,18 @@
-// 由 ojm 生成：ojm init / ojm build / ojm dev 会按 src/*/api/manifest.yaml 重写本文件，请勿手改。
+// 由 ojm 生成：ojm init / ojm build / ojm dev 会按模块清单重写本文件，请勿手改。
 //
-// oj 别名 `#/<模块名>/…` 锚在目标模块根（本布局下即 src/<模块名>/api）。tsconfig 的
-// paths 只能静态全局映射，且每条规则的替换值只允许一个 `*`（`./src/*/api/*` 会被 TS
-// 以 TS5062 拒掉），故按模块逐条枚举。
+// oj 别名 `#/<模块名>/…` 锚在目标模块根（src/<模块名>/api 或 src/app/api/<模块名>）。
+// tsconfig 的 paths 只能静态全局映射，且每条规则的替换值只允许一个 `*`（`./src/*/api/*`
+// 会被 TS 以 TS5062 拒掉），故按模块逐条枚举。
 {
 	"compilerOptions": {
 		"paths": {
-			"#/_platform/*": ["./src/_platform/api/*"],
-			"#/auth/*": ["./src/auth/api/*"],
-			"#/home/*": ["./src/home/api/*"],
-			"#/notification/*": ["./src/notification/api/*"],
-			"#/personal-center/*": ["./src/personal-center/api/*"],
-			"#/system/*": ["./src/system/api/*"],
-			"#/web/*": ["./src/web/api/*"]
+			"#/_platform/*": ["./src/app/api/_platform/*"],
+			"#/auth/*": ["./src/app/api/auth/*"],
+			"#/home/*": ["./src/app/api/home/*"],
+			"#/notification/*": ["./src/app/api/notification/*"],
+			"#/personal-center/*": ["./src/app/api/personal-center/*"],
+			"#/system/*": ["./src/app/api/system/*"],
+			"#/web/*": ["./src/app/api/web/*"]
 		}
 	}
 }

package/templates/vitest.config.ts

@@ -7,13 +7,13 @@ const srcDir = fileURLToPath(new URL("./src", import.meta.url));
 
 export default defineConfig({
 	root: fileURLToPath(new URL(".", import.meta.url)),
-	// `#/<模块名>/…` 是 oj 的模块别名（锚在目标模块根，本布局下即 `src/<模块名>/api`）。
+	// `#/<模块名>/…` 是 oj 的模块别名（锚在目标模块根，0.2.55 布局下即 `src/app/api/<模块名>`）。
 	// oj build / ojm dev 在打包器里解析它，vitest 走 vite 的 resolve，必须在此显式映射，
 	// 否则跨模块 import 的后端 spec 会以「Cannot find module」整文件跳过。
 	// 形如 `#x`（锚本模块根）与导入方相对，静态 alias 表达不了——模板后端不用这种形态，
 	// 一旦引入需先补 vitest 侧解析（或改写成 `#/<模块名>/…`）。
 	resolve: {
-		alias: [{ find: /^#\/([^/]+)\/(.*)$/, replacement: `${srcDir}/$1/api/$2` }],
+		alias: [{ find: /^#\/([^/]+)\/(.*)$/, replacement: `${srcDir}/app/api/$1/$2` }],
 	},
 	test: {
 		include: ["tests/**/*.spec.ts"],

package/templates/web.config.ts

@@ -45,14 +45,17 @@ export default {
 	/**
 	 * 生成 client 的归属模块：`api 前缀 → 承载其 __client 的 web 模块`。
 	 *
-	 * 多根聚合模块把多个业务域的页面/client 收进 `src/app/web`，故五个 api 前缀的
-	 * 生成物都落在 `src/app/web/<api 前缀>/__client`（与页面同级，页面相对导入不变）。
+	 * 框架内置后端全部收在 `src/app/api/<前缀>`（模块名即 URL 前缀），前端页面收在
+	 * `src/app/web`；生成物统一落 `src/app/web/<api 前缀>/__client`，页面相对导入不变。
 	 * 不配则回落同名模块（`src/<api 前缀>/web/__client`，历史行为）。
 	 */
 	clientOwners: {
+		"_platform": "app",
+		"auth": "app",
 		"home": "app",
 		"personal-center": "app",
 		"notification": "app",
 		"system": "app",
+		"web": "app",
 	},
 };

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

package/templates/src/{auth/api → app/api/auth}/_shared/wecom/admin.ts

@@ -13,8 +13,8 @@ import type { WecomConfig, WecomCorpConfig, WecomKind } from "./config";
 import type { WecomStoreDeps } from "./store";
 import { invalidateAllUsers } from "#/_platform/_shared/service/infra/access";
 import { assertProviderConfig, eventUrlOf } from "./config";
-import { provisionTenantAdmin } from "./tenant-admin";
 import { corpScope, revokeTenantSessions, saveProfile, tenantOfCorp } from "./store";
+import { provisionTenantAdmin } from "./tenant-admin";
 
 export interface WecomAdminDeps {
 	client: WecomClient

package/templates/src/{auth/api → app/api/auth}/_shared/wecom/events.ts

@@ -21,8 +21,8 @@ import { invalidateAllUsers } from "#/_platform/_shared/service/infra/access";
 import { recordOp } from "#/_platform/_shared/service/infra/audit";
 import { handleContactChange } from "./contacts";
 import { callbackFields, field, requireField } from "./payload";
-import { provisionTenantAdmin } from "./tenant-admin";
 import { corpScope, ensureTenant, findCorpAuth, getSuiteTicket, putSuiteTicket, revokeTenantSessions, saveProfile, setAuthMode, setProfileStatus, tenantOfCorp } from "./store";
+import { provisionTenantAdmin } from "./tenant-admin";
 
 /** suite_ticket 官方有效期 30 分钟（10 分钟推一次）；本地按 30 分钟作废，宁可拒一次也不拿过期票打企微 */
 const SUITE_TICKET_TTL_SECS = 30 * 60;