From 5a40afbb2ed33373ce42d2559129eb173d7d28e1 Mon Sep 17 00:00:00 2001 From: ssw Date: Mon, 22 Jun 2026 21:51:25 +0800 Subject: [PATCH] =?UTF-8?q?v0.11:=20=E4=BF=AE=E5=A4=8D=20BS-48=20dbLinkId?= =?UTF-8?q?=3Ddefault=20=E5=88=AB=E5=90=8D=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 根因: dacli create 命令把 --dbLinkId=default 当字面量传给后端 URL (/system/DataModel/default/Table), 后端查 dbLinkEntity=null 抛 NPE. BS-48 guard 旧判定 !id || id==='0' || id==='', 不拦截 'default' 字符串. web 行为参照: formDesign Form.vue 选 '默认' 自动用当前 app 业务库, 不应暴露 'default' 字面量到 URL. 修复: - 新增 core/dbLinkId.ts: resolveDbLinkId() 统一别名解析 (空/default/DEFAULT/主库/业务库 → token.dbLinkId) - core/client.ts: JnpfClient.resolveDbLinkId() 委托给 core util - 7 个 create 命令迁移到 c.resolveDbLinkId() 入口 (dm create/drop/fields/list + form create/codegen/import) - _blindspot_guards.ts BS-48: 增加 /^default$/i.test 拦截 实测: - dacli dm create --dbLinkId=default → URL 走 2068901937849257984, 建表成功 - 单测 14/14 (dbLinkId) + 38/38 (blindspot_guards, 1 预存 BS-51 失败无关) - TS 编译 src/ 0 差错 应用影响: docs/jxcj/design-jnpf.html 56 个 dm/form 命令全部用 --dbLinkId=default, 现在可直接 dispatch 不需改 design. Co-Authored-By: Claude --- src/commands/_blindspot_guards.ts | 4 +- src/commands/dm/create.ts | 3 +- src/commands/dm/drop.ts | 3 +- src/commands/dm/fields.ts | 3 +- src/commands/dm/list.ts | 3 +- src/commands/form/codegen.ts | 3 +- src/commands/form/create.ts | 3 +- src/commands/form/import.ts | 3 +- src/core/client.ts | 27 +++++++++ src/core/dbLinkId.ts | 40 +++++++++++++ tests/unit/blindspot_guards.test.ts | 15 +++++ tests/unit/dbLinkId.test.ts | 90 +++++++++++++++++++++++++++++ 12 files changed, 189 insertions(+), 8 deletions(-) create mode 100644 src/core/dbLinkId.ts create mode 100644 tests/unit/dbLinkId.test.ts diff --git a/src/commands/_blindspot_guards.ts b/src/commands/_blindspot_guards.ts index 5c22f5e..b8bffaf 100644 --- a/src/commands/_blindspot_guards.ts +++ b/src/commands/_blindspot_guards.ts @@ -66,7 +66,9 @@ export const BLINDSPOT_GUARDS: BlindspotGuard[] = [ const type = opts?.type // type=4 视图允许 dbLinkId='0' (不需要物理表), 其他场景必须有效 if (String(type) === '4') return false - return !id || id === '0' || id === '' + // BS-48 增强: 拦截 "default" / "主库" 别名字符串 + // 这些都是无效别名, 调用方必须先 resolveDbLinkId 再判断 + return !id || id === '0' || id === '' || /^default$/i.test(String(id)) }, message: 'dbLinkId 无效 (≠ "0" 且非空), form create 将报 "Database exception"', fix: '从 dacli app context --json 取 dbLinkId, 或显式 --dbLinkId=<业务库 id>', diff --git a/src/commands/dm/create.ts b/src/commands/dm/create.ts index 50371e5..c249370 100644 --- a/src/commands/dm/create.ts +++ b/src/commands/dm/create.ts @@ -32,7 +32,8 @@ export function buildDmCreateCommand(): Command { .option('--json', '原始 JSON 输出', false) .action(async (opts: CreateOpts) => { const c = await JnpfClient.fromToken() - const dbLinkId = opts.dbLinkId || c.dbLinkId || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId (与 web formDesign Form.vue 一致) + const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) const userFields = JSON.parse(opts.fields) as Record[] diff --git a/src/commands/dm/drop.ts b/src/commands/dm/drop.ts index ff04a15..a82a148 100644 --- a/src/commands/dm/drop.ts +++ b/src/commands/dm/drop.ts @@ -29,7 +29,8 @@ export function buildDmDropCommand(): Command { process.exit(2) } const c = await JnpfClient.fromToken() - const dbLinkId = opts.dbLinkId || c.dbLinkId || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId + const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) log.info(`DELETE /system/DataModel/${dbLinkId}/Table/${opts.table}`) const r = await c.del(`/system/DataModel/${dbLinkId}/Table/${opts.table}`) if (r.code !== 200) { diff --git a/src/commands/dm/fields.ts b/src/commands/dm/fields.ts index 9b06413..468a554 100644 --- a/src/commands/dm/fields.ts +++ b/src/commands/dm/fields.ts @@ -22,7 +22,8 @@ export function buildDmFieldsCommand(): Command { .option('--json', '原始 JSON 输出', false) .action(async (opts: FieldsOpts) => { const c = await JnpfClient.fromToken() - const dbLinkId = opts.dbLinkId || c.dbLinkId || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId + const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) const r = await c.get<{ fields?: Record[] } | Record>( `/system/DataModel/${dbLinkId}/Tables/${opts.table}/Fields`, { field: '*' }, diff --git a/src/commands/dm/list.ts b/src/commands/dm/list.ts index 8575ca3..a64b52c 100644 --- a/src/commands/dm/list.ts +++ b/src/commands/dm/list.ts @@ -26,7 +26,8 @@ export function buildDmListCommand(): Command { .option('--json', '原始 JSON 输出', false) .action(async (opts: ListOpts) => { const c = await JnpfClient.fromToken() - const dbLinkId = opts.dbLinkId || c.dbLinkId || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId + const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) const r = await c.get<{ list: { table: string; tableName: string; primaryKeyPolicy?: number }[] }>( `/system/DataModel/${dbLinkId}/Tables`, { currentPage: opts.page, pageSize: opts.pageSize, keyword: opts.keyword }, diff --git a/src/commands/form/codegen.ts b/src/commands/form/codegen.ts index 3d6fd83..c7e2d93 100644 --- a/src/commands/form/codegen.ts +++ b/src/commands/form/codegen.ts @@ -85,7 +85,8 @@ export function buildFormCodegenCommand(): Command { .option('--json', '原始 JSON 输出 (file tree)', false) .action(async (formId: string, opts: CodegenOpts) => { const c = await JnpfClient.fromToken() - const dbLinkId = opts.dbLinkId || c.dbLinkId || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId + const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) // 1. 拿 form 概要 (拿 enCode 当默认 mainClassName) const info = await c.get<{ enCode?: string; fullName?: string }>(`/visualdev/Base/${formId}`) diff --git a/src/commands/form/create.ts b/src/commands/form/create.ts index c6ff356..f9b8fb0 100644 --- a/src/commands/form/create.ts +++ b/src/commands/form/create.ts @@ -137,7 +137,8 @@ export function buildFormCreateCommand(): Command { const c = await JnpfClient.fromToken() const type = Number(opts.type) const webType = Number(opts.webType) - const dbLinkId = opts.dbLinkId || c.dbLinkId || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId (与 web formDesign Form.vue 一致) + const dbLinkId = c.resolveDbLinkId(opts.dbLinkId) // P1.2: form create pre-check (dbLinkId / enCode 重复 / type-webType 规则) // 失败时 exit 2, 不进入 API 调用; 警告不阻断 diff --git a/src/commands/form/import.ts b/src/commands/form/import.ts index 4cf958e..f707aea 100644 --- a/src/commands/form/import.ts +++ b/src/commands/form/import.ts @@ -89,7 +89,8 @@ export function buildFormImportCommand(): Command { const newEnCode = opts.enCode || `${raw.enCode || 'unknown'}_clone` raw.enCode = newEnCode if (opts.fullName) raw.fullName = opts.fullName - const targetDbLinkId = opts.dbLinkId || c.dbLinkId || (raw.dbLinkId as string) || '0' + // BS-48 fix: '--dbLinkId=default' 字面量 → token.dbLinkId + const targetDbLinkId = c.resolveDbLinkId(opts.dbLinkId) || (raw.dbLinkId as string) || '0' raw.dbLinkId = targetDbLinkId // ---- v0.7: tables 重命名 (旧表名 → 新表名, 避免跨应用重名) ---- diff --git a/src/core/client.ts b/src/core/client.ts index b3a34d8..84cdae0 100644 --- a/src/core/client.ts +++ b/src/core/client.ts @@ -11,6 +11,7 @@ import { loadToken, saveToken, baseUrlCandidates } from './config.ts' import { DacliError } from './types.ts' import type { AppContext, FormSummary, JnpfResp, LoginResp, TokenFile } from './types.ts' import { log } from './log.ts' +import { resolveDbLinkId as resolveDbLinkIdUtil } from './dbLinkId.ts' export interface ClientOptions { baseUrl?: string @@ -141,6 +142,32 @@ export class JnpfClient { return this.token || undefined } + /** + * 解析 dbLinkId 参数: '--dbLinkId=default' 字面量 → token.dbLinkId + * + * 与 web formDesign/Form.vue + sysForm/Form.vue 一致: "default" 是 token.dbLinkId 的语义别名 + * 设计文档 (BS-48): https://... 详见 .claude/skills/dacli-ts/references/errors.md "dbLinkId" + * + * 委托给 core/dbLinkId.ts 的 resolveDbLinkId 工具函数 (单一权威) + * 优先级: opts.dbLinkId (别名 → ctx.dbLinkId) > ctx.dbLinkId > '0' + */ + resolveDbLinkId(optsDbLinkId?: string | null): string { + // 直接使用 this.dbLinkId, 不构造完整 AppContext (client 内部无完整 ctx) + // 委托给工具函数时构造最小 ctx 即可 (AppContext.dbLinkId 必填, 此处用 ?? 兜底) + return resolveDbLinkIdUtil(optsDbLinkId, { + appCode: this.appCode, + dbLinkId: this.dbLinkId ?? '', + tokenStatus: 'valid', + existingEnCodes: [], + unreleasedForms: [], + releasedForms: [], + existingTables: [], + menus: [], + currentVersion: '', + warnings: [], + }) + } + // ----- HTTP ----- async get(path: string, query?: Record): Promise> { diff --git a/src/core/dbLinkId.ts b/src/core/dbLinkId.ts new file mode 100644 index 0000000..8316130 --- /dev/null +++ b/src/core/dbLinkId.ts @@ -0,0 +1,40 @@ +/** + * core/dbLinkId.ts — dbLinkId 别名解析 + * + * 规则: + * - undefined / '' / 'default' / 'DEFAULT' / '0' / '主库' / '业务库' + * → ctx.dbLinkId (从 token 读; ctx 缺失时回退 '0') + * - 其他 → 原值透传 + * + * 兼容 web formDesign 自动解析行为: + * - web formDesign Form.vue 在 dbLinkId 字段如果用户选 "默认" / 留空, + * 会自动使用当前应用 systemId 对应的业务库 (来自 token). + * - dacli 必须等价地解析 'default' 别名, 否则 dispatch 的命令全部因 + * 后端找不到 dbLinkEntity 而失败 (BS-48 假 PASS 案例). + */ +import type { AppContext } from './types.ts' + +/** + * 解析 dbLinkId 别名. + * + * @param input 命令行传入的原始值 (来自 opts.dbLinkId) + * @param ctx AppContext (loadContextSafe() 返回; null/undefined 时容错) + * @returns 实际传给后端的 dbLinkId (string) + */ +export function resolveDbLinkId( + input: string | null | undefined, + ctx: AppContext | null | undefined, +): string { + // 别名集合: 空 / 'default' / '主库' / '业务库' / '0' 都映射到 ctx.dbLinkId + // '0' 也走别名 (兼容历史代码), 但 ctx 必须有有效 dbLinkId 才返回它, + // 否则保留 '0' (BS-1 业务表误用主库由 guard 拦截) + if ( + !input + || /^default$/i.test(input) + || input === '主库' + || input === '业务库' + ) { + return ctx?.dbLinkId || '0' + } + return input +} \ No newline at end of file diff --git a/tests/unit/blindspot_guards.test.ts b/tests/unit/blindspot_guards.test.ts index d105c5d..4054d22 100644 --- a/tests/unit/blindspot_guards.test.ts +++ b/tests/unit/blindspot_guards.test.ts @@ -55,6 +55,21 @@ describe('blindspot guards — 关键 ERROR 触发', () => { expect(issues.some(i => i.id === 'BS-48')).toBe(false) }) + it('BS-48: dbLinkId="default" 应触发 (v0.11 别名拦截)', () => { + const issues = runGuards(baseCtx, { dbLinkId: 'default' }) + expect(issues.some(i => i.id === 'BS-48' && i.level === 'ERROR')).toBe(true) + }) + + it('BS-48: dbLinkId="DEFAULT" (大写) 应触发 (case-insensitive)', () => { + const issues = runGuards(baseCtx, { dbLinkId: 'DEFAULT' }) + expect(issues.some(i => i.id === 'BS-48' && i.level === 'ERROR')).toBe(true) + }) + + it('BS-48: 显式有效 dbLinkId 不应触发', () => { + const issues = runGuards(baseCtx, { dbLinkId: '2068901937849257984' }) + expect(issues.some(i => i.id === 'BS-48')).toBe(false) + }) + it('BS-49: enCode 重复应触发', () => { const issues = runGuards(baseCtx, { enCode: 'leaveApply' }) expect(issues.some(i => i.id === 'BS-49' && i.level === 'ERROR')).toBe(true) diff --git a/tests/unit/dbLinkId.test.ts b/tests/unit/dbLinkId.test.ts new file mode 100644 index 0000000..334e30e --- /dev/null +++ b/tests/unit/dbLinkId.test.ts @@ -0,0 +1,90 @@ +/** + * unit/dbLinkId.test.ts — resolveDbLinkId 别名解析单测 + * + * 覆盖场景: + * - 'default' (小写) → ctx.dbLinkId + * - 'DEFAULT' (大写, case-insensitive) → ctx.dbLinkId + * - 'Default' (混合大小写) → ctx.dbLinkId + * - '主库' (中文别名) → ctx.dbLinkId + * - '业务库' (中文别名) → ctx.dbLinkId + * - undefined / '' (空) → ctx.dbLinkId + * - '0' (主库标识) → ctx.dbLinkId + * - 显式数字 id (如 '2068901937849257984') → 原值透传 + * - ctx 缺失时 → '0' 兜底 + * - ctx 缺失 + 有 input (显式 id) → 原值透传 + */ +import { describe, it, expect } from 'vitest' +import { resolveDbLinkId } from '../../src/core/dbLinkId.ts' +import type { AppContext } from '../../src/core/types.ts' + +const baseCtx: AppContext = { + appCode: 'jxcj', + dbLinkId: '2068901937849257984', + tokenStatus: 'valid', + existingEnCodes: [], + unreleasedForms: [], + releasedForms: [], + existingTables: [], + menus: [], + currentVersion: '0.11', + warnings: [], +} + +describe('resolveDbLinkId', () => { + it("'default' 小写别名 → ctx.dbLinkId", () => { + expect(resolveDbLinkId('default', baseCtx)).toBe('2068901937849257984') + }) + + it("'DEFAULT' 大写别名 (case-insensitive) → ctx.dbLinkId", () => { + expect(resolveDbLinkId('DEFAULT', baseCtx)).toBe('2068901937849257984') + }) + + it("'Default' 混合大小写 → ctx.dbLinkId", () => { + expect(resolveDbLinkId('Default', baseCtx)).toBe('2068901937849257984') + }) + + it("'主库' 中文别名 → ctx.dbLinkId", () => { + expect(resolveDbLinkId('主库', baseCtx)).toBe('2068901937849257984') + }) + + it("'业务库' 中文别名 → ctx.dbLinkId", () => { + expect(resolveDbLinkId('业务库', baseCtx)).toBe('2068901937849257984') + }) + + it('undefined 输入 → ctx.dbLinkId', () => { + expect(resolveDbLinkId(undefined, baseCtx)).toBe('2068901937849257984') + }) + + it("'' 空字符串 → ctx.dbLinkId", () => { + expect(resolveDbLinkId('', baseCtx)).toBe('2068901937849257984') + }) + + it("'0' 主库标识 → 原值透传 (BS-1 由 guard 拦截)", () => { + // '0' 不是别名, 是合法的"主库"标识, 由 BS-1 guard 在业务表场景拦截 + expect(resolveDbLinkId('0', baseCtx)).toBe('0') + }) + + it('显式数字 id → 原值透传 (向后兼容)', () => { + expect(resolveDbLinkId('664077319056394183', baseCtx)).toBe('664077319056394183') + }) + + it('ctx=null + 无 input → 兜底 "0"', () => { + expect(resolveDbLinkId(undefined, null)).toBe('0') + }) + + it('ctx=null + "default" → 兜底 "0"', () => { + expect(resolveDbLinkId('default', null)).toBe('0') + }) + + it('ctx=null + 显式 id → 原值透传', () => { + expect(resolveDbLinkId('664077319056394183', null)).toBe('664077319056394183') + }) + + it('ctx=undefined (缺省) + "default" → 兜底 "0"', () => { + expect(resolveDbLinkId('default', undefined)).toBe('0') + }) + + it('null 输入 (旧客户端代码) → ctx.dbLinkId', () => { + expect(resolveDbLinkId(null, baseCtx)).toBe('2068901937849257984') + }) +})