@oj-module/cli 0.2.6 → 0.2.14

package/templates/api/src/notification/_shared/notify.ts

@@ -51,6 +51,7 @@ interface Row {
 interface NotifyDb {
 	query: (sql: string, params?: unknown[]) => Promise<Row[]>
 	exec: (sql: string, params?: unknown[]) => Promise<number>
+	table: DBInstance["table"]
 }
 declare const db: NotifyDb;
 
@@ -68,12 +69,17 @@ function splitId(id: string): [scope: "u" | "b", raw: string] {
 function mapItem(r: Row): NoticeItem {
 	const scope = String(r.scope);
 	const isBroadcast = scope === "broadcast";
+	// UNION 结果列名取首分支（userQ）=> 位置 4 名为 is_read。按人项此处即存储整数列；
+	// 广播项此处实际承载回执 read_time（非空即已读，与原始 SQL 的 (read_time IS NOT NULL AND <> '') 等价）。
+	const isRead = isBroadcast
+		? (r.is_read != null && String(r.is_read) !== "")
+		: Number(r.is_read) === 1;
 	return {
 		id: (isBroadcast ? "b:" : "u:") + String(r.id),
 		scope: isBroadcast ? "broadcast" : "user",
 		avatar: String(r.avatar ?? ""),
 		date: String(r.date ?? ""),
-		isRead: Number(r.is_read) === 1,
+		isRead,
 		message: String(r.message ?? ""),
 		title: String(r.title ?? ""),
 		link: r.link == null ? undefined : String(r.link),
@@ -83,58 +89,53 @@ function mapItem(r: Row): NoticeItem {
 
 /** 给指定用户推一条按人通知，返回命名空间 id "u:<id>" */
 export async function pushNotice(input: PushInput): Promise<string> {
-	const ins = await db.query(
-		`INSERT INTO notifications (user_id, avatar, date, is_read, message, title, link, category)
-		 VALUES (?, ?, ?, 0, ?, ?, ?, ?) RETURNING id`,
-		[
-			Number(input.userId),
-			input.avatar ?? "",
-			nowStr(),
-			input.message,
-			input.title,
-			input.link ?? null,
-			input.category ?? "notice",
-		],
-	);
+	const ins = await db.table("notifications").insert({
+		user_id: Number(input.userId),
+		avatar: input.avatar ?? "",
+		date: nowStr(),
+		is_read: 0,
+		message: input.message,
+		title: input.title,
+		link: input.link ?? null,
+		category: input.category ?? "notice",
+	}).returning(["id"]).run() as Array<{ id: number }>;
 	return `u:${Number(ins[0]!.id)}`;
 }
 
 /** 广播一条通知（全员可见，一行存储），返回命名空间 id "b:<id>" */
 export async function pushBroadcastNotice(input: PushBroadcastInput): Promise<string> {
-	const ins = await db.query(
-		`INSERT INTO notifications_broadcast (avatar, date, message, title, link, category, create_time)
-		 VALUES (?, ?, ?, ?, ?, ?, ?) RETURNING id`,
-		[
-			input.avatar ?? "",
-			nowStr(),
-			input.message,
-			input.title,
-			input.link ?? null,
-			input.category ?? "notice",
-			nowStr(),
-		],
-	);
+	const ins = await db.table("notifications_broadcast").insert({
+		avatar: input.avatar ?? "",
+		date: nowStr(),
+		message: input.message,
+		title: input.title,
+		link: input.link ?? null,
+		category: input.category ?? "notice",
+		create_time: nowStr(),
+	}).returning(["id"]).run() as Array<{ id: number }>;
 	return `b:${Number(ins[0]!.id)}`;
 }
 
 /**
- * 删除通知。按人项校验归属：非本人返回 false；广播项仅删本人回执（幂等，返回 true）。
+ * 删除通知。按人项校验归属：非本人返回 false；广播项是共享行，物理删除会影响
+ * 其他收件人——落「对我隐藏」标记（幂等，返回 true），列表查询过滤 hidden 命中项。
  * 返回是否成功操作到目标（调用方据 false 判 403）。
  */
 export async function delNotice(id: string, userId: string | number): Promise<boolean> {
 	const [scope, raw] = splitId(id);
 	const uid = Number(userId);
 	if (scope === "b") {
-		await db.exec(
-			"DELETE FROM notifications_broadcast_read WHERE broadcast_id = ? AND user_id = ?",
-			[Number(raw), uid],
-		);
+		await db.table("notifications_broadcast_hidden")
+			.insert({ broadcast_id: Number(raw), user_id: uid, create_time: nowStr() })
+			.orIgnore()
+			.run();
 		return true;
 	}
-	const n = await db.exec(
-		"DELETE FROM notifications WHERE id = ? AND user_id = ?",
-		[Number(raw), uid],
-	);
+	const n = await db.table("notifications")
+		.where({ field: "id", op: "eq", value: Number(raw) })
+		.where({ field: "user_id", op: "eq", value: uid })
+		.delete()
+		.run() as number;
 	return n > 0;
 }
 
@@ -146,18 +147,43 @@ export async function noticesFor(
 	const limit = opts.limit ?? 50;
 	const offset = opts.offset ?? 0;
 	const uid = Number(userId);
-	const rows = await db.query(
-		`SELECT id, avatar, date, is_read, message, title, link, category, 'user' as scope
-		   FROM notifications WHERE user_id = ?
-		 UNION ALL
-		 SELECT b.id, b.avatar, b.date, (r.read_time IS NOT NULL AND r.read_time <> '') as is_read,
-		        b.message, b.title, b.link, b.category, 'broadcast' as scope
-		   FROM notifications_broadcast b
-		   LEFT JOIN notifications_broadcast_read r ON r.broadcast_id = b.id AND r.user_id = ?
-		 ORDER BY date DESC
-		 LIMIT ? OFFSET ?`,
-		[uid, uid, limit, offset],
-	);
+	// 构造器（v0.1.81）：UNION ALL 合并「按人」与「广播(LEFT JOIN 回执)」；lit 打固定 scope 标记列，
+	// 顶层 orderBy/limit/offset 跨方言一致。
+	// 注意：UNION 结果列名取首分支(userQ)，故两分支位置对齐即可——广播第 4 列取回执 read_time，
+	// 经 union 落到 is_read 列名下，是否「已读」由 mapItem 据非空推导（与原始 SQL 同源）。
+	const userQ = db.table("notifications").select([
+		"id",
+		"avatar",
+		"date",
+		"is_read",
+		"message",
+		"title",
+		"link",
+		"category",
+		{ lit: "user", as: "scope" },
+	]).where({ field: "user_id", op: "eq", value: uid });
+	const broadcastQ = db.table("notifications_broadcast").as("b").join("notifications_broadcast_read", [
+		{ left: "b.id", right: "r.broadcast_id" },
+		{ left: "r.user_id", op: "eq", value: uid },
+	], "left", "r").join("notifications_broadcast_hidden", [
+		{ left: "b.id", right: "h.broadcast_id" },
+		{ left: "h.user_id", op: "eq", value: uid },
+	], "left", "h").where({ field: "h.id", op: "isnull" }).select([
+		"b.id",
+		"b.avatar",
+		"b.date",
+		"r.read_time",
+		"b.message",
+		"b.title",
+		"b.link",
+		"b.category",
+		{ lit: "broadcast", as: "scope" },
+	]);
+	const rows = await userQ.union(broadcastQ, "all")
+		.orderBy([{ field: "date", dir: "desc" }])
+		.limit(limit)
+		.offset(offset)
+		.all();
 	return rows.map(mapItem);
 }
 
@@ -170,13 +196,18 @@ export async function markRead(id: string, userId: string | number): Promise<boo
 	const uid = Number(userId);
 	const now = nowStr();
 	if (scope === "b") {
-		await db.exec(
-			"INSERT OR IGNORE INTO notifications_broadcast_read (broadcast_id, user_id, read_time) VALUES (?, ?, ?)",
-			[Number(raw), uid, now],
-		);
+		// 构造器（v0.1.81）：orIgnore 幂等写入（sqlite/pg → ON CONFLICT DO NOTHING；mysql → ON DUPLICATE KEY UPDATE pk=pk）。
+		await db.table("notifications_broadcast_read")
+			.insert({ broadcast_id: Number(raw), user_id: uid, read_time: now })
+			.orIgnore()
+			.run();
 		return true;
 	}
-	const n = await db.exec("UPDATE notifications SET is_read = 1 WHERE id = ? AND user_id = ?", [Number(raw), uid]);
+	const n = await db.table("notifications")
+		.where({ field: "id", op: "eq", value: Number(raw) })
+		.where({ field: "user_id", op: "eq", value: uid })
+		.update({ is_read: 1 })
+		.run() as number;
 	return n > 0;
 }
 
@@ -184,16 +215,25 @@ export async function markRead(id: string, userId: string | number): Promise<boo
 export async function markAllRead(userId: string | number): Promise<void> {
 	const uid = Number(userId);
 	const now = nowStr();
-	await db.exec("UPDATE notifications SET is_read = 1 WHERE user_id = ?", [uid]);
+	await db.table("notifications").where({ field: "user_id", op: "eq", value: uid }).update({ is_read: 1 }).run();
+	// 保留 db.exec：INSERT OR IGNORE ... SELECT 在 sqlite 上构造器无法表达——
+	// oj 0.1.81 的 orIgnore 仅跟随 VALUES 的 upsert 子句，不与 fromSelect(SELECT 源) 组合
+	// （实测：code 500 "orIgnore with fromSelect is not supported on sqlite"）。原 SQL 三方言通用
+	// （sqlite OR IGNORE / pg ON CONFLICT DO NOTHING / mysql ON DUPLICATE KEY），退回裸 SQL。
 	await db.exec(
 		"INSERT OR IGNORE INTO notifications_broadcast_read (broadcast_id, user_id, read_time) SELECT id, ?, ? FROM notifications_broadcast",
 		[uid, now],
 	);
 }
 
-/** 清空：删按人项 + 删本人广播回执（列表消失） */
+/** 清空：删按人项 + 广播逐条落「对我隐藏」标记（共享行不可物理删，他人不受影响） */
 export async function clearNotices(userId: string | number): Promise<void> {
 	const uid = Number(userId);
-	await db.exec("DELETE FROM notifications WHERE user_id = ?", [uid]);
-	await db.exec("DELETE FROM notifications_broadcast_read WHERE user_id = ?", [uid]);
+	await db.table("notifications").where({ field: "user_id", op: "eq", value: uid }).delete().run();
+	// 保留 db.exec：INSERT OR IGNORE ... SELECT 同 markAllRead（构造器 orIgnore 不与
+	// fromSelect 组合，实测 500），原 SQL 三方言通用。
+	await db.exec(
+		"INSERT OR IGNORE INTO notifications_broadcast_hidden (broadcast_id, user_id, create_time) SELECT id, ?, ? FROM notifications_broadcast",
+		[uid, nowStr()],
+	);
 }

package/templates/api/src/notification/api.ts

@@ -72,7 +72,7 @@ const notifications = {
 		},
 	},
 	// POST /api/notification/notifications/clear —— 清空通知（按当前用户）。
-	// 删按人项 + 删本人广播回执（列表消失）。
+	// 删按人项 + 广播逐条落「对我隐藏」标记（共享行不可物理删，他人不受影响）。
 	"clear": {
 		async post() {
 			const uid = http.user?.id;

package/templates/api/src/notification/manifest.yaml

@@ -5,3 +5,4 @@ tables:
   - notifications
   - notifications_broadcast
   - notifications_broadcast_read
+  - notifications_broadcast_hidden

package/templates/api/src/notification/migrations/0004__notifications_broadcast_hidden.sql

@@ -0,0 +1,12 @@
+-- 广播隐藏标记表（按人）：清空/单条删除广播项时落标记——广播本体是共享行，
+-- 任何人不得物理删除（会影响其他收件人），只能「对我隐藏」。
+-- 清空 = 按人项物理删 + 广播逐条落 hidden 标记；列表查询过滤 hidden 命中项。
+-- 三方言可移植：建表 + 索引均为标准 DDL。
+CREATE TABLE IF NOT EXISTS notifications_broadcast_hidden (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  broadcast_id INTEGER NOT NULL,
+  user_id INTEGER NOT NULL,
+  create_time TEXT NOT NULL DEFAULT ''
+);
+
+CREATE INDEX IF NOT EXISTS idx_broadcast_hidden ON notifications_broadcast_hidden (user_id, broadcast_id);

package/templates/api/src/notification/schema.yaml

@@ -31,3 +31,10 @@ tables:
       broadcast_id: {type: integer, null: false}
       user_id: {type: integer, null: false}
       read_time: {type: text, null: false}
+  notifications_broadcast_hidden:
+    pk: id
+    columns:
+      id: {type: integer, autoincrement: true}
+      broadcast_id: {type: integer, null: false}
+      user_id: {type: integer, null: false}
+      create_time: {type: text, null: false}

package/templates/api/src/notification/seed.sql

@@ -1,6 +1,7 @@
 -- notification 模块种子（按人真实通知）。user_id=1（admin），link/category 幂等可空/默认。
+-- avatar 给真实 URL：铃铛按 avatar 渲染头像，空串会破图（空串仅作为运行时兜底，不作为种子值）。
 -- 按分号朴素切分（S006）：语句内不得含分号字面量。
-INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (1, 1, '', '2026-09-01 09:12', 0, '脚手架已就绪，用 admin / 123456 登录开始', '欢迎', NULL, 'notice');
-INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (2, 1, '', '2026-09-02 14:30', 0, '通知铃支持单条已读、全部已读与清空；广播经 push-broadcast 入 b: 命名空间', '通知铃', NULL, 'notice');
-INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (3, 1, '', '2026-09-03 18:45', 1, '契约改动后重跑 ojm api 生成前端 client 与文档', '契约', NULL, 'notice');
-INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (4, 1, '', '2026-09-04 08:00', 0, '编辑 api/src 下的 api.ts 保存即热更；handler 组支持四层嵌套（oj v0.1.64）', '开发提示', NULL, 'notice');
+INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (1, 1, 'https://avatar.vercel.sh/seed-welcome.svg?text=W', '2026-09-01 09:12', 0, '脚手架已就绪，用 admin / 123456 登录开始', '欢迎', NULL, 'notice');
+INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (2, 1, 'https://avatar.vercel.sh/seed-bell.svg?text=B', '2026-09-02 14:30', 0, '通知铃支持单条已读、全部已读与清空；广播经 push-broadcast 入 b: 命名空间', '通知铃', NULL, 'notice');
+INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (3, 1, 'https://avatar.vercel.sh/seed-contract.svg?text=C', '2026-09-03 18:45', 1, '契约改动后重跑 ojm api 生成前端 client 与文档', '契约', NULL, 'notice');
+INSERT OR IGNORE INTO notifications (id, user_id, avatar, date, is_read, message, title, link, category) VALUES (4, 1, 'https://avatar.vercel.sh/seed-dev.svg?text=D', '2026-09-04 08:00', 0, '编辑 api/src 下的 api.ts 保存即热更；handler 组支持四层嵌套（oj v0.1.64）', '开发提示', NULL, 'notice');

package/templates/api/src/personal-center/profile/api.ts

@@ -0,0 +1,63 @@
+// POST /api/personal-center/profile —— 保存「我的资料」（个人中心表单入库端点）。
+// 只允许改本人行（http.user.id 权威，不接受 body 传 id）；username 全局唯一，
+// 重名 400；avatar 走 upload 端点（multipart），不在此通道。
+const handler = {
+	async post() {
+		const uid = http.user?.id;
+		if (!uid) {
+			json.fail(401, "unauthorized");
+			return;
+		}
+		const b = (http.body ?? {}) as {
+			username?: unknown
+			email?: unknown
+			phoneNumber?: unknown
+			description?: unknown
+		};
+		const patch: Record<string, string> = {};
+		if (b.username != null && String(b.username).trim() !== "") {
+			const username = String(b.username).trim();
+			const dup = await db.table("users").select(["id"]).where({ field: "username", op: "eq", value: username }).all();
+			if (dup.some(r => Number(r.id) !== Number(uid))) {
+				json.fail(400, "username already taken");
+				return;
+			}
+			patch.username = username;
+		}
+		if (b.email != null)
+			patch.email = String(b.email);
+		if (b.phoneNumber != null)
+			patch.phone_number = String(b.phoneNumber);
+		if (b.description != null)
+			patch.description = String(b.description);
+		if (Object.keys(patch).length === 0) {
+			json.fail(400, "nothing to update");
+			return;
+		}
+		try {
+			await db.table("users").update(patch).where({ field: "id", op: "eq", value: Number(uid) }).run();
+			json.ok(null);
+		}
+		catch (e) {
+			json.fail(500, String(e));
+		}
+	},
+};
+
+// 入参：四字段均可选（部分保存允许），类型即字符串。
+handler.post.schema = {
+	body: {
+		type: "object",
+		properties: {
+			username: { type: "string" },
+			email: { type: "string" },
+			phoneNumber: { type: "string" },
+			description: { type: "string" },
+		},
+	},
+};
+
+// 出参：无业务载荷（前端保存后经 user-info 重拉刷新 store）。
+handler.post.response = { type: "null" };
+
+export default handler;

package/templates/api/src/personal-center/upload/api.ts

@@ -41,7 +41,7 @@ const handler = {
 			const bytes = meta.key ? await blob.get(meta.key) : await http.file(0);
 			const b64 = toBase64(bytes);
 			const dataUrl = `data:${meta.content_type || "application/octet-stream"};base64,${b64}`;
-			await db.exec("UPDATE users SET avatar_base64 = ? WHERE id = ?", [dataUrl, Number(uid)]);
+			await db.table("users").update({ avatar_base64: dataUrl }).where({ field: "id", op: "eq", value: Number(uid) }).run();
 			// 大文件搬运/留档用 blob（v0.1.47）：搬走用 blob.move，别 get + put（字节进 V8）
 			if (meta.key)
 				await blob.del(meta.key);

package/templates/api/src/system/login-methods/api.ts

@@ -1,7 +1,7 @@
 import { respond } from "../../_platform/_shared/respond";
 // GET /api/system/login-methods —— 登录方式发现（C5/D2；匿名端点：登录前无 token，
 // 项目 config.yaml auth.anonymous_paths 必须列 /system/login-methods，漏列则握手 401 登录页必坏）。
-import { listLoginMethods } from "../../_platform/_shared/service/settings";
+import { listLoginMethods } from "../../_platform/_shared/service/domain/settings";
 
 async function get() {
 	await respond(async () => {

package/templates/api/src/system/oplog/api.ts

@@ -1,9 +1,9 @@
 import { respond } from "../../_platform/_shared/respond";
 // GET /api/system/oplog?action=&username=&module=&limit= —— 操作日志查询（AC1-29；D13 admin 可查）。
 // POST /api/system/oplog —— 操作日志写入（C3；登录态即可，解决方案模块记录自身操作）。
-import { assertSystemAdmin, currentAccess } from "../../_platform/_shared/service/access";
-import { recordOp } from "../../_platform/_shared/service/audit";
-import { searchOplog } from "../../_platform/_shared/service/oplog";
+import { assertSystemAdmin, currentAccess } from "../../_platform/_shared/service/infra/access";
+import { recordOp } from "../../_platform/_shared/service/infra/audit";
+import { searchOplog } from "../../_platform/_shared/service/infra/oplog";
 
 async function get() {
 	await respond(async () => {

package/templates/api/src/system/permissions/api.ts

@@ -1,7 +1,7 @@
 import { respond } from "../../_platform/_shared/respond";
+import { listPermissions } from "../../_platform/_shared/service/domain/roles";
 // GET /api/system/permissions —— 权限点全量（C2 绑定编辑器数据源，deprecated 标灰）。
-import { assertSystemAdmin } from "../../_platform/_shared/service/access";
-import { listPermissions } from "../../_platform/_shared/service/roles";
+import { assertSystemAdmin } from "../../_platform/_shared/service/infra/access";
 
 async function get() {
 	await respond(async () => {

package/templates/api/src/system/roles/api.ts

@@ -1,8 +1,8 @@
 import { respond } from "../../_platform/_shared/respond";
+import { createRole, deleteRole, listRoles } from "../../_platform/_shared/service/domain/roles";
 // 管理域端点 /api/system/roles（设计文档 D207：/api/system/* = 管理域，assertSystemAdmin 判权）。
 // handler 层只编排：守卫 → service → json 信封；name 走 query（wiki 先例：静态段 + http.query）。
-import { assertSystemAdmin } from "../../_platform/_shared/service/access";
-import { createRole, deleteRole, listRoles } from "../../_platform/_shared/service/roles";
+import { assertSystemAdmin } from "../../_platform/_shared/service/infra/access";
 
 async function guard(): Promise<void> {
 	await assertSystemAdmin();

package/templates/api/src/system/roles/bindings/api.ts

@@ -1,9 +1,9 @@
 import { respond } from "../../../_platform/_shared/respond";
+import { updateBindings } from "../../../_platform/_shared/service/domain/roles";
 // PUT /api/system/roles/bindings?name=xxx —— 整集替换角色绑定。
 // AC1-18 声明角色绑定可调整；AC1-19 builtin 硬拒（service 层）；AC1-30 摘绑定 = 紧急吊销出口
 // （service 内写后按持有者失效判权缓存）。
-import { assertSystemAdmin } from "../../../_platform/_shared/service/access";
-import { updateBindings } from "../../../_platform/_shared/service/roles";
+import { assertSystemAdmin } from "../../../_platform/_shared/service/infra/access";
 
 async function put() {
 	await respond(async () => {

package/templates/api/src/system/settings/api.ts

@@ -1,7 +1,7 @@
 import { respond } from "../../_platform/_shared/respond";
+import { listSettings, updateSetting } from "../../_platform/_shared/service/domain/settings";
 // /api/system/settings —— 系统设置（PRD §4.3）：GET 按组列出（secret 掩码），PUT 写值（写审计）。
-import { assertSystemAdmin } from "../../_platform/_shared/service/access";
-import { listSettings, updateSetting } from "../../_platform/_shared/service/settings";
+import { assertSystemAdmin } from "../../_platform/_shared/service/infra/access";
 
 const settingItemSchema = {
 	type: "object",

package/templates/api/src/system/users/api.ts

@@ -1,9 +1,9 @@
 import { respond } from "../../_platform/_shared/respond";
+import { createUser, listUsers } from "../../_platform/_shared/service/domain/users";
 // 管理域端点组 /api/system/users（AC1-7~10）：handler 只编排——assertSystemAdmin 守卫 → service → json。
 // 保护红线在 service 层硬 enforcement：禁止操作自己、admin 不碰成员资格、最后 superadmin 兜底。
 // 子端点：roles/password/forbidden 各为独立目录（wiki per-endpoint 先例）。
-import { assertSystemAdmin } from "../../_platform/_shared/service/access";
-import { createUser, listUsers } from "../../_platform/_shared/service/users";
+import { assertSystemAdmin } from "../../_platform/_shared/service/infra/access";
 
 const bcryptDeps = { bcryptHash: (pw: string) => bcrypt.hash(pw) };
 

package/templates/api/src/system/users/forbidden/api.ts

@@ -1,7 +1,7 @@
 import { respond } from "../../../_platform/_shared/respond";
+import { setForbidden } from "../../../_platform/_shared/service/domain/users";
 // PUT /api/system/users/forbidden?uid= —— 禁用/解禁（禁用即删 refresh，撤销即强退）。
-import { assertSystemAdmin } from "../../../_platform/_shared/service/access";
-import { setForbidden } from "../../../_platform/_shared/service/users";
+import { assertSystemAdmin } from "../../../_platform/_shared/service/infra/access";
 
 async function put() {
 	await respond(async () => {

package/templates/api/src/system/users/password/api.ts

@@ -1,7 +1,7 @@
 import { respond } from "../../../_platform/_shared/respond";
+import { changePasswordByAdmin } from "../../../_platform/_shared/service/domain/users";
 // PUT /api/system/users/password?uid= —— 管理员重置口令（must_change=1 + 级联吊销 refresh）。
-import { assertSystemAdmin } from "../../../_platform/_shared/service/access";
-import { changePasswordByAdmin } from "../../../_platform/_shared/service/users";
+import { assertSystemAdmin } from "../../../_platform/_shared/service/infra/access";
 
 async function put() {
 	await respond(async () => {

package/templates/api/src/system/users/roles/api.ts

@@ -1,7 +1,7 @@
 import { respond } from "../../../_platform/_shared/respond";
+import { updateUserRoles } from "../../../_platform/_shared/service/domain/users";
 // PUT /api/system/users/roles?uid= —— 整集替换用户角色（AC1-7；sys_user_role 权威源 + 写时失效）。
-import { assertSystemAdmin } from "../../../_platform/_shared/service/access";
-import { updateUserRoles } from "../../../_platform/_shared/service/users";
+import { assertSystemAdmin } from "../../../_platform/_shared/service/infra/access";
 
 async function put() {
 	await respond(async () => {

package/templates/api/src/web/user-info/api.ts

@@ -10,22 +10,21 @@ export default {
 			return;
 		}
 		try {
-			const rows = await db.query(
-				"SELECT id, username, display_name, avatar_base64, email, must_change FROM users WHERE id = ?",
-				[Number(uid)],
-			);
+			const rows = await db.table("users").select(["id", "username", "display_name", "avatar_base64", "email", "phone_number", "description", "must_change"]).where({ field: "id", op: "eq", value: Number(uid) }).all();
 			const row = rows[0];
 			if (!row) {
 				json.fail(404, "user not found");
 				return;
 			}
-			const roleRows = await db.query("SELECT role_name FROM sys_user_role WHERE user_id = ?", [Number(uid)]) as Array<{ role_name: string }>;
+			const roleRows = await db.table("sys_user_role").select(["role_name"]).where({ field: "user_id", op: "eq", value: Number(uid) }).all() as Array<{ role_name: string }>;
 			json.ok({
 				id: String(row.id),
 				avatar: String(row.avatar_base64 ?? ""),
 				username: String(row.username),
 				displayName: row.display_name == null ? "" : String(row.display_name),
 				email: String(row.email ?? ""),
+				phoneNumber: row.phone_number == null ? "" : String(row.phone_number),
+				description: row.description == null ? "" : String(row.description),
 				roles: roleRows.map(r => r.role_name),
 				mustChange: Number(row.must_change) === 1,
 				permissions: [],

package/templates/api/tests/auth-session.spec.ts

@@ -4,7 +4,7 @@
 import type { SessionDeps } from "../src/auth/_shared/session";
 
 import { afterEach, beforeAll, describe, expect, it } from "vitest";
-import { assertPermission } from "../src/_platform/_shared/service/access";
+import { assertPermission } from "../src/_platform/_shared/service/infra/access";
 import { createSession } from "../src/auth/_shared/session";
 import { installDb } from "./fixture";
 

package/templates/api/tests/auth-throttle.spec.ts

@@ -5,7 +5,7 @@
 /* eslint-disable test/prefer-lowercase-title -- AC 编号是验收锚点，保留大写 */
 import { afterEach, beforeAll, describe, expect, it } from "vitest";
 
-import { loginBlocked, loginFailed, loginSucceeded, resetLoginThrottle } from "../src/_platform/_shared/service/rate";
+import { loginBlocked, loginFailed, loginSucceeded, resetLoginThrottle } from "../src/_platform/_shared/service/infra/rate";
 import { installDb } from "./fixture";
 
 let dbo: ReturnType<typeof installDb>;

package/templates/api/tests/fixture.ts

@@ -1,6 +1,14 @@
 // 后端 BDD 夹具：node:sqlite 内存库 + **真实迁移文件**建表，装到 globalThis.db——
 // 与 oj 运行时注入的全局同名同面（query/exec/tx/dialect），service 代码不改一行即可被测。
 // 夹具直接读 api/src/<模块>/migrations/*.sql，与迁移不可能漂移（沿用 oj-wiki 先例）。
+//
+// **构造器边界（架构定论，勿在此夹具里补 table()）**：db.table()/listTables() 等构造器是
+// oj 二进制内的纯 Rust 实现，无 JS 模块可导出，Node 侧垫不出来——本夹具刻意只给
+// {query, exec, tx, dialect}。两层测试的分工因此定型：
+//   · L2（本目录 *.spec.ts）：构造器面用**记录型假 builder**（记 where/orderBy/limit 调用
+//     序列做编排断言）；真 SQL 执行断言走 db.query 直查。
+//   · L1（同目录 *.test.ts，`oj test` 收集）：真 v8 + 真构造器闭环，守 SQL 渲染/过滤/转义
+//     的真执行面（样板见 tests/l1-builder.test.ts；方法论见 devkit oj-test-guide.md）。
 import { createRequire } from "node:module";
 
 const req = createRequire(import.meta.url);
@@ -13,22 +21,6 @@ const SRC = join(dirname(fileURLToPath(import.meta.url)), "..", "src");
 
 export const ADMIN = 1;
 
-/**
- * market_history 同构 DDL：表真源 = 市场方案包自带迁移（oj-market 0002__market_history），
- * 不属平台迁移（installDb 不回放）——需要断言留痕的用例显式执行；守卫语义（表不存在静默跳过）
- * 另有专项用例钉住。
- */
-export const MARKET_HISTORY_DDL = `CREATE TABLE market_history (
-	id INTEGER PRIMARY KEY AUTOINCREMENT,
-	solution TEXT NOT NULL,
-	version TEXT NOT NULL,
-	action TEXT NOT NULL,
-	status TEXT NOT NULL,
-	operator TEXT,
-	message TEXT,
-	created_at INTEGER NOT NULL
-)`;
-
 /** 建内存库 + 注入全局；返回 DatabaseSync 供用例直插数据/断言。 */
 export function installDb(): any {
 	const dbo = new DatabaseSync(":memory:");

package/templates/api/tests/guard.spec.ts

@@ -3,7 +3,7 @@
 // （真实迁移建表 / 运行时全局 db 同面 / 事务往返）——S0 spike 的「一条真实判权 AC + 形态证明」。
 import { beforeAll, describe, expect, it } from "vitest";
 
-import { decideAccess, moduleOf } from "../src/_platform/_shared/service/guard";
+import { decideAccess, moduleOf } from "../src/_platform/_shared/service/infra/guard";
 import { ADMIN, installDb } from "./fixture";
 
 const as = (roles: string[], bindings: Record<string, string[]> = {}) => ({ roles, bindings });