feat(dacli): form/create.ts wrapCommand 迁移 (P2 batch2, 11 exit 收口)
1554 行核心命令: 全 action 包 wrapCommand + try/catch. 11 process.exit → ctx.fail/ctx.success. precheck/guard throw 被 handler catch. 成功路径保留原 saveCommandLog (含 fixLog) 不双写. 副作用修复: 顶层提前 const c (原 --ai 路径 line 307 c 在 line 624 声明前引用, TS used-before-decl), 删冗余 606/624 两处 const c. TS baseline 57→49 (修复 8 个 pre-existing c 错误, 无新增). Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
f0d0af518f
commit
11082bff6e
1 file changed
+27
-14
+27
-14
@@ -30,6 +30,7 @@ import { applyNamingConvention, type NamingConvention } from './_naming_conventi
|
||||
import { autoStripEnCode, autoStripFullName } from '../_encode_validator.ts'
|
||||
import { runAutoFix, type FixContext } from '../_auto_fix.ts'
|
||||
import { saveCommandLog, formatOneLineSummary, type CommandLog } from '../../core/logfile.ts'
|
||||
import { wrapCommand } from '../_output_filter.ts' // v2.2+ (2026-07-21): wrapCommand 收口 5c (承接 precheck/guard throw + 11 process.exit)
|
||||
|
||||
interface CreateOpts {
|
||||
fullName?: string
|
||||
@@ -293,6 +294,16 @@ export function buildFormCreateCommand(): Command {
|
||||
}
|
||||
}
|
||||
|
||||
const c = await JnpfClient.fromToken()
|
||||
await wrapCommand({
|
||||
command: 'form create',
|
||||
appCode: c.appCode,
|
||||
startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
try {
|
||||
// 5.10.2: --ai-field 只问 AI, 不建表单
|
||||
if (opts.aiField) {
|
||||
const data = await callAiForm(opts.aiField)
|
||||
@@ -332,7 +343,7 @@ export function buildFormCreateCommand(): Command {
|
||||
log.error('AI 调用链 (排查失败原因):')
|
||||
for (const step of data._aiChain) log.error(` - ${step}`)
|
||||
}
|
||||
process.exit(2)
|
||||
return ctx.fail('AI Login expired (NCPF + SSW 同 token 失效), 且未传 --enCode/--fullName, 无法自动建表单', { enCode: opts.enCode })
|
||||
}
|
||||
// user 提供了 --enCode + --fullName → 走 web buildFormData 默认空 schema
|
||||
log.warn(`⚠ P1-7: AI Login expired (NCPF + SSW 双失效), fallback 走 web buildFormData 默认空 schema`)
|
||||
@@ -356,7 +367,7 @@ export function buildFormCreateCommand(): Command {
|
||||
log.error(' 2) 改用 --enCode + --fullName + 手工建表')
|
||||
log.error(' 3) 查 base_ai 表 (主库 dbLinkId=0) 是否有 f_enabled_mark=1 记录')
|
||||
printAiFormResult(data)
|
||||
process.exit(2)
|
||||
return ctx.fail('AI 响应缺 enCode/fullName, 无法自动建表单', { enCode: opts.enCode })
|
||||
}
|
||||
opts.enCode = opts.enCode || data.enCode
|
||||
opts.fullName = opts.fullName || data.fullName
|
||||
@@ -550,7 +561,7 @@ export function buildFormCreateCommand(): Command {
|
||||
: ((rawDm as { list?: unknown[] })?.list || []) as Array<Record<string, unknown>>
|
||||
if (!dmFields.length) {
|
||||
log.error(`表 ${opts.table} 无字段, 无法自动生成表单`)
|
||||
process.exit(2)
|
||||
return ctx.fail(`表 ${opts.table} 无字段, 无法自动生成表单`, { table: opts.table })
|
||||
}
|
||||
// dm 字段 → aiModelList 格式 (跟 --ai 路径 NCPF 返回的 VisualAiModel 结构一致)
|
||||
// 用后端 AI 推理字段控件类型 + 列表字段选择
|
||||
@@ -573,7 +584,7 @@ export function buildFormCreateCommand(): Command {
|
||||
if (sswResp.code !== 200 || !sswResp.data?.aiModelList?.length) {
|
||||
log.error(`SSW AI 推理失败 (code=${sswResp.code}): ${sswResp.msg || '返空'}`)
|
||||
log.error('提示: 检查 base_ai 配置是否启用 (dacli app login 后查 /system/Ai list)')
|
||||
process.exit(2)
|
||||
return ctx.fail(`SSW AI 推理失败 (code=${sswResp.code}): ${sswResp.msg || '返空'}`, { table: opts.table })
|
||||
}
|
||||
const aiModelList: any[] = sswResp.data.aiModelList
|
||||
log.info(` ↳ SSW AI 推理完成: ${aiModelList[0].fields?.length || 0} 字段`)
|
||||
@@ -597,13 +608,12 @@ export function buildFormCreateCommand(): Command {
|
||||
// 校验必填
|
||||
if (!opts.fullName || !opts.enCode) {
|
||||
log.error('--fullName 和 --enCode 必填 (或传 --ai "<描述>" 由平台 AI 自动生成)')
|
||||
process.exit(2)
|
||||
return ctx.fail('--fullName 和 --enCode 必填 (或传 --ai "<描述>")', { enCode: opts.enCode })
|
||||
}
|
||||
|
||||
// --via=ui 走 UI 路径 (playwright 模拟人类操作)
|
||||
if (opts.via === 'ui') {
|
||||
log.info(`--via=ui 走 UI 路径 (playwright 模拟人类在 formDesign 创建表单)`)
|
||||
const c = await JnpfClient.fromToken()
|
||||
const result = await createFormViaUi({
|
||||
appCode: c.appCode,
|
||||
fullName: opts.fullName,
|
||||
@@ -617,11 +627,10 @@ export function buildFormCreateCommand(): Command {
|
||||
log.error(`UI 路径失败: ${result.error}`)
|
||||
}
|
||||
if (opts.json) printJson(result)
|
||||
if (!result.ok) process.exit(1)
|
||||
return
|
||||
if (!result.ok) return ctx.fail(`UI 路径失败: ${result.error}`, { enCode: opts.enCode })
|
||||
return ctx.success({ id: result.id, enCode: result.enCode })
|
||||
}
|
||||
|
||||
const c = await JnpfClient.fromToken()
|
||||
const type = Number(opts.type)
|
||||
const webType = Number(opts.webType)
|
||||
// '--dbLinkId=default' 字面量 → token.dbLinkId (与 web formDesign Form.vue 一致)
|
||||
@@ -693,7 +702,7 @@ export function buildFormCreateCommand(): Command {
|
||||
if (opts.fields) {
|
||||
log.error('--fields 已废弃, 请用 --ai "<描述>" (v0.12+ 走 web 端 buildFormData, schema 自动完整)')
|
||||
log.error('例: --ai "客户管理:姓名、电话、邮箱"')
|
||||
process.exit(2)
|
||||
return ctx.fail('--fields 已废弃, 请用 --ai "<描述>"', { enCode: opts.enCode })
|
||||
}
|
||||
// ai-json 路径下从 buildFormData 拿完整 fields (含 __config__ 全部 18 键)
|
||||
const formDataObj: any = (opts as any).__aiBuildFormData
|
||||
@@ -1346,7 +1355,7 @@ export function buildFormCreateCommand(): Command {
|
||||
if (opts.json) {
|
||||
printJson({ ok: false, validation: validation.steps })
|
||||
}
|
||||
process.exit(1)
|
||||
return ctx.fail('step machine 参数校验失败', { enCode: opts.enCode })
|
||||
}
|
||||
log.ok(`✓ step machine 校验通过 (3/3)`)
|
||||
// step 0 基础信息 (P0 镜像 web Form.vue schemas)
|
||||
@@ -1364,7 +1373,7 @@ export function buildFormCreateCommand(): Command {
|
||||
log.error(`创建失败 (code=${r.code}): ${r.msg}`)
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 0, stepName: '后端API' })}`)
|
||||
if (opts.json) printJson(r)
|
||||
process.exit(1)
|
||||
return ctx.fail(`创建失败 (code=${r.code}): ${r.msg}`, { enCode: opts.enCode, code: r.code })
|
||||
}
|
||||
|
||||
// 拉 id (响应通常不回 id, 反查 list — 走 webapi getVisualDevList)
|
||||
@@ -1399,10 +1408,10 @@ export function buildFormCreateCommand(): Command {
|
||||
log.error(`✗ 发布失败 (重试仍失败): ${e2.message}`)
|
||||
log.error(`手动发布: curl -X POST '${c.baseUrl}/visualdev/Base/${newId}/Actions/Release' -H 'Authorization: Bearer <token>'`)
|
||||
if (opts.json) printJson({ id: newId, enCode: opts.enCode, type, webType, releaseError: e2.message })
|
||||
process.exit(1)
|
||||
return ctx.fail(`发布失败 (重试仍失败): ${e2.message}`, { id: newId, enCode: opts.enCode })
|
||||
}
|
||||
}
|
||||
if (!releaseOk) process.exit(1)
|
||||
if (!releaseOk) return ctx.fail('发布失败 (state 未切到 1)', { id: newId, enCode: opts.enCode })
|
||||
|
||||
// 透明化物理表状态
|
||||
try {
|
||||
@@ -1508,6 +1517,10 @@ export function buildFormCreateCommand(): Command {
|
||||
process.stdout.write(` 详情: dacli log last\n`)
|
||||
}
|
||||
} catch { /* 日志保存失败不阻塞 */ }
|
||||
} catch (e) {
|
||||
return ctx.fail(`form create 失败: ${(e as Error).message?.slice(0, 200)}`, { enCode: opts.enCode })
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
installHelpHookWithPatterns(cmd, 'form create', {
|
||||
|
||||
Reference in new issue
Block a user