From bb2d485d9154fa4a4402c4d7a33e37878d9c6b7a Mon Sep 17 00:00:00 2001 From: ssw Date: Tue, 21 Jul 2026 20:21:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(dacli):=20app/create.ts=20=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=20wrapCommand=20=E8=BF=81=E7=A7=BB=20(P6=201=20exit?= =?UTF-8?q?=20=E6=94=B6=E5=8F=A3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 处 process.exit(1) → ctx.fail() (catch 末尾): - runCreate 抛 AppCreateError 或其他 Error → wrapCommand handler catch - 显式 AppCreateError 分支: ctx.fail([step] msg, { stepName }) - 其他 Error: ctx.fail(app create 失败, { appCode, appName }) runCreate 内部 4 处 throw AppCreateError (v2.1+ P1-2b 已就绪) 不变, wrapCommand handler 直接 catch 走 ctx.fail 收口. console.log(JSON.stringify) → log.raw(JSON.stringify+\n) (走 quiet buffer). 修改方式: Edit (导入 + 整块 .action 替换). 验证: - TS compile 0 新错误 (baseline 57 不变) - 73/73 单元测试 PASS --- src/commands/app/create.ts | 111 +++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 60 deletions(-) diff --git a/src/commands/app/create.ts b/src/commands/app/create.ts index a5a0761..941d93b 100644 --- a/src/commands/app/create.ts +++ b/src/commands/app/create.ts @@ -33,7 +33,7 @@ import { saveAppAuth, } from '../../webapi/system.ts' import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix (S-X1/S-X2 silent + G-X1 suggest) -import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): stdout 三模式 + CommandLog 落盘 +import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ 输出过滤; v2.2+ wrapCommand 收口 5c /** * v2.1+ P1-2b: AppCreateError — 用于 runCreate 内部 4 处 process.exit(1) 替换 @@ -87,12 +87,10 @@ export function buildAppCreateCommand(): Command { .option('--force-rebuild', '已存在时强制删旧 datasource 重建', false) .option('--skip-grant', '跳过 saveAppAuthorization', false) .option('--skip-db', '跳过 ssw-common 真建 DB (用户已建好)', false) - .option('--verbose', '完整输出 (含 step machine、API 调用等过程日志)', false) - .option('--json', '原始 JSON 输出', false) + addOutputOptions(cmd) .action(async (opts: CreateOpts) => { // v2.1+ L1: stdout 三模式 setupOutputFilter(opts) - const startTime = Date.now() let c: Awaited> try { @@ -109,63 +107,56 @@ export function buildAppCreateCommand(): Command { Object.assign(opts, cmdFix.opts) } - // v2.1+ P1-2b: 集中 try/catch 替换 4 处 process.exit(1) - try { - const result = await runCreate(opts) - // success path — 落 CommandLog - log.info('================================') - log.ok('应用创建完成') - const { systemId, dbLinkId, dbName } = result - const summary = { - appCode: opts.appCode, - appName: opts.appName, - systemId, - dbLinkId, - dbName, + await wrapCommand({ + command: 'app create', + appCode: opts.appCode, + startTime: Date.now(), + verbose: opts.verbose, + json: opts.json, + fixes: [], + }, async (ctx) => { + try { + const result = await runCreate(opts) + log.info('================================') + log.ok('应用创建完成') + const { systemId, dbLinkId, dbName } = result + const summary = { + appCode: opts.appCode, + appName: opts.appName, + systemId, + dbLinkId, + dbName, + } + if (opts.json) { + log.raw(JSON.stringify(summary, null, 2) + '\n') + } else { + log.info(` appCode : ${summary.appCode}`) + log.info(` appName : ${summary.appName}`) + log.info(` systemId : ${summary.systemId}`) + log.info(` dbLinkId : ${summary.dbLinkId || '(跳过 DB)'}`) + log.info(` dbName : ${summary.dbName}`) + log.info('') + log.info('下一步:') + log.info(` dacli form list # 应有 0 个 form`) + log.info(` dacli dm create --table=... # 建第一个业务表`) + log.info(` dacli form create --enCode=... --table=...`) + log.info(` 浏览器: http://nginx/jnpf_app_${opts.appCode}`) + } + ctx.success(summary) + } catch (e) { + if (e instanceof AppCreateError) { + log.error(` ✗ 应用创建失败 [${e.stepName}]: ${e.message}`) + return ctx.fail(`[${e.stepName}] ${e.message}`, { + appCode: opts.appCode, + appName: opts.appName, + stepName: e.stepName, + }) + } + const msg = (e as Error).message?.slice(0, 200) || String(e) + log.error(` ✗ 应用创建失败: ${msg}`) + ctx.fail(`app create 失败: ${msg}`, { appCode: opts.appCode, appName: opts.appName }) } - if (opts.json) { - console.log(JSON.stringify(summary, null, 2)) - } else { - log.info(` appCode : ${summary.appCode}`) - log.info(` appName : ${summary.appName}`) - log.info(` systemId : ${summary.systemId}`) - log.info(` dbLinkId : ${summary.dbLinkId || '(跳过 DB)'}`) - log.info(` dbName : ${summary.dbName}`) - log.info('') - log.info('下一步:') - log.info(` dacli form list # 应有 0 个 form`) - log.info(` dacli dm create --table=... # 建第一个业务表`) - log.info(` dacli form create --enCode=... --table=...`) - log.info(` 浏览器: http://nginx/jnpf_app_${opts.appCode}`) - } - printCommandEnd({ - command: 'app create', - appCode: opts.appCode, - summary: { appCode: opts.appCode, systemId, dbLinkId, dbName }, - fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions], - duration_ms: Date.now() - startTime, - verbose: opts.verbose, - json: opts.json, - }) - } catch (e) { - if (e instanceof AppCreateError) { - log.error(` ✗ 应用创建失败 [${e.stepName}]: ${e.message}`) - } else { - log.error(` ✗ 应用创建失败: ${(e as Error).message}`) - } - printCommandEnd({ - command: 'app create', - appCode: opts.appCode, - result: 'failure', - summary: { appCode: opts.appCode, appName: opts.appName }, - fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions], - error: e instanceof AppCreateError ? e.message : (e as Error).message, - duration_ms: Date.now() - startTime, - verbose: opts.verbose, - json: opts.json, - }) - process.exit(1) - } + }) }) installHelpHook(cmd, {