refactor(dacli): handlePreCheckResult/handleGuardResult 改 throw + dm/create + form/release wrapCommand 迁移 (P2 batch1)
_precheck.handlePreCheckResult + _blindspot_guards.handleGuardResult: process.exit(2) → throw Error (wrapCommand handler catch → ctx.fail 落 L3). 沿用 DirtyCheckError 同款模式. dm/create: 完整 wrapCommand 迁移 (runDmStepMachine process.exit → throw + await 修复未 await 逃逸, precheck/guard throw 被 handler catch). form/release: wrapCommand 迁移 (承接 guard throw). menu/create 已 wrapCommand (自动承接). form/create 下一 commit 承接 (P2 batch2). Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
8839466f3c
commit
f0d0af518f
4 files changed
+209
-217
No files matched your search
@@ -708,9 +708,10 @@ export function formatIssues(issues: BlindspotIssue[]): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* 便利方法: 把 guard 结果按 ERROR/WARN 分别打到日志 + 必要时 exit 2
|
||||
* 便利方法: 把 guard 结果按 ERROR/WARN 分别打到日志 + 必要时 throw
|
||||
* 与 handlePreCheckResult 对称 (P1.2):
|
||||
* - 有 ERROR → log.error + 退出 (exit 2)
|
||||
* - 有 ERROR → log.error + throw (v2.2+ 2026-07-21: 改 throw 替代 process.exit(2),
|
||||
* 让 wrapCommand handler catch → ctx.fail. 所有调用方均已 wrapCommand 包裹.)
|
||||
* - 仅 WARN → log.warn + 继续
|
||||
* - 空 → 静默通过
|
||||
* @param label 命令名 (e.g. "form create", "dm create"), 用于日志前缀
|
||||
@@ -723,7 +724,8 @@ export function handleGuardResult(label: string, issues: BlindspotIssue[]): void
|
||||
if (errors.length > 0) {
|
||||
log.error(`Blindspot guard 失败 (${label} 终止, 请修复后重试):`)
|
||||
log.error(formatIssues(errors))
|
||||
process.exit(2)
|
||||
// v2.2+ (2026-07-21): throw 替代 process.exit(2), wrapCommand handler catch → ctx.fail
|
||||
throw new Error(`Blindspot guard 失败 (${label}): ${errors.length} 个 ERROR`)
|
||||
}
|
||||
|
||||
if (warns.length > 0) {
|
||||
|
||||
@@ -239,7 +239,9 @@ export async function preCheckFormRelease(
|
||||
* 打印 pre-check 结果 (form/dm 共享)
|
||||
*
|
||||
* pass=true, warnings.length>0 → 打印警告不阻断
|
||||
* pass=false → 打印错误并退出 (exit 2)
|
||||
* pass=false → 打印错误并 throw (v2.2+ 2026-07-21: 改 throw 替代 process.exit(2),
|
||||
* 让 wrapCommand handler catch → ctx.fail 落 L3 CommandLog. 所有调用方
|
||||
* (form/create, dm/create, menu/create, form/release) 均已 wrapCommand 包裹.)
|
||||
*/
|
||||
export function handlePreCheckResult(label: string, pre: PreCheckResult): void {
|
||||
if (!pre.pass) {
|
||||
@@ -249,7 +251,8 @@ export function handlePreCheckResult(label: string, pre: PreCheckResult): void {
|
||||
log.warn('警告:')
|
||||
pre.warnings.forEach((w) => log.warn(` ${w}`))
|
||||
}
|
||||
process.exit(2)
|
||||
// v2.2+ (2026-07-21): throw 替代 process.exit(2), wrapCommand handler catch → ctx.fail
|
||||
throw new Error(`Pre-check 失败 (${label}): ${pre.errors.join('; ').slice(0, 180)}`)
|
||||
}
|
||||
if (pre.warnings.length) {
|
||||
log.warn(`Pre-check 警告(${label} 不阻断,但请关注):`)
|
||||
|
||||
+134
-153
@@ -17,7 +17,7 @@ import { initWebapi, loadDataModel } from '../../webapi/dataModel.ts'
|
||||
import { validateDmCreate, type DmFieldLite } from './_validate.ts'
|
||||
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
||||
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (BS-新38 enCode strip / BS-新52 fullName soften / BS-47 重名 suggest)
|
||||
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
|
||||
import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤 + CommandLog; v2.2+ wrapCommand 收口 5c
|
||||
|
||||
interface CreateOpts {
|
||||
table: string
|
||||
@@ -38,8 +38,7 @@ export function buildDmCreateCommand(): Command {
|
||||
.requiredOption('--fields <json>', '字段定义 JSON 数组')
|
||||
.option('--dbLinkId <id>', '业务库 id (默认从 token.dbLinkId)')
|
||||
.option('--strip-app-code [val]', '自动去 appCode 前缀 (默认 true; --no-strip-app-code 保留前缀, BS-55 修复)', v => v !== 'false')
|
||||
.option('--verbose', '完整输出 (含 step machine、API 调用等过程日志)', false)
|
||||
.option('--json', '原始 JSON 输出', false)
|
||||
addOutputOptions(cmd)
|
||||
.action(async (opts: CreateOpts) => {
|
||||
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
|
||||
setupOutputFilter(opts)
|
||||
@@ -56,160 +55,141 @@ export function buildDmCreateCommand(): Command {
|
||||
if (cmdFix.silent.length > 0) {
|
||||
Object.assign(opts, cmdFix.opts)
|
||||
}
|
||||
// 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<string, unknown>[]
|
||||
|
||||
// CLAUDE.md §3: 表名 snake_case 无前缀 — 自动去 appCode 前缀 (jxcj_announcement → announcement)
|
||||
// 已存在老表带前缀也允许 (向后兼容); 新建表推荐无前缀
|
||||
// ⚠ 2026-06-25 tdd9 BS-55: form create 用 cleanTable 找物理表, dm 必须用同样的 cleanTable 名
|
||||
const appCode = c.appCode
|
||||
const stripAppCode = opts.stripAppCode ?? true
|
||||
const cleanTable = (stripAppCode && opts.table.startsWith(`${appCode}_`))
|
||||
? opts.table.slice(appCode.length + 1)
|
||||
: opts.table
|
||||
if (cleanTable !== opts.table) {
|
||||
log.info(`📌 CLAUDE.md §3: 自动去 appCode 前缀: '${opts.table}' → '${cleanTable}'`)
|
||||
log.info(` (包名 ssw.${appCode}.entity 已带 appCode, 表名不重复)`)
|
||||
}
|
||||
// 同步去字段前缀 (f_xxx 不动, 系统列不动; 只去 appCode 前缀的字段)
|
||||
const cleanFields = userFields.map(f => {
|
||||
const fieldName = String(f.field || '')
|
||||
if (fieldName.startsWith(`${appCode}_`)) {
|
||||
const newField = fieldName.slice(appCode.length + 1)
|
||||
log.info(` 字段同步去前缀: ${fieldName} → ${newField}`)
|
||||
return { ...f, field: newField }
|
||||
}
|
||||
return f
|
||||
})
|
||||
|
||||
// BS-111 (jyzs 2026-07-02): MySQL lower_case_table_names=2 大小写警告
|
||||
// jyzs 实战: mirrorProduct/mirrorDemand CamelCase 表名 → backend INSERT 用 lowercase, 报 "table doesn't exist"
|
||||
// v0.15+ (P2-7): 警告 + 自动 lowercase (替代旧版仅 warn, 让用户自己改)
|
||||
// 跨 Linux+macOS+Windows MySQL 兼容 (跟 jyzs 实战一致)
|
||||
let finalTable = cleanTable
|
||||
if (/[A-Z]/.test(cleanTable)) {
|
||||
const lower = cleanTable.toLowerCase()
|
||||
log.warn(`BS-111: 表名 "${cleanTable}" 含大写字母, 自动转 lowercase: "${lower}"`)
|
||||
log.warn(` 原因: MySQL lower_case_table_names=2 时, backend INSERT 用 lowercase 表名`)
|
||||
log.warn(` 跨平台: Linux (default 0, 区分大小写) / macOS (default 2, 不区分) / Windows (default 1, 全部 lowercase)`)
|
||||
finalTable = lower
|
||||
}
|
||||
|
||||
// v0.11d+ step machine 校验 (镜像 web dataModel/Form.vue handleSubmit L210-242 + 后端 DbTableController checkName L92-112)
|
||||
// 在发 API 前暴露问题, 聚合错误, AI 不用试错
|
||||
runDmStepMachine(c, dbLinkId, { table: finalTable, tableName: opts.tableName, fields: cleanFields as DmFieldLite[] })
|
||||
|
||||
// P1.2: dm create pre-check (dbLinkId / 表重复)
|
||||
// 失败时 exit 2, 不进入 API 调用; 警告不阻断
|
||||
handlePreCheckResult(
|
||||
'dm create',
|
||||
await preCheckDmCreate(c, {
|
||||
table: finalTable,
|
||||
dbLinkId,
|
||||
}),
|
||||
)
|
||||
|
||||
// P3.1: 第二层防御 — blindspot guard (BS-1/5/8/15b/38/42/46/48 等)
|
||||
// - ERROR → exit 2 (与 pre-check 一致)
|
||||
// - WARN → 仅打印, 不阻断
|
||||
// - context 加载失败时跳过 (容错)
|
||||
const guardCtx = await loadContextSafe(c)
|
||||
if (guardCtx.warning) log.warn(guardCtx.warning)
|
||||
handleGuardResult('dm create', runGuards(guardCtx.ctx, {
|
||||
table: finalTable,
|
||||
dbLinkId,
|
||||
fields: cleanFields,
|
||||
}, 'dm create'))
|
||||
|
||||
// D-5 (盲点 38 防御): 用户字段含 f_description 会被系统自动加的 text 列冲突
|
||||
// 系统会自动注入 f_description (text) 作为"描述"列, 用户不应自己再传
|
||||
const userFieldNames = cleanFields.map((f) => String(f.field || ''))
|
||||
if (userFieldNames.includes('f_description')) {
|
||||
log.warn('⚠️ D-5 检测: 用户字段含 f_description, 这与系统自动注入的 "描述(text)" 列冲突!')
|
||||
log.warn(' 建议: 把 f_description 改名 (如 f_desc), 或移除 (系统已含默认 text 描述列)')
|
||||
log.warn(' 继续执行会报 "Duplicate column name \'f_description\'" (盲点 38)')
|
||||
}
|
||||
|
||||
// 强制补全 schema 必填项 (autoIncrement/identity/columnName/index/primaryKey)
|
||||
const fields = cleanFields.map((f) => ({
|
||||
autoIncrement: 0,
|
||||
identity: 0,
|
||||
primaryKey: 0,
|
||||
columnName: f.field,
|
||||
...f,
|
||||
}))
|
||||
// v10.6+ JNPF runtime 要求 9 系统列 (硬编码 SQL 引用) + 复合主键
|
||||
const sysCols = [
|
||||
{ field: 'f_id', fieldName: '主键', dataType: 'varchar', dataLength: '50', primaryKey: 1, allowNull: 0, autoIncrement: 0, identity: 0, columnName: 'f_id' },
|
||||
{ field: 'f_tenant_id', fieldName: '租户id', dataType: 'varchar', dataLength: '50', primaryKey: 1, allowNull: 0, autoIncrement: 0, identity: 0, columnName: 'f_tenant_id' },
|
||||
{ field: 'f_flow_task_id', fieldName: '流程任务ID', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_task_id' },
|
||||
{ field: 'f_flow_id', fieldName: '流程ID', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_id' },
|
||||
{ field: 'f_flow_state', fieldName: '流程状态', dataType: 'int', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_state' },
|
||||
{ field: 'f_sort_code', fieldName: '排序', dataType: 'bigint', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_sort_code' },
|
||||
{ field: 'f_create_user', fieldName: '创建人', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_create_user' },
|
||||
{ field: 'f_create_time', fieldName: '创建时间', dataType: 'datetime', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_create_time' },
|
||||
{ field: 'f_modify_user', fieldName: '修改人', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_modify_user' },
|
||||
{ field: 'f_modify_time', fieldName: '修改时间', dataType: 'datetime', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_modify_time' },
|
||||
{ field: 'f_description', fieldName: '描述', dataType: 'text', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_description' },
|
||||
]
|
||||
const allFields = [...fields, ...sysCols]
|
||||
// JNPF dmpost body 结构: { tableInfo:{...}, tableFieldList:[...] }
|
||||
const body = {
|
||||
tableInfo: {
|
||||
table: finalTable,
|
||||
tableName: opts.tableName,
|
||||
newTable: finalTable,
|
||||
},
|
||||
tableFieldList: allFields,
|
||||
}
|
||||
log.info(`loadDataModel.createDataModel table=${finalTable} fields=${allFields.length} (含9系统列)`)
|
||||
// v0.11+ Phase 2: 改用 webapi (loadDataModel.createDataModel)
|
||||
// 注: webapi 路径下不再用 callWithDiagnosis (走 defHttp shim), 错误仍捕获显示
|
||||
await initWebapi(c)
|
||||
const r = (await loadDataModel.createDataModel(dbLinkId, body)) as { code?: number; msg?: string; table?: string; data?: unknown }
|
||||
if (r.code !== 200 && r.code !== undefined) {
|
||||
// D-5 (盲点 38 防御): 友好提示 f_description 冲突
|
||||
const errMsg = r.msg || ''
|
||||
if (errMsg.includes("Duplicate column name 'f_description'")) {
|
||||
log.error(`建表失败 (code=${r.code}): ${r.msg}`)
|
||||
log.error('')
|
||||
log.error(' 💡 这是盲点 38 已知问题: f_description 已被系统自动注入为 "描述(text)" 列')
|
||||
log.error(' 解决方法: 移除 --fields 里的 f_description, 或改名为 f_desc')
|
||||
log.error(' 详见 docs/tds/summary.html §3 盲点 38')
|
||||
} else {
|
||||
log.error(`建表失败 (code=${r.code}): ${r.msg}`)
|
||||
// v0.11e+ Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
||||
const enhanced = enhanceFromBackend(errMsg, 'table', { entity: 'dm' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 2, stepName: '后端API' })}`)
|
||||
}
|
||||
if (opts.json) printJson(r)
|
||||
// v2.1+ (2026-07-21): 错误路径也落 CommandLog (L3 兜底)
|
||||
printCommandEnd({
|
||||
command: 'dm create',
|
||||
appCode: c.appCode,
|
||||
result: 'failure',
|
||||
error: `建表失败 (code=${r.code}): ${errMsg}`,
|
||||
summary: { table: finalTable },
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
process.exit(1)
|
||||
}
|
||||
log.ok(`建表成功: ${finalTable}`)
|
||||
if (opts.json) printJson(r.data)
|
||||
// v2.1+ (2026-07-21): 成功路径落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
await wrapCommand({
|
||||
command: 'dm create',
|
||||
appCode: c.appCode,
|
||||
summary: { table: finalTable, tableName: opts.tableName },
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
}, async (ctx) => {
|
||||
try {
|
||||
// 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<string, unknown>[]
|
||||
|
||||
// CLAUDE.md §3: 表名 snake_case 无前缀 — 自动去 appCode 前缀 (jxcj_announcement → announcement)
|
||||
const appCode = c.appCode
|
||||
const stripAppCode = opts.stripAppCode ?? true
|
||||
const cleanTable = (stripAppCode && opts.table.startsWith(`${appCode}_`))
|
||||
? opts.table.slice(appCode.length + 1)
|
||||
: opts.table
|
||||
if (cleanTable !== opts.table) {
|
||||
log.info(`📌 CLAUDE.md §3: 自动去 appCode 前缀: '${opts.table}' → '${cleanTable}'`)
|
||||
log.info(` (包名 ssw.${appCode}.entity 已带 appCode, 表名不重复)`)
|
||||
}
|
||||
// 同步去字段前缀 (f_xxx 不动, 系统列不动; 只去 appCode 前缀的字段)
|
||||
const cleanFields = userFields.map(f => {
|
||||
const fieldName = String(f.field || '')
|
||||
if (fieldName.startsWith(`${appCode}_`)) {
|
||||
const newField = fieldName.slice(appCode.length + 1)
|
||||
log.info(` 字段同步去前缀: ${fieldName} → ${newField}`)
|
||||
return { ...f, field: newField }
|
||||
}
|
||||
return f
|
||||
})
|
||||
|
||||
// BS-111 (jyzs 2026-07-02): MySQL lower_case_table_names=2 大小写警告 + 自动 lowercase
|
||||
let finalTable = cleanTable
|
||||
if (/[A-Z]/.test(cleanTable)) {
|
||||
const lower = cleanTable.toLowerCase()
|
||||
log.warn(`BS-111: 表名 "${cleanTable}" 含大写字母, 自动转 lowercase: "${lower}"`)
|
||||
log.warn(` 原因: MySQL lower_case_table_names=2 时, backend INSERT 用 lowercase 表名`)
|
||||
log.warn(` 跨平台: Linux (default 0, 区分大小写) / macOS (default 2, 不区分) / Windows (default 1, 全部 lowercase)`)
|
||||
finalTable = lower
|
||||
}
|
||||
|
||||
// v0.11d+ step machine 校验 (镜像 web dataModel/Form.vue handleSubmit + 后端 DbTableController checkName)
|
||||
// v2.2+ (2026-07-21): 加 await — runDmStepMachine 内部改 throw, 未 await 会变 unhandledRejection 逃出 handler catch
|
||||
await runDmStepMachine(c, dbLinkId, { table: finalTable, tableName: opts.tableName, fields: cleanFields as DmFieldLite[] })
|
||||
|
||||
// P1.2: dm create pre-check (dbLinkId / 表重复) — handlePreCheckResult 有 ERROR 时 throw (v2.2+)
|
||||
handlePreCheckResult(
|
||||
'dm create',
|
||||
await preCheckDmCreate(c, {
|
||||
table: finalTable,
|
||||
dbLinkId,
|
||||
}),
|
||||
)
|
||||
|
||||
// P3.1: 第二层防御 — blindspot guard, handleGuardResult 有 ERROR 时 throw (v2.2+)
|
||||
const guardCtx = await loadContextSafe(c)
|
||||
if (guardCtx.warning) log.warn(guardCtx.warning)
|
||||
handleGuardResult('dm create', runGuards(guardCtx.ctx, {
|
||||
table: finalTable,
|
||||
dbLinkId,
|
||||
fields: cleanFields,
|
||||
}, 'dm create'))
|
||||
|
||||
// D-5 (盲点 38 防御): 用户字段含 f_description 会被系统自动加的 text 列冲突
|
||||
const userFieldNames = cleanFields.map((f) => String(f.field || ''))
|
||||
if (userFieldNames.includes('f_description')) {
|
||||
log.warn('⚠️ D-5 检测: 用户字段含 f_description, 这与系统自动注入的 "描述(text)" 列冲突!')
|
||||
log.warn(' 建议: 把 f_description 改名 (如 f_desc), 或移除 (系统已含默认 text 描述列)')
|
||||
log.warn(' 继续执行会报 "Duplicate column name \'f_description\'" (盲点 38)')
|
||||
}
|
||||
|
||||
// 强制补全 schema 必填项 (autoIncrement/identity/columnName/index/primaryKey)
|
||||
const fields = cleanFields.map((f) => ({
|
||||
autoIncrement: 0,
|
||||
identity: 0,
|
||||
primaryKey: 0,
|
||||
columnName: f.field,
|
||||
...f,
|
||||
}))
|
||||
// v10.6+ JNPF runtime 要求 9 系统列 (硬编码 SQL 引用) + 复合主键
|
||||
const sysCols = [
|
||||
{ field: 'f_id', fieldName: '主键', dataType: 'varchar', dataLength: '50', primaryKey: 1, allowNull: 0, autoIncrement: 0, identity: 0, columnName: 'f_id' },
|
||||
{ field: 'f_tenant_id', fieldName: '租户id', dataType: 'varchar', dataLength: '50', primaryKey: 1, allowNull: 0, autoIncrement: 0, identity: 0, columnName: 'f_tenant_id' },
|
||||
{ field: 'f_flow_task_id', fieldName: '流程任务ID', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_task_id' },
|
||||
{ field: 'f_flow_id', fieldName: '流程ID', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_id' },
|
||||
{ field: 'f_flow_state', fieldName: '流程状态', dataType: 'int', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_flow_state' },
|
||||
{ field: 'f_sort_code', fieldName: '排序', dataType: 'bigint', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_sort_code' },
|
||||
{ field: 'f_create_user', fieldName: '创建人', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_create_user' },
|
||||
{ field: 'f_create_time', fieldName: '创建时间', dataType: 'datetime', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_create_time' },
|
||||
{ field: 'f_modify_user', fieldName: '修改人', dataType: 'varchar', dataLength: '50', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_modify_user' },
|
||||
{ field: 'f_modify_time', fieldName: '修改时间', dataType: 'datetime', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_modify_time' },
|
||||
{ field: 'f_description', fieldName: '描述', dataType: 'text', dataLength: '0', primaryKey: 0, allowNull: 1, autoIncrement: 0, identity: 0, columnName: 'f_description' },
|
||||
]
|
||||
const allFields = [...fields, ...sysCols]
|
||||
// JNPF dmpost body 结构: { tableInfo:{...}, tableFieldList:[...] }
|
||||
const body = {
|
||||
tableInfo: {
|
||||
table: finalTable,
|
||||
tableName: opts.tableName,
|
||||
newTable: finalTable,
|
||||
},
|
||||
tableFieldList: allFields,
|
||||
}
|
||||
log.info(`loadDataModel.createDataModel table=${finalTable} fields=${allFields.length} (含9系统列)`)
|
||||
await initWebapi(c)
|
||||
const r = (await loadDataModel.createDataModel(dbLinkId, body)) as { code?: number; msg?: string; table?: string; data?: unknown }
|
||||
if (r.code !== 200 && r.code !== undefined) {
|
||||
// D-5 (盲点 38 防御): 友好提示 f_description 冲突
|
||||
const errMsg = r.msg || ''
|
||||
if (errMsg.includes("Duplicate column name 'f_description'")) {
|
||||
log.error(`建表失败 (code=${r.code}): ${r.msg}`)
|
||||
log.error('')
|
||||
log.error(' 💡 这是盲点 38 已知问题: f_description 已被系统自动注入为 "描述(text)" 列')
|
||||
log.error(' 解决方法: 移除 --fields 里的 f_description, 或改名为 f_desc')
|
||||
log.error(' 详见 docs/tds/summary.html §3 盲点 38')
|
||||
} else {
|
||||
log.error(`建表失败 (code=${r.code}): ${r.msg}`)
|
||||
// v0.11e+ Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
||||
const enhanced = enhanceFromBackend(errMsg, 'table', { entity: 'dm' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 2, stepName: '后端API' })}`)
|
||||
}
|
||||
if (opts.json) printJson(r)
|
||||
return ctx.fail(`建表失败 (code=${r.code}): ${errMsg}`, { table: finalTable })
|
||||
}
|
||||
log.ok(`建表成功: ${finalTable}`)
|
||||
if (opts.json) printJson(r.data)
|
||||
ctx.success({ table: finalTable, tableName: opts.tableName })
|
||||
} catch (e) {
|
||||
ctx.fail(`dm create 失败: ${(e as Error).message?.slice(0, 200)}`, { table: opts.table })
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -278,7 +258,8 @@ async function runDmStepMachine(
|
||||
for (const e of allErrors) {
|
||||
log.error(` [step ${e.step} ${e.stepName}] ${e.field || '?'}: ${e.message}`)
|
||||
}
|
||||
process.exit(1)
|
||||
// v2.2+ (2026-07-21): throw 替代 process.exit(1), wrapCommand handler catch → ctx.fail (落 L3 CommandLog)
|
||||
throw new Error(`step machine 校验失败 (${allErrors.length} 个错误)`)
|
||||
}
|
||||
|
||||
log.info(`✓ step machine 校验通过 (3/3): table=${opts.table}, fields=${opts.fields.length}`)
|
||||
|
||||
@@ -15,74 +15,80 @@ import { loadContextSafe, preCheckFormRelease } from '../_precheck.ts'
|
||||
import { runGuards, handleGuardResult, formatIssues } from '../_blindspot_guards.ts'
|
||||
import { initWebapi, loadVisualDev } from '../../webapi/visualDev.ts'
|
||||
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
||||
import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c
|
||||
|
||||
export function buildFormReleaseCommand(): Command {
|
||||
const cmd = new Command('release')
|
||||
.description('发布/重新发布表单 (state 0|2 → 1). state=2 = 已发布被编辑过, 自动重新发布. type=4 视图会 400 (软跳过 --soft)')
|
||||
.argument('<id>', '表单 id')
|
||||
.option('--soft', '发布失败不退出 (用于 type=4)', false)
|
||||
.action(async (id: string, opts: { soft?: boolean }) => {
|
||||
// === step 0 blindspot guard + 检测 ===
|
||||
// P3.1: 第二层防御 — 仅接入 release 适用的 blindspot guard
|
||||
// - (token expired), (ctx 空), (走错端点)
|
||||
// - (form 已发布未挂菜单 → 浏览器 404) — WARN, 提示后续挂菜单
|
||||
// - (type=4 视图 release) — release 命令本身没传 type, 此处跳过
|
||||
// - (enCode 重复) 等创建类 guard 不适用, 跳过
|
||||
// - formId 处于 state=2 (待重发布) → WARN 提示会自动重新发布
|
||||
const guardCtx = await loadContextSafe(null)
|
||||
if (guardCtx.warning) log.warn(guardCtx.warning)
|
||||
handleGuardResult('form release', runGuards(guardCtx.ctx, { formId: id }, 'form release'))
|
||||
|
||||
// (P2-6): preCheckFormRelease (enCode 在当前 app 列表 + table 存在)
|
||||
// 旧版 release 不走 precheck, 中途 enCode 已被别人占用能过
|
||||
// 这里从 guardCtx.releasedForms/unreleasedForms 推 enCode
|
||||
const enCode = guardCtx.ctx?.releasedForms
|
||||
?.find(f => f.startsWith(`${id}:`))?.split(':')[1]
|
||||
?? guardCtx.ctx?.unreleasedForms
|
||||
?.find(f => f.startsWith(`${id}:`))?.split(':')[1]
|
||||
if (enCode && enCode !== '(no-enCode)') {
|
||||
const pre = await preCheckFormRelease(null, { enCode, table: '' })
|
||||
for (const w of pre.warnings) log.warn(` preCheckFormRelease: ${w}`)
|
||||
}
|
||||
|
||||
// === step 1 state 检测 + 准备 release 调用 ===
|
||||
// 检测 state=2 并提示用户, 后端 Actions/Release 直接覆盖为 1
|
||||
if (guardCtx.ctx?.modifiedAfterPublishForms?.some(f => f.startsWith(`${id}:`))) {
|
||||
log.info(`formId ${id} 当前 state=2 (已发布被编辑过), 将自动重新发布为 state=1`)
|
||||
}
|
||||
|
||||
addOutputOptions(cmd)
|
||||
.action(async (id: string, opts: { soft?: boolean; json?: boolean; verbose?: boolean }) => {
|
||||
setupOutputFilter(opts)
|
||||
const c = await JnpfClient.fromToken()
|
||||
// === step 2 (后端API (Actions/Release) ===
|
||||
// Phase 1: 用 web 端 release (替代 c.postJson('/visualdev/Base/{id}/Actions/Release'))
|
||||
await initWebapi(c)
|
||||
const resp = await loadVisualDev.release(id)
|
||||
const r = { code: 200, msg: 'ok', data: resp } as { code: number; msg?: string }
|
||||
if (r.code === 200) {
|
||||
log.ok(`发布成功 id=${id} (state=1)`)
|
||||
// 发布成功后, 单独跑 (form 已发布但未挂菜单 → 浏览器 404) — WARN 不阻断
|
||||
// 注: releasedForms 格式 = "id:enCode", 这里按 id 拆出 enCode
|
||||
if (guardCtx.ctx) {
|
||||
const matched = guardCtx.ctx.releasedForms.find(f => f.startsWith(`${id}:`))
|
||||
if (matched) {
|
||||
const enCode = matched.split(':').slice(1).join(':') || id
|
||||
const postIssues = runGuards(guardCtx.ctx, { enCode }, 'form release')
|
||||
const bs37 = postIssues.filter(i => i.id === 'BS-37' && i.level === 'WARN')
|
||||
if (bs37.length) {
|
||||
log.warn('Blindspot guard 提示:')
|
||||
log.warn(formatIssues(bs37))
|
||||
}
|
||||
|
||||
await wrapCommand({
|
||||
command: 'form release',
|
||||
appCode: c.appCode,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
try {
|
||||
// === step 0 blindspot guard + 检测 ===
|
||||
// handleGuardResult 有 ERROR 时 throw (v2.2+), 被本 handler catch → ctx.fail
|
||||
const guardCtx = await loadContextSafe(null)
|
||||
if (guardCtx.warning) log.warn(guardCtx.warning)
|
||||
handleGuardResult('form release', runGuards(guardCtx.ctx, { formId: id }, 'form release'))
|
||||
|
||||
// (P2-6): preCheckFormRelease (enCode 在当前 app 列表 + table 存在)
|
||||
const enCode = guardCtx.ctx?.releasedForms
|
||||
?.find(f => f.startsWith(`${id}:`))?.split(':')[1]
|
||||
?? guardCtx.ctx?.unreleasedForms
|
||||
?.find(f => f.startsWith(`${id}:`))?.split(':')[1]
|
||||
if (enCode && enCode !== '(no-enCode)') {
|
||||
const pre = await preCheckFormRelease(null, { enCode, table: '' })
|
||||
for (const w of pre.warnings) log.warn(` preCheckFormRelease: ${w}`)
|
||||
}
|
||||
|
||||
// === step 1 state 检测 + 准备 release 调用 ===
|
||||
if (guardCtx.ctx?.modifiedAfterPublishForms?.some(f => f.startsWith(`${id}:`))) {
|
||||
log.info(`formId ${id} 当前 state=2 (已发布被编辑过), 将自动重新发布为 state=1`)
|
||||
}
|
||||
|
||||
// === step 2 (后端API (Actions/Release) ===
|
||||
await initWebapi(c)
|
||||
const resp = await loadVisualDev.release(id)
|
||||
const r = { code: 200, msg: 'ok', data: resp } as { code: number; msg?: string }
|
||||
if (r.code === 200) {
|
||||
log.ok(`发布成功 id=${id} (state=1)`)
|
||||
// 发布成功后, 单独跑 (form 已发布但未挂菜单 → 浏览器 404) — WARN 不阻断
|
||||
if (guardCtx.ctx) {
|
||||
const matched = guardCtx.ctx.releasedForms.find(f => f.startsWith(`${id}:`))
|
||||
if (matched) {
|
||||
const enCode = matched.split(':').slice(1).join(':') || id
|
||||
const postIssues = runGuards(guardCtx.ctx, { enCode }, 'form release')
|
||||
const bs37 = postIssues.filter(i => i.id === 'BS-37' && i.level === 'WARN')
|
||||
if (bs37.length) {
|
||||
log.warn('Blindspot guard 提示:')
|
||||
log.warn(formatIssues(bs37))
|
||||
}
|
||||
}
|
||||
}
|
||||
return ctx.success({ id, state: 1 })
|
||||
}
|
||||
if (opts.soft) {
|
||||
log.warn(`发布失败 (软跳过) code=${r.code}: ${r.msg}`)
|
||||
return ctx.success({ id, soft: true, released: false })
|
||||
}
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'form', { entity: 'form' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '后端API' })}`)
|
||||
ctx.fail(`发布失败 code=${r.code}: ${r.msg}`, { id, code: r.code })
|
||||
} catch (e) {
|
||||
ctx.fail(`form release 失败: ${(e as Error).message?.slice(0, 200)}`, { id })
|
||||
}
|
||||
return
|
||||
}
|
||||
if (opts.soft) {
|
||||
log.warn(`发布失败 (软跳过) code=${r.code}: ${r.msg}`)
|
||||
return
|
||||
}
|
||||
log.error(`发布失败 code=${r.code}: ${r.msg}`)
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'form', { entity: 'form' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '后端API' })}`)
|
||||
process.exit(1)
|
||||
})
|
||||
})
|
||||
|
||||
installHelpHook(cmd, {
|
||||
|
||||
Reference in new issue
Block a user