feat(dacli): wrapCommand helper 收口 5c 样板 (P0)
P0 of ADR 0015 (源码遗留清单): 39+ 命令文件散布 printCommandEnd + process.exit
样板, 5 个重复字段 (command/appCode/fixes/duration_ms/verbose+json) 在每个出错
分支都要 copy-paste + 配 process.exit(1). 加 wrapCommand helper:
wrapCommand({command, appCode, startTime, verbose, json, fixes}, async (ctx) => {
if (failure) ctx.fail('msg', summary) // exit 1
else if (partial) ctx.partial('msg', summary)
else ctx.success(summary)
})
替换 6 命令文件样板:
- datasource/{create, delete, list, test}.ts
- dict/typecreate.ts (含 partial case)
- menu/create.ts (原本有 local printEnd, 现在切到 wrapCommand)
17 单测覆盖 (5c × 3 路径 + 必填项 + 透传参数).
后续 P1-P6 (见 ADR 0015):
- P1: storage/info.ts + dm/drop.ts 2 小坑
- P3: 18 个 per-module _validate.ts 改为统一 import 错误码
- P4: addOutputOptions 迁移 38 文件 (L1 stdout 文案统一)
- P5: console.log + throw new Error 统一收口
- P6: 350+ 裸 process.exit 跨 session 治理 (大坑)
测试: 17/17 wrapCommand 单测 + 65/65 跨模块 + 0 新 TS 错误.
端到端: datasource list/delete/test --help + menu create --help 验证.
This commit is contained in:
1 parent
7cdc8187cc
commit
c637a589a4
9 files changed
+820
-620
No files matched your search
@@ -23,3 +23,4 @@ generated/
|
||||
.env.*
|
||||
!.env.example
|
||||
.DS_Store
|
||||
tsconfig.vitest-temp.json
|
||||
@@ -89,6 +89,122 @@ export interface PrintCommandEndArgs {
|
||||
json?: boolean
|
||||
}
|
||||
|
||||
/**
|
||||
* commands/_output_filter.ts — wrapCommand (v2.2+, 2026-07-21 累 commit 设计)
|
||||
*
|
||||
* 收口 5c 跨命令样板 (详见 ADR 0015 §P0 wrapCommand helper):
|
||||
* 1. command (字符串字面量)
|
||||
* 2. appCode (c.appCode)
|
||||
* 3. fixes ([...silent, ...assertive, ...suggestions] 三档合并)
|
||||
* 4. duration_ms (Date.now() - startTime)
|
||||
* 5. verbose + json (opts 透传)
|
||||
* + process.exit(1) after failure
|
||||
*
|
||||
* 调用方原本 ~12-15 行样板 → wrapCommand 提供 ctx, 改成 ctx.success / ctx.fail / ctx.partial 三种语义清的方法。
|
||||
*
|
||||
* 用法 (替换 printCommandEnd + process.exit(1) 散布):
|
||||
* addOutputOptions(cmd)
|
||||
* .action(async (opts) => {
|
||||
* setupOutputFilter(opts)
|
||||
* const c = await JnpfClient.fromToken()
|
||||
* const fixCtx = await fetchExistingLists(c, c.appCode)
|
||||
* const cmdFix = runCommandAutoFix(opts as any, fixCtx)
|
||||
* if (cmdFix.silent.length) Object.assign(opts, cmdFix.opts)
|
||||
*
|
||||
* await wrapCommand({
|
||||
* command: 'datasource create',
|
||||
* appCode: c.appCode,
|
||||
* startTime: Date.now(),
|
||||
* verbose: opts.verbose,
|
||||
* json: opts.json,
|
||||
* fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
* }, async (ctx) => {
|
||||
* const validation = validateDatasourceCreate({...})
|
||||
* if (!validation.ok) {
|
||||
* ctx.fail(errLines.join('; '), { enCode: opts.enCode }) // exit 1
|
||||
* return // unreachable, ctx.fail returns never
|
||||
* }
|
||||
* const r = await loadDataSource.createDataSource(body)
|
||||
* if (r.code !== 200) {
|
||||
* ctx.fail(`create failed: ${r.msg}`, { enCode: opts.enCode })
|
||||
* return
|
||||
* }
|
||||
* ctx.success({ id, enCode: opts.enCode })
|
||||
* })
|
||||
* })
|
||||
*
|
||||
* 设计:
|
||||
* - ctx.fail / ctx.partial 在 printCommandEnd 后会调 process.exit (1/0),
|
||||
* return 类型 'never' 让 TS 检测出 unreachable code 缺口
|
||||
* - handler 里 throw 也走 ctx.fail 路径 (catch 后 exit 1 + 落 failure log)
|
||||
* - async wrapCommand 返回 Promise<void>, commander .action() 可 await
|
||||
*/
|
||||
export interface WrapCommandArgs {
|
||||
/** 命令名 (e.g. 'datasource create') — 透传到 printCommandEnd */
|
||||
command: string
|
||||
/** appCode — 透传到 printCommandEnd (决定是否落 CommandLog) */
|
||||
appCode?: string
|
||||
/** 命令启动时间戳 (用 Date.now() 拿) — wrapCommand 调用时计算 duration_ms */
|
||||
startTime: number
|
||||
/** --verbose flag — 透传到 printCommandEnd */
|
||||
verbose?: boolean
|
||||
/** --json flag — 透传到 printCommandEnd */
|
||||
json?: boolean
|
||||
/** 跨命令 fixes (来自 runCommandAutoFix 的 silent+assertive+suggestions 合并) */
|
||||
fixes?: FixEntry[]
|
||||
}
|
||||
|
||||
export interface WrapCommandContext {
|
||||
/** 成功路径: 落 CommandLog (success) + stdout 打印 summary */
|
||||
success(summary?: Record<string, unknown>): void
|
||||
/** 部分成功: 落 CommandLog (partial) + 报告 error */
|
||||
partial(error: string, summary?: Record<string, unknown>): void
|
||||
/** 失败路径: 落 CommandLog (failure) + 打印 error + process.exit(1) (never) */
|
||||
fail(error: string, summary?: Record<string, unknown>): never
|
||||
}
|
||||
|
||||
export async function wrapCommand(
|
||||
args: WrapCommandArgs,
|
||||
handler: (ctx: WrapCommandContext) => Promise<void> | void,
|
||||
): Promise<void> {
|
||||
const buildArgs = (
|
||||
result: 'success' | 'failure' | 'partial',
|
||||
summary?: Record<string, unknown>,
|
||||
error?: string,
|
||||
): PrintCommandEndArgs => ({
|
||||
command: args.command,
|
||||
appCode: args.appCode,
|
||||
result,
|
||||
summary,
|
||||
error,
|
||||
fixes: args.fixes,
|
||||
duration_ms: Date.now() - args.startTime,
|
||||
verbose: args.verbose,
|
||||
json: args.json,
|
||||
})
|
||||
|
||||
const ctx: WrapCommandContext = {
|
||||
success(summary) {
|
||||
printCommandEnd(buildArgs('success', summary))
|
||||
},
|
||||
partial(error, summary) {
|
||||
printCommandEnd(buildArgs('partial', summary, error))
|
||||
},
|
||||
fail(error, summary): never {
|
||||
printCommandEnd(buildArgs('failure', summary, error))
|
||||
process.exit(1)
|
||||
},
|
||||
}
|
||||
|
||||
try {
|
||||
await handler(ctx)
|
||||
} catch (e: unknown) {
|
||||
const errMsg = ((e as { message?: string })?.message || String(e)).slice(0, 200)
|
||||
printCommandEnd(buildArgs('failure', undefined, errMsg))
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 命令结束后调用: 落 CommandLog (L3) + 打印 summary + "详情: dacli log last" 提示 (L1)
|
||||
*
|
||||
|
||||
@@ -12,7 +12,7 @@ import { encryptAesEcb, isEncrypted } from '../../core/crypto.ts'
|
||||
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
|
||||
import { validateDatasourceCreate } from './_validate.ts'
|
||||
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
||||
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
|
||||
import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘; v2.2+ wrapCommand helper 收口 5c 样板
|
||||
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 命令级 auto-fix (S-X1/S-X2/G-X1)
|
||||
|
||||
interface CreateOpts {
|
||||
@@ -45,7 +45,6 @@ export function buildDatasourceCreateCommand(): Command {
|
||||
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
|
||||
setupOutputFilter(opts)
|
||||
const c = await JnpfClient.fromToken()
|
||||
const startTime = Date.now()
|
||||
|
||||
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (S-X1/S-X2/G-X1)
|
||||
const fixCtx = await fetchExistingLists(c, c.appCode)
|
||||
@@ -54,108 +53,86 @@ export function buildDatasourceCreateCommand(): Command {
|
||||
Object.assign(opts, cmdFix.opts)
|
||||
}
|
||||
|
||||
await initWebapi(c)
|
||||
|
||||
// v0.11e+ Phase D1: step machine 校验 (镜像 web dataSource/Form.vue + DB001 数据库类型)
|
||||
// v0.11e+ Phase B2: auto-authorize (镜像 web 数据源接入菜单 createMenu/Actions/Module 授权给当前角色)
|
||||
const validation = validateDatasourceCreate({
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
dbType: opts.dbType,
|
||||
host: opts.host,
|
||||
port: opts.port,
|
||||
userName: opts.user,
|
||||
password: opts.password,
|
||||
serviceName: opts.serviceName,
|
||||
})
|
||||
if (!validation.ok) {
|
||||
const errLines: string[] = []
|
||||
for (const s of validation.steps) {
|
||||
for (const e of s.errors) {
|
||||
const msg = ` ${formatErrorLine(e, { step: s.step, stepName: s.stepName })}`
|
||||
errLines.push(msg)
|
||||
log.error(msg)
|
||||
}
|
||||
}
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
command: 'datasource create',
|
||||
appCode: c.appCode,
|
||||
result: 'failure',
|
||||
error: errLines.join('; '),
|
||||
summary: { enCode: opts.enCode },
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
process.exit(1)
|
||||
}
|
||||
log.info(`✓ step machine 校验通过 (${validation.steps.length}/${validation.steps.length})`)
|
||||
// step 0 基础信息 (P0 镜像 web Form.vue schemas)
|
||||
|
||||
const body: Record<string, unknown> = {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
dbType: opts.dbType,
|
||||
host: opts.host,
|
||||
port: opts.port,
|
||||
userName: opts.user,
|
||||
password: opts.password,
|
||||
enabledMark: 1,
|
||||
sortCode: 0,
|
||||
}
|
||||
if (opts.serviceName) body.serviceName = opts.serviceName
|
||||
// 密码按 web Form.vue: handleSubmit 习惯 AES-ECB 加密 (Hex 输出)
|
||||
if (opts.password) {
|
||||
body.password = isEncrypted(opts.password) ? opts.password : encryptAesEcb(opts.password)
|
||||
}
|
||||
// web Form.vue: data.oracleExtend = !!values.oracleExtend → 必须显式设, 否则 DbLinkBaseForm.getOracleExtend() NPE
|
||||
body.oracleExtend = opts.dbType === 'Oracle' ? 1 : 0
|
||||
log.debug(`[datasource create] body=${JSON.stringify(body)}`)
|
||||
const r = (await loadDataSource.createDataSource(body)) as { id?: string; code?: number; msg?: string }
|
||||
if (r.code !== undefined && r.code !== 200) {
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
|
||||
const errMsg = ` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`
|
||||
log.error(errMsg)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
command: 'datasource create',
|
||||
appCode: c.appCode,
|
||||
result: 'failure',
|
||||
error: errMsg,
|
||||
summary: { enCode: opts.enCode },
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
process.exit(1)
|
||||
}
|
||||
let id = r.id
|
||||
// 参考 menu create 历史模式: 响应可能不返 id, 按 enCode 反查 list
|
||||
if (!id) {
|
||||
const listR = (await loadDataSource.getDataSourceList({
|
||||
keyword: opts.enCode,
|
||||
pageSize: 50,
|
||||
})) as { list?: { id: string; enCode: string; fullName: string }[] }
|
||||
log.debug(`[datasource create] listR.list=${JSON.stringify(listR.list).slice(0, 200)}`)
|
||||
const found = (listR.list || []).find(
|
||||
(d) => d.enCode === opts.enCode || d.fullName === opts.fullName,
|
||||
)
|
||||
id = found?.id
|
||||
}
|
||||
log.info(`✓ 数据源创建成功 id=${id}`)
|
||||
if (opts.json) printJson({ ...(r as object), id })
|
||||
// v2.1+ (2026-07-21): 成功路径落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
await wrapCommand({
|
||||
command: 'datasource create',
|
||||
appCode: c.appCode,
|
||||
summary: { id, enCode: opts.enCode },
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
}, async (ctx) => {
|
||||
await initWebapi(c)
|
||||
|
||||
// v0.11e+ Phase D1: step machine 校验 (镜像 web dataSource/Form.vue + DB001 数据库类型)
|
||||
// v0.11e+ Phase B2: auto-authorize (镜像 web 数据源接入菜单 createMenu/Actions/Module 授权给当前角色)
|
||||
const validation = validateDatasourceCreate({
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
dbType: opts.dbType,
|
||||
host: opts.host,
|
||||
port: opts.port,
|
||||
userName: opts.user,
|
||||
password: opts.password,
|
||||
serviceName: opts.serviceName,
|
||||
})
|
||||
if (!validation.ok) {
|
||||
const errLines: string[] = []
|
||||
for (const s of validation.steps) {
|
||||
for (const e of s.errors) {
|
||||
const msg = ` ${formatErrorLine(e, { step: s.step, stepName: s.stepName })}`
|
||||
errLines.push(msg)
|
||||
log.error(msg)
|
||||
}
|
||||
}
|
||||
ctx.fail(errLines.join('; '), { enCode: opts.enCode })
|
||||
return
|
||||
}
|
||||
log.info(`✓ step machine 校验通过 (${validation.steps.length}/${validation.steps.length})`)
|
||||
// step 0 基础信息 (P0 镜像 web Form.vue schemas)
|
||||
|
||||
const body: Record<string, unknown> = {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
dbType: opts.dbType,
|
||||
host: opts.host,
|
||||
port: opts.port,
|
||||
userName: opts.user,
|
||||
password: opts.password,
|
||||
enabledMark: 1,
|
||||
sortCode: 0,
|
||||
}
|
||||
if (opts.serviceName) body.serviceName = opts.serviceName
|
||||
// 密码按 web Form.vue: handleSubmit 习惯 AES-ECB 加密 (Hex 输出)
|
||||
if (opts.password) {
|
||||
body.password = isEncrypted(opts.password) ? opts.password : encryptAesEcb(opts.password)
|
||||
}
|
||||
// web Form.vue: data.oracleExtend = !!values.oracleExtend → 必须显式设, 否则 DbLinkBaseForm.getOracleExtend() NPE
|
||||
body.oracleExtend = opts.dbType === 'Oracle' ? 1 : 0
|
||||
log.debug(`[datasource create] body=${JSON.stringify(body)}`)
|
||||
const r = (await loadDataSource.createDataSource(body)) as { id?: string; code?: number; msg?: string }
|
||||
if (r.code !== undefined && r.code !== 200) {
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
|
||||
const errMsg = ` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { enCode: opts.enCode })
|
||||
return
|
||||
}
|
||||
let id = r.id
|
||||
// 参考 menu create 历史模式: 响应可能不返 id, 按 enCode 反查 list
|
||||
if (!id) {
|
||||
const listR = (await loadDataSource.getDataSourceList({
|
||||
keyword: opts.enCode,
|
||||
pageSize: 50,
|
||||
})) as { list?: { id: string; enCode: string; fullName: string }[] }
|
||||
log.debug(`[datasource create] listR.list=${JSON.stringify(listR.list).slice(0, 200)}`)
|
||||
const found = (listR.list || []).find(
|
||||
(d) => d.enCode === opts.enCode || d.fullName === opts.fullName,
|
||||
)
|
||||
id = found?.id
|
||||
}
|
||||
log.info(`✓ 数据源创建成功 id=${id}`)
|
||||
if (opts.json) printJson({ ...(r as object), id })
|
||||
ctx.success({ id, enCode: opts.enCode })
|
||||
})
|
||||
})
|
||||
installHelpHook(cmd, {
|
||||
|
||||
@@ -9,7 +9,7 @@ import { JnpfClient } from '../../core/client.ts'
|
||||
import { installHelpHook } from '../../core/help.ts'
|
||||
import { log } from '../../core/log.ts'
|
||||
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
|
||||
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (delete 历史可追溯)
|
||||
import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (delete 历史可追溯); v2.2+ wrapCommand helper 收口 5c 样板
|
||||
|
||||
interface DeleteOpts {
|
||||
id: string
|
||||
@@ -29,40 +29,31 @@ export function buildDatasourceDeleteCommand(): Command {
|
||||
// 输出过滤: 默认静默
|
||||
setupOutputFilter(opts)
|
||||
const c = await JnpfClient.fromToken()
|
||||
const startTime = Date.now()
|
||||
|
||||
// 无 --yes 时: UX 流程控制, 不属命令失败, 不落 CommandLog (与其他 delete 命令一致)
|
||||
if (!opts.yes) {
|
||||
log.warn(`即将删除数据源 id=${opts.id}, 加 --yes 跳过确认`)
|
||||
process.exit(2)
|
||||
}
|
||||
await initWebapi(c)
|
||||
const r = (await loadDataSource.delDataSource(opts.id)) as { code?: number; msg?: string }
|
||||
if (r.code !== undefined && r.code !== 200) {
|
||||
const errMsg = `datasource delete 失败: ${r.msg}`
|
||||
log.error(errMsg)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
command: 'datasource delete',
|
||||
appCode: c.appCode,
|
||||
result: 'failure',
|
||||
error: errMsg,
|
||||
summary: { id: opts.id },
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
process.exit(1)
|
||||
}
|
||||
log.info(`✓ 数据源 id=${opts.id} 已删除`)
|
||||
// v2.1+ (2026-07-21): 成功路径落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
|
||||
await wrapCommand({
|
||||
command: 'datasource delete',
|
||||
appCode: c.appCode,
|
||||
summary: { id: opts.id },
|
||||
duration_ms: Date.now() - startTime,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
await initWebapi(c)
|
||||
const r = (await loadDataSource.delDataSource(opts.id)) as { code?: number; msg?: string }
|
||||
if (r.code !== undefined && r.code !== 200) {
|
||||
const errMsg = `datasource delete 失败: ${r.msg}`
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { id: opts.id })
|
||||
return
|
||||
}
|
||||
log.info(`✓ 数据源 id=${opts.id} 已删除`)
|
||||
ctx.success({ id: opts.id })
|
||||
})
|
||||
})
|
||||
installHelpHook(cmd, {
|
||||
|
||||
@@ -9,7 +9,7 @@ import { JnpfClient } from '../../core/client.ts'
|
||||
import { installHelpHook } from '../../core/help.ts'
|
||||
import { log, printJson } from '../../core/log.ts'
|
||||
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
|
||||
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (list 类查询历史可追溯)
|
||||
import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘 (list 类查询历史可追溯); v2.2+ wrapCommand helper 收口 5c 样板
|
||||
|
||||
interface ListOpts {
|
||||
keyword?: string
|
||||
@@ -27,51 +27,44 @@ export function buildDatasourceListCommand(): Command {
|
||||
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
|
||||
setupOutputFilter(opts)
|
||||
const c = await JnpfClient.fromToken()
|
||||
const startTime = Date.now()
|
||||
let cmdError: string | undefined
|
||||
let cmdSummary: Record<string, unknown> = {}
|
||||
|
||||
try {
|
||||
await initWebapi(c)
|
||||
const data = (await loadDataSource.getDataSourceList({ keyword: opts.keyword })) as {
|
||||
list?: Record<string, unknown>[]
|
||||
await wrapCommand({
|
||||
command: 'datasource list',
|
||||
appCode: c.appCode,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
try {
|
||||
await initWebapi(c)
|
||||
const data = (await loadDataSource.getDataSourceList({ keyword: opts.keyword })) as {
|
||||
list?: Record<string, unknown>[]
|
||||
}
|
||||
const list = data?.list || []
|
||||
const summary = {
|
||||
keyword: opts.keyword,
|
||||
total: list.length,
|
||||
}
|
||||
if (opts.json) {
|
||||
printJson(data)
|
||||
return ctx.success(summary)
|
||||
}
|
||||
log.info(`共 ${list.length} 个数据源`)
|
||||
console.log('ID'.padEnd(30) + 'FULL_NAME'.padEnd(23) + 'ENCODE'.padEnd(21) + 'DB_TYPE')
|
||||
console.log('-'.repeat(90))
|
||||
for (const d of list) {
|
||||
const id = String(d.id || '').padEnd(30)
|
||||
const name = String(d.fullName || '').padEnd(23)
|
||||
const code = String(d.enCode || '').padEnd(21)
|
||||
const type = String(d.dbType || '')
|
||||
console.log(`${id}${name}${code}${type}`)
|
||||
}
|
||||
ctx.success(summary)
|
||||
} catch (e) {
|
||||
ctx.fail(`datasource list 失败: ${(e as Error).message?.slice(0, 200)}`)
|
||||
}
|
||||
const list = data?.list || []
|
||||
cmdSummary = {
|
||||
keyword: opts.keyword,
|
||||
total: list.length,
|
||||
}
|
||||
if (opts.json) {
|
||||
printJson(data)
|
||||
return
|
||||
}
|
||||
log.info(`共 ${list.length} 个数据源`)
|
||||
console.log('ID'.padEnd(30) + 'FULL_NAME'.padEnd(23) + 'ENCODE'.padEnd(21) + 'DB_TYPE')
|
||||
console.log('-'.repeat(90))
|
||||
for (const d of list) {
|
||||
const id = String(d.id || '').padEnd(30)
|
||||
const name = String(d.fullName || '').padEnd(23)
|
||||
const code = String(d.enCode || '').padEnd(21)
|
||||
const type = String(d.dbType || '')
|
||||
console.log(`${id}${name}${code}${type}`)
|
||||
}
|
||||
} catch (e) {
|
||||
cmdError = (e as Error).message?.slice(0, 200)
|
||||
log.error(`datasource list 失败: ${cmdError}`)
|
||||
} finally {
|
||||
// v2.1+ (2026-07-21): 落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
command: 'datasource list',
|
||||
appCode: c.appCode,
|
||||
result: cmdError ? 'failure' : 'success',
|
||||
error: cmdError,
|
||||
summary: cmdSummary,
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
if (cmdError) process.exit(1)
|
||||
}
|
||||
})
|
||||
})
|
||||
installHelpHook(cmd, {
|
||||
purpose: '列出当前应用所有数据源 (MySQL/SQLServer/Oracle/PostgreSQL 等)',
|
||||
|
||||
@@ -11,7 +11,7 @@ import { log, printJson } from '../../core/log.ts'
|
||||
import { encryptAesEcb, isEncrypted } from '../../core/crypto.ts'
|
||||
import { initWebapi, loadDataSource } from '../../webapi/dataSource.ts'
|
||||
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
||||
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
|
||||
import { setupOutputFilter, addOutputOptions, wrapCommand } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘; v2.2+ wrapCommand helper 收口 5c 样板
|
||||
|
||||
interface TestOpts {
|
||||
id?: string
|
||||
@@ -41,56 +41,51 @@ export function buildDatasourceTestCommand(): Command {
|
||||
// 输出过滤: 默认静默
|
||||
setupOutputFilter(opts)
|
||||
const c = await JnpfClient.fromToken()
|
||||
const startTime = Date.now()
|
||||
let cmdError: string | undefined
|
||||
let cmdSummary: Record<string, unknown> = {}
|
||||
|
||||
try {
|
||||
await initWebapi(c)
|
||||
let body: Record<string, unknown>
|
||||
if (opts.id) {
|
||||
// 按 id 拉配置 (用 webapi), password 已被后端加密存储, 直接转发 (不要再加密)
|
||||
const data = (await loadDataSource.getDataSourceInfo(opts.id)) as Record<string, unknown>
|
||||
body = { ...data, id: undefined, oracleExtend: data.dbType === 'Oracle' ? 1 : 0 }
|
||||
} else if (opts.host && opts.dbType) {
|
||||
body = {
|
||||
dbType: opts.dbType,
|
||||
host: opts.host,
|
||||
port: opts.port,
|
||||
userName: opts.user,
|
||||
password: opts.password ? (isEncrypted(opts.password) ? opts.password : encryptAesEcb(opts.password)) : '',
|
||||
serviceName: opts.serviceName,
|
||||
oracleExtend: opts.dbType === 'Oracle' ? 1 : 0,
|
||||
await wrapCommand({
|
||||
command: 'datasource test',
|
||||
appCode: c.appCode,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
try {
|
||||
await initWebapi(c)
|
||||
let body: Record<string, unknown>
|
||||
if (opts.id) {
|
||||
// 按 id 拉配置 (用 webapi), password 已被后端加密存储, 直接转发 (不要再加密)
|
||||
const data = (await loadDataSource.getDataSourceInfo(opts.id)) as Record<string, unknown>
|
||||
body = { ...data, id: undefined, oracleExtend: data.dbType === 'Oracle' ? 1 : 0 }
|
||||
} else if (opts.host && opts.dbType) {
|
||||
body = {
|
||||
dbType: opts.dbType,
|
||||
host: opts.host,
|
||||
port: opts.port,
|
||||
userName: opts.user,
|
||||
password: opts.password ? (isEncrypted(opts.password) ? opts.password : encryptAesEcb(opts.password)) : '',
|
||||
serviceName: opts.serviceName,
|
||||
oracleExtend: opts.dbType === 'Oracle' ? 1 : 0,
|
||||
}
|
||||
} else {
|
||||
throw new Error('请传 --id <数据源 id> 或 --dbType + --host + --user + --password')
|
||||
}
|
||||
} else {
|
||||
throw new Error('请传 --id <数据源 id> 或 --dbType + --host + --user + --password')
|
||||
const r = (await loadDataSource.testDbConnection(body)) as { code?: number; msg?: string; data?: unknown }
|
||||
if (r.code !== undefined && r.code !== 200) {
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
|
||||
throw new Error(formatErrorLine(enhanced, { step: 0, stepName: '后端API' }))
|
||||
}
|
||||
log.info(`✓ 数据源连接成功`)
|
||||
const summary = { id: opts.id, dbType: opts.dbType || body.dbType as string, ok: true }
|
||||
if (opts.json) printJson(r.data)
|
||||
ctx.success(summary)
|
||||
} catch (e) {
|
||||
const errMsg = (e as Error).message?.slice(0, 200) || String(e)
|
||||
log.error(`datasource test 失败: ${errMsg}`)
|
||||
if (opts.json) printJson({ error: errMsg })
|
||||
ctx.fail(`datasource test 失败: ${errMsg}`)
|
||||
}
|
||||
const r = (await loadDataSource.testDbConnection(body)) as { code?: number; msg?: string; data?: unknown }
|
||||
if (r.code !== undefined && r.code !== 200) {
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'datasource', { entity: 'datasource' })
|
||||
throw new Error(formatErrorLine(enhanced, { step: 0, stepName: '后端API' }))
|
||||
}
|
||||
log.info(`✓ 数据源连接成功`)
|
||||
cmdSummary = { id: opts.id, dbType: opts.dbType || body.dbType as string, ok: true }
|
||||
if (opts.json) printJson(r.data)
|
||||
} catch (e) {
|
||||
cmdError = (e as Error).message?.slice(0, 200)
|
||||
log.error(`datasource test 失败: ${cmdError}`)
|
||||
if (opts.json) printJson({ error: cmdError })
|
||||
} finally {
|
||||
// v2.1+ (2026-07-21): 落 CommandLog (L3)
|
||||
printCommandEnd({
|
||||
command: 'datasource test',
|
||||
appCode: c.appCode,
|
||||
result: cmdError ? 'failure' : 'success',
|
||||
error: cmdError,
|
||||
summary: cmdSummary,
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
if (cmdError) process.exit(1)
|
||||
}
|
||||
})
|
||||
})
|
||||
installHelpHook(cmd, {
|
||||
purpose: '测试数据源连接 (按 --id 拉配置, 或直接给参数)',
|
||||
|
||||
+121
-113
@@ -13,7 +13,7 @@ import { validateDictTypeCreate, type DictItemLite } from './_validate.ts'
|
||||
import { lookupTypeIdByEnCode, lookupDataIdByEnCode } from './_lookup.ts'
|
||||
import { enhanceFromBackend, formatErrorLine } from '../_error_codes.ts'
|
||||
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode/FullName + soften 调用)
|
||||
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
|
||||
import { setupOutputFilter, wrapCommand } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘; v2.2+ wrapCommand helper 收口 5c 样板
|
||||
|
||||
interface Opts {
|
||||
enCode: string
|
||||
@@ -48,7 +48,6 @@ export function buildDictTypeCreateCommand(): Command {
|
||||
process.exit(2)
|
||||
}
|
||||
const c = await JnpfClient.fromToken()
|
||||
const startTime = Date.now()
|
||||
await initWebapi(c)
|
||||
|
||||
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (替代原 inline autoStripEnCode/FullName + soften)
|
||||
@@ -61,121 +60,130 @@ export function buildDictTypeCreateCommand(): Command {
|
||||
Object.assign(opts, cmdFix.opts)
|
||||
}
|
||||
|
||||
// 解析 --items JSON 字符串 (step 2 校验需要 array)
|
||||
let itemsArray: DictItemLite[] = []
|
||||
if (opts.items) {
|
||||
try {
|
||||
const parsed = JSON.parse(opts.items)
|
||||
if (Array.isArray(parsed)) {
|
||||
itemsArray = parsed
|
||||
}
|
||||
} catch {
|
||||
// JSON 解析失败留给 step 2 报错
|
||||
}
|
||||
}
|
||||
|
||||
// step machine 校验 (镜像 web dict/components/Form.vue + 后端 DictionaryTypeController.create)
|
||||
// 在发 API 前暴露问题, 聚合错误一次报 (重点)
|
||||
await runDictStepMachine(c, {
|
||||
parentId: opts.parentId,
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
isTree: opts.isTree,
|
||||
sortCode: opts.sortCode,
|
||||
items: itemsArray,
|
||||
})
|
||||
|
||||
// 1. 建字典类型 (走 webapi)
|
||||
const typeBody: Record<string, unknown> = {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
parentId: opts.parentId || '0',
|
||||
category: opts.category || '0',
|
||||
isTree: Number(opts.isTree || '0'),
|
||||
sortCode: Number(opts.sortCode || '0'),
|
||||
}
|
||||
log.info(`loadDict.createDictionaryType enCode=${opts.enCode}`)
|
||||
const tr = (await loadDict.createDictionaryType(typeBody)) as { id?: string; code?: number; msg?: string }
|
||||
if (tr.code !== undefined && tr.code !== 200) {
|
||||
log.error(`建字典类型失败 (code=${tr.code}): ${tr.msg}`)
|
||||
// Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
||||
const enhanced = enhanceFromBackend(tr.msg || '', 'dictType', { entity: 'dict' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`)
|
||||
process.exit(1)
|
||||
}
|
||||
// JNPF POST /system/DictionaryType 返 {code,msg,data:null} (无 id).
|
||||
// 镜像 web Form.vue handleSubmit → 弹窗提示成功 → 列表自动刷新拿真实 id.
|
||||
// 这里直接用 list 接口按 enCode 反查, 拿到真实 id 再下发给后续 items 调用.
|
||||
let typeId = tr.id || ''
|
||||
if (!typeId) {
|
||||
typeId = (await lookupTypeIdByEnCode(opts.enCode)) || ''
|
||||
if (!typeId) {
|
||||
log.error(`建字典类型后无法反查 id (enCode=${opts.enCode}), list 接口未返回该记录`)
|
||||
log.error(' 请手工跑 `dacli dict typeList --keyword=' + opts.enCode + '` 查 id')
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
log.ok(`✓ 字典类型创建: id=${typeId} enCode=${opts.enCode}`)
|
||||
|
||||
// 2. 批量建字典项 (--items, 走 webapi)
|
||||
let itemFailCount = 0
|
||||
if (opts.items) {
|
||||
let parsed: Array<{ enCode: string; fullName: string; sortCode?: number; parentId?: string }>
|
||||
try {
|
||||
parsed = JSON.parse(opts.items)
|
||||
} catch (e) {
|
||||
log.error(`--items JSON 解析失败: ${(e as Error).message}`)
|
||||
process.exit(2)
|
||||
}
|
||||
if (!Array.isArray(parsed) || parsed.length === 0) {
|
||||
log.warn('--items 是空数组, 跳过')
|
||||
} else {
|
||||
log.info(`建 ${parsed.length} 个字典项...`)
|
||||
let ok = 0
|
||||
for (const item of parsed) {
|
||||
const body = {
|
||||
dictionaryTypeId: typeId,
|
||||
enCode: item.enCode,
|
||||
fullName: item.fullName,
|
||||
parentId: item.parentId || '0',
|
||||
sortCode: item.sortCode ?? 0,
|
||||
// web Form.vue:50-54 enabledMark Switch 默认 1
|
||||
enabledMark: (item as any).enabledMark ?? 1,
|
||||
}
|
||||
const r = (await loadDict.createDictionaryData(body)) as {
|
||||
id?: string
|
||||
code?: number
|
||||
msg?: string
|
||||
}
|
||||
if (r.code === 200 || r.code === undefined) {
|
||||
ok++
|
||||
// POST 返 data:null, 反查真实 id
|
||||
let itemId = r.id || ''
|
||||
if (!itemId) {
|
||||
itemId = await lookupDataIdByEnCode(typeId, item.enCode)
|
||||
}
|
||||
log.ok(` ✓ ${item.enCode} → ${item.fullName} id=${itemId || ''}`)
|
||||
} else {
|
||||
itemFailCount++
|
||||
log.warn(` ✗ ${item.enCode} (code=${r.code}): ${r.msg}`)
|
||||
}
|
||||
}
|
||||
log.info(`字典项: 成功 ${ok}, 失败 ${itemFailCount}`)
|
||||
}
|
||||
}
|
||||
|
||||
if (opts.json) printJson({ typeId, enCode: opts.enCode, fullName: opts.fullName })
|
||||
// v2.1+ (2026-07-21): 落 CommandLog (L3) — items 部分失败用 result='partial'
|
||||
printCommandEnd({
|
||||
await wrapCommand({
|
||||
command: 'dict typeCreate',
|
||||
appCode: c.appCode,
|
||||
result: itemFailCount > 0 ? 'partial' : 'success',
|
||||
error: itemFailCount > 0 ? `${itemFailCount} 个字典项建失败` : undefined,
|
||||
summary: { id: typeId, enCode: opts.enCode, fullName: opts.fullName },
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
}, async (ctx) => {
|
||||
// 解析 --items JSON 字符串 (step 2 校验需要 array)
|
||||
let itemsArray: DictItemLite[] = []
|
||||
if (opts.items) {
|
||||
try {
|
||||
const parsed = JSON.parse(opts.items)
|
||||
if (Array.isArray(parsed)) {
|
||||
itemsArray = parsed
|
||||
}
|
||||
} catch {
|
||||
// JSON 解析失败留给 step 2 报错
|
||||
}
|
||||
}
|
||||
|
||||
// step machine 校验 (镜像 web dict/components/Form.vue + 后端 DictionaryTypeController.create)
|
||||
// 在发 API 前暴露问题, 聚合错误一次报 (重点)
|
||||
await runDictStepMachine(c, {
|
||||
parentId: opts.parentId,
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
isTree: opts.isTree,
|
||||
sortCode: opts.sortCode,
|
||||
items: itemsArray,
|
||||
})
|
||||
|
||||
// 1. 建字典类型 (走 webapi)
|
||||
const typeBody: Record<string, unknown> = {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
parentId: opts.parentId || '0',
|
||||
category: opts.category || '0',
|
||||
isTree: Number(opts.isTree || '0'),
|
||||
sortCode: Number(opts.sortCode || '0'),
|
||||
}
|
||||
log.info(`loadDict.createDictionaryType enCode=${opts.enCode}`)
|
||||
const tr = (await loadDict.createDictionaryType(typeBody)) as { id?: string; code?: number; msg?: string }
|
||||
if (tr.code !== undefined && tr.code !== 200) {
|
||||
log.error(`建字典类型失败 (code=${tr.code}): ${tr.msg}`)
|
||||
// Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
||||
const enhanced = enhanceFromBackend(tr.msg || '', 'dictType', { entity: 'dict' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 1, stepName: '后端API' })}`)
|
||||
ctx.fail(`建字典类型失败 (code=${tr.code}): ${tr.msg}`, { enCode: opts.enCode })
|
||||
return
|
||||
}
|
||||
// JNPF POST /system/DictionaryType 返 {code,msg,data:null} (无 id).
|
||||
// 镜像 web Form.vue handleSubmit → 弹窗提示成功 → 列表自动刷新拿真实 id.
|
||||
// 这里直接用 list 接口按 enCode 反查, 拿到真实 id 再下发给后续 items 调用.
|
||||
let typeId = tr.id || ''
|
||||
if (!typeId) {
|
||||
typeId = (await lookupTypeIdByEnCode(opts.enCode)) || ''
|
||||
if (!typeId) {
|
||||
const errMsg = `建字典类型后无法反查 id (enCode=${opts.enCode}), list 接口未返回该记录`
|
||||
log.error(errMsg)
|
||||
log.error(' 请手工跑 `dacli dict typeList --keyword=' + opts.enCode + '` 查 id')
|
||||
ctx.fail(errMsg, { enCode: opts.enCode })
|
||||
return
|
||||
}
|
||||
}
|
||||
log.ok(`✓ 字典类型创建: id=${typeId} enCode=${opts.enCode}`)
|
||||
|
||||
// 2. 批量建字典项 (--items, 走 webapi)
|
||||
let itemFailCount = 0
|
||||
if (opts.items) {
|
||||
let parsed: Array<{ enCode: string; fullName: string; sortCode?: number; parentId?: string }>
|
||||
try {
|
||||
parsed = JSON.parse(opts.items)
|
||||
} catch (e) {
|
||||
// JSON 解析失败 (在 --items 段复检, 因为 runDictStepMachine 只读 opts.items 不调 JSON.parse)
|
||||
const errMsg = `--items JSON 解析失败: ${(e as Error).message}`
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { enCode: opts.enCode })
|
||||
return
|
||||
}
|
||||
if (!Array.isArray(parsed) || parsed.length === 0) {
|
||||
log.warn('--items 是空数组, 跳过')
|
||||
} else {
|
||||
log.info(`建 ${parsed.length} 个字典项...`)
|
||||
let ok = 0
|
||||
for (const item of parsed) {
|
||||
const body = {
|
||||
dictionaryTypeId: typeId,
|
||||
enCode: item.enCode,
|
||||
fullName: item.fullName,
|
||||
parentId: item.parentId || '0',
|
||||
sortCode: item.sortCode ?? 0,
|
||||
// web Form.vue:50-54 enabledMark Switch 默认 1
|
||||
enabledMark: (item as any).enabledMark ?? 1,
|
||||
}
|
||||
const r = (await loadDict.createDictionaryData(body)) as {
|
||||
id?: string
|
||||
code?: number
|
||||
msg?: string
|
||||
}
|
||||
if (r.code === 200 || r.code === undefined) {
|
||||
ok++
|
||||
// POST 返 data:null, 反查真实 id
|
||||
let itemId = r.id || ''
|
||||
if (!itemId) {
|
||||
itemId = await lookupDataIdByEnCode(typeId, item.enCode)
|
||||
}
|
||||
log.ok(` ✓ ${item.enCode} → ${item.fullName} id=${itemId || ''}`)
|
||||
} else {
|
||||
itemFailCount++
|
||||
log.warn(` ✗ ${item.enCode} (code=${r.code}): ${r.msg}`)
|
||||
}
|
||||
}
|
||||
log.info(`字典项: 成功 ${ok}, 失败 ${itemFailCount}`)
|
||||
}
|
||||
}
|
||||
|
||||
if (opts.json) printJson({ typeId, enCode: opts.enCode, fullName: opts.fullName })
|
||||
// v2.2+ wrapCommand: items 部分失败用 result='partial'
|
||||
if (itemFailCount > 0) {
|
||||
ctx.partial(`${itemFailCount} 个字典项建失败`, { id: typeId, enCode: opts.enCode, fullName: opts.fullName })
|
||||
} else {
|
||||
ctx.success({ id: typeId, enCode: opts.enCode, fullName: opts.fullName })
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
+270
-289
@@ -29,7 +29,7 @@ import { fetchMenuTree } from './_helpers.ts'
|
||||
import { lookupMenuIdByEnCode } from './_lookup.ts'
|
||||
import { initWebapi, loadMenu } from '../../webapi/menu.ts'
|
||||
import { runCommandAutoFix, fetchExistingLists } from '../_auto_fix.ts' // v2.1+ (2026-07-21): 跨命令 auto-fix pipeline (替代原 inline autoStripEnCode/FullName)
|
||||
import { setupOutputFilter, printCommandEnd } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘
|
||||
import { setupOutputFilter, wrapCommand } from '../_output_filter.ts' // v2.1+ (2026-07-21): 输出过滤 + CommandLog 落盘; v2.2+ wrapCommand helper 收口 5c 样板 (替代原本 local printEnd 合并)
|
||||
|
||||
interface Opts {
|
||||
fullName: string
|
||||
@@ -81,7 +81,6 @@ export function buildMenuCreateCommand(): Command {
|
||||
// 输出过滤: 默认静默 (quiet mode), --verbose 走完整日志, --json 走原始 JSON
|
||||
setupOutputFilter(opts)
|
||||
const c = await JnpfClient.fromToken()
|
||||
const startTime = Date.now()
|
||||
|
||||
// v2.1+ (2026-07-21): 命令级 auto-fix pipeline (替代原 inline autoStripEnCode/FullName)
|
||||
// S-X1 enCode strip silent (BS-新38)
|
||||
@@ -93,102 +92,35 @@ export function buildMenuCreateCommand(): Command {
|
||||
Object.assign(opts, cmdFix.opts)
|
||||
}
|
||||
|
||||
// 命令级 printCommandEnd helper (避免重复样板)
|
||||
const printEnd = (
|
||||
result: 'success' | 'failure' | 'partial',
|
||||
summary?: Record<string, unknown>,
|
||||
error?: string,
|
||||
) => {
|
||||
printCommandEnd({
|
||||
command: 'menu create',
|
||||
appCode: c.appCode,
|
||||
result,
|
||||
summary,
|
||||
error,
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
duration_ms: Date.now() - startTime,
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
})
|
||||
}
|
||||
await wrapCommand({
|
||||
command: 'menu create',
|
||||
appCode: c.appCode,
|
||||
startTime: Date.now(),
|
||||
verbose: opts.verbose,
|
||||
json: opts.json,
|
||||
fixes: [...cmdFix.silent, ...cmdFix.assertive, ...cmdFix.suggestions],
|
||||
}, async (ctx) => {
|
||||
// P3.1: 第二层防御 — blindspot guard (等)
|
||||
// - ERROR → exit 2 (与 pre-check 一致)
|
||||
// - WARN → 仅打印, 不阻断
|
||||
// - context 加载失败时跳过 (容错)
|
||||
const guardCtx = await loadContextSafe(c)
|
||||
if (guardCtx.warning) log.warn(guardCtx.warning)
|
||||
handleGuardResult('menu create', runGuards(guardCtx.ctx, {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
formId: opts.formId,
|
||||
}, 'menu create'))
|
||||
|
||||
// P3.1: 第二层防御 — blindspot guard (等)
|
||||
// - ERROR → exit 2 (与 pre-check 一致)
|
||||
// - WARN → 仅打印, 不阻断
|
||||
// - context 加载失败时跳过 (容错)
|
||||
const guardCtx = await loadContextSafe(c)
|
||||
if (guardCtx.warning) log.warn(guardCtx.warning)
|
||||
handleGuardResult('menu create', runGuards(guardCtx.ctx, {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode,
|
||||
formId: opts.formId,
|
||||
}, 'menu create'))
|
||||
|
||||
// fix --fullName 没传时, 自动从 form.info 拿 (在 step machine 前)
|
||||
// 根因: step machine 校验 fullName 必填, 但 Mode A 走 web Actions/Module 应自动推导
|
||||
// 镜像: web CreateMenuModal.vue:62-68 handleSubmit 自动 form.fullName → menu.fullName
|
||||
// 修: 提前 fetch form, 用 form.fullName 填充 opts.fullName (再走 step machine 校验)
|
||||
if (opts.formId && (!opts.fullName || !opts.enCode)) {
|
||||
try {
|
||||
const fR = await c.get<{ data?: { fullName?: string; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (fR.data as { fullName?: string; enCode?: string } | undefined) || {}
|
||||
if (!opts.fullName && fData.fullName) {
|
||||
opts.fullName = fData.fullName
|
||||
log.info(` BS-New-8: --fullName 未传, 自动从 form.info.fullName 拿 = "${opts.fullName}"`)
|
||||
}
|
||||
if (!opts.enCode && fData.enCode) {
|
||||
opts.enCode = fData.enCode
|
||||
log.info(` BS-New-8: --enCode 未传, 自动从 form.info.enCode 拿 = "${opts.enCode}"`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(` BS-New-8 自动取 form.info 失败: ${(e as Error).message?.slice(0, 80)}`)
|
||||
}
|
||||
if (!opts.fullName) {
|
||||
const errMsg = '--formId 模式: --fullName 必填 (form.info 没拿到 fullName, 请手动 --fullName=...)'
|
||||
log.error(errMsg)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog
|
||||
printEnd('failure', { formId: opts.formId }, errMsg)
|
||||
process.exit(2)
|
||||
}
|
||||
if (!opts.enCode) {
|
||||
const errMsg = '--formId 模式: --enCode 必填 (form.info 没拿到 enCode, 请手动 --enCode=...)'
|
||||
log.error(errMsg)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog
|
||||
printEnd('failure', { formId: opts.formId }, errMsg)
|
||||
process.exit(2)
|
||||
}
|
||||
}
|
||||
|
||||
// step machine 校验 (镜像 web Form.vue handleSubmit L230-258 + 后端 ModuleController create L172-190)
|
||||
// 在发 API 前暴露问题, AI 不用等后端 400 才发现 (4 step 聚合错误)
|
||||
await runStepMachine(c, opts)
|
||||
|
||||
// (Round 8 P1): urlAddress 全平台唯一, 重复会 400 "The address cannot be duplicated"
|
||||
// step 0 拦截: 拉 menu list 查重, 冲突时 WARN (不阻断, 让用户决定是否复用 url)
|
||||
if (opts.urlAddress && !opts.formId) {
|
||||
try {
|
||||
await initWebapi(c)
|
||||
const listResp = (await loadMenu.getMenuList({})) as unknown
|
||||
const list = (listResp as any)?.data || (listResp as any)?.list || []
|
||||
const conflicts = list.filter((m: any) => m.urlAddress === opts.urlAddress)
|
||||
if (conflicts.length > 0) {
|
||||
const ids = conflicts.map((c: any) => `${c.fullName}(${c.id})`).join(', ')
|
||||
log.warn(`BS-E10: urlAddress="${opts.urlAddress}" 已存在 (${conflicts.length} 条: ${ids})`)
|
||||
log.warn(` 后端会 400 'The address cannot be duplicated', 建议: 删除旧 menu 或换 urlAddress`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(`BS-E10: 查 menu urlAddress 失败 (${(e as Error).message?.slice(0, 80)}), 跳过预校验`)
|
||||
}
|
||||
}
|
||||
|
||||
// 模式 A: 挂表单菜单 — 走 web 真路径
|
||||
if (opts.formId) {
|
||||
// --fullName 没传时, 自动从 form.info 拿
|
||||
if (!opts.fullName) {
|
||||
// fix --fullName 没传时, 自动从 form.info 拿 (在 step machine 前)
|
||||
// 根因: step machine 校验 fullName 必填, 但 Mode A 走 web Actions/Module 应自动推导
|
||||
// 镜像: web CreateMenuModal.vue:62-68 handleSubmit 自动 form.fullName → menu.fullName
|
||||
// 修: 提前 fetch form, 用 form.fullName 填充 opts.fullName (再走 step machine 校验)
|
||||
if (opts.formId && (!opts.fullName || !opts.enCode)) {
|
||||
try {
|
||||
const fR = await c.get<{ data?: { fullName?: string; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (fR.data as { fullName?: string; enCode?: string } | undefined) || {}
|
||||
if (fData.fullName) {
|
||||
if (!opts.fullName && fData.fullName) {
|
||||
opts.fullName = fData.fullName
|
||||
log.info(` BS-New-8: --fullName 未传, 自动从 form.info.fullName 拿 = "${opts.fullName}"`)
|
||||
}
|
||||
@@ -199,215 +131,264 @@ export function buildMenuCreateCommand(): Command {
|
||||
} catch (e) {
|
||||
log.warn(` BS-New-8 自动取 form.info 失败: ${(e as Error).message?.slice(0, 80)}`)
|
||||
}
|
||||
}
|
||||
if (!opts.fullName) {
|
||||
const errMsg = '--formId 模式: --fullName 必填 (form.info 没拿到 fullName)'
|
||||
log.error(errMsg)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog
|
||||
printEnd('failure', { formId: opts.formId }, errMsg)
|
||||
process.exit(2)
|
||||
}
|
||||
// D-4 (盲点 40 防御): form webType=4 (视图) 走 Actions/Module 会 400, 自动 fallback 低级 API
|
||||
let formWebType = 0
|
||||
let formEnCode = ''
|
||||
try {
|
||||
const formR = await c.get<{ data?: { webType?: string | number; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (formR.data as { webType?: string | number; enCode?: string } | undefined) || {}
|
||||
formWebType = Number(fData.webType || 0)
|
||||
formEnCode = fData.enCode || ''
|
||||
if (formWebType === 4) {
|
||||
log.warn(`D-4: form webType=4 (视图), Actions/Module 走不通, 自动 fallback 低级 API`)
|
||||
// 走低级 API, 把菜单挂上
|
||||
const lowBody: Record<string, unknown> = {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode || formEnCode,
|
||||
parentId: opts.parentId && opts.parentId !== '-1' ? opts.parentId : '836286140288869573', // 没传父, 用第一个 Web 根
|
||||
type: 3, // VisualDev
|
||||
enabledMark: 1,
|
||||
sortCode: 0,
|
||||
// 用 opts.category (默认 Web), 支持 --category=App
|
||||
category: opts.category || 'Web',
|
||||
linkTarget: '_self',
|
||||
// web Form.vue:281-291 — type=3 属表单类 → is*Authorize=1
|
||||
isButtonAuthorize: 1,
|
||||
isColumnAuthorize: 1,
|
||||
isDataAuthorize: 1,
|
||||
isFormAuthorize: 1,
|
||||
icon: opts.icon || 'icon-ym icon-ym-generator',
|
||||
propertyJson: `{"moduleId":"${opts.formId}","iconBackgroundColor":"","isTree":0,"webType":4}`,
|
||||
urlAddress: `model/${formEnCode || opts.enCode}`,
|
||||
pageAddress: `model/${formEnCode || opts.enCode}`,
|
||||
}
|
||||
// 自动从 SelectorFilter 找 pc 父菜单
|
||||
if (lowBody.parentId === '836286140288869573') {
|
||||
const sel = await c.get<{ list?: { id: string; type: number }[] }>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
||||
const root = sel.data?.list?.find((m) => m.type === 0)
|
||||
if (root) lowBody.parentId = root.id
|
||||
}
|
||||
log.info(`POST /system/Menu (D-4 fallback) ${lowBody.enCode} type=3 webType=4`)
|
||||
const r = await c.postJson<{ id?: string }>('/system/Menu', lowBody)
|
||||
if (r.code !== 200) {
|
||||
const errMsg = `D-4 fallback menu create 失败 code=${r.code}: ${r.msg}`
|
||||
log.error(errMsg)
|
||||
if (opts.json) printJson(r)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog
|
||||
printEnd('failure', { formId: opts.formId, mode: 'D-4-fallback' }, errMsg)
|
||||
process.exit(1)
|
||||
}
|
||||
// D-4 视图菜单也不返 id, 用 lookup 反查
|
||||
const d4MenuId = await lookupMenuIdByEnCode(formEnCode || opts.enCode || opts.fullName)
|
||||
log.ok(`✓ 视图菜单创建成功 (formId=${opts.formId}, webType=4): id=${d4MenuId || r.data?.id || '(unknown)'} (B-19)`)
|
||||
if (opts.json) printJson({ id: d4MenuId, formId: opts.formId, ...(r.data || {}) })
|
||||
// v2.1+ (2026-07-21): D-4 fallback 成功 — 落 CommandLog
|
||||
printEnd('success', { id: d4MenuId, formId: opts.formId, mode: 'D-4-fallback' })
|
||||
if (!opts.fullName) {
|
||||
const errMsg = '--formId 模式: --fullName 必填 (form.info 没拿到 fullName, 请手动 --fullName=...)'
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { formId: opts.formId })
|
||||
return
|
||||
}
|
||||
if (!opts.enCode) {
|
||||
const errMsg = '--formId 模式: --enCode 必填 (form.info 没拿到 enCode, 请手动 --enCode=...)'
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { formId: opts.formId })
|
||||
return
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(`D-4: GET form webType 失败 (${(e as Error).message?.slice(0, 80)}), 继续走 Actions/Module`)
|
||||
}
|
||||
|
||||
const pc = opts.pc === false ? 0 : 1
|
||||
const app = opts.app ? 1 : 0
|
||||
if (!pc && !app) {
|
||||
const errMsg = '至少一个发布平台 (pc / app), 当前都是 0'
|
||||
log.error(errMsg)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog
|
||||
printEnd('failure', { formId: opts.formId }, errMsg)
|
||||
process.exit(2)
|
||||
}
|
||||
// fix (盲点 23 续): 不传 --pcParents 时, 自动从 /system/Menu/SelectorFilter/0
|
||||
// 拉当前 app 的根目录菜单当 parent (web 端 getMenuSelectorFilter({category:'Web'}, '0') 同款)
|
||||
// 旧默认 '0' 在 app 等应用下不存在 → 报 "找不到该上级"
|
||||
// 修复 (2026-06-19, tdd1 实战发现): type===0 是"应用系统"节点 (parentId:-1), 不是真菜单.
|
||||
// 真菜单应该是 type===1 (目录). 优先 type===1, 没则递归 children
|
||||
let pcParents: string[] = opts.pcParents ? opts.pcParents.split(',').filter(Boolean) : []
|
||||
if (pc && pcParents.length === 0) {
|
||||
const sel = await c.get<{
|
||||
list?: { id: string; type: number; children?: { id: string; type: number }[] }[]
|
||||
}>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
||||
// 递归找第一个 type===1 的菜单 (目录)
|
||||
const findMenu = (
|
||||
items: { id: string; type: number; children?: { id: string; type: number; children?: any }[] }[] | undefined,
|
||||
): string | null => {
|
||||
if (!items) return null
|
||||
for (const it of items) {
|
||||
if (it.type === 1) return it.id
|
||||
const child = findMenu(it.children)
|
||||
if (child) return child
|
||||
// step machine 校验 (镜像 web Form.vue handleSubmit L230-258 + 后端 ModuleController create L172-190)
|
||||
// 在发 API 前暴露问题, AI 不用等后端 400 才发现 (4 step 聚合错误)
|
||||
await runStepMachine(c, opts)
|
||||
|
||||
// (Round 8 P1): urlAddress 全平台唯一, 重复会 400 "The address cannot be duplicated"
|
||||
// step 0 拦截: 拉 menu list 查重, 冲突时 WARN (不阻断, 让用户决定是否复用 url)
|
||||
if (opts.urlAddress && !opts.formId) {
|
||||
try {
|
||||
await initWebapi(c)
|
||||
const listResp = (await loadMenu.getMenuList({})) as unknown
|
||||
const list = (listResp as any)?.data || (listResp as any)?.list || []
|
||||
const conflicts = list.filter((m: any) => m.urlAddress === opts.urlAddress)
|
||||
if (conflicts.length > 0) {
|
||||
const ids = conflicts.map((c: any) => `${c.fullName}(${c.id})`).join(', ')
|
||||
log.warn(`BS-E10: urlAddress="${opts.urlAddress}" 已存在 (${conflicts.length} 条: ${ids})`)
|
||||
log.warn(` 后端会 400 'The address cannot be duplicated', 建议: 删除旧 menu 或换 urlAddress`)
|
||||
}
|
||||
return null
|
||||
}
|
||||
const root = findMenu(sel.data?.list)
|
||||
if (root) {
|
||||
pcParents = [root]
|
||||
log.info(`自动发现父菜单 (Web 目录): id=${root}`)
|
||||
} else {
|
||||
log.warn('SelectorFilter 未返 Web 菜单, 用默认 "0" (Actions/Module 可能报"找不到该上级")')
|
||||
pcParents = ['0']
|
||||
} catch (e) {
|
||||
log.warn(`BS-E10: 查 menu urlAddress 失败 (${(e as Error).message?.slice(0, 80)}), 跳过预校验`)
|
||||
}
|
||||
}
|
||||
const appParents = opts.appParents ? opts.appParents.split(',').filter(Boolean) : []
|
||||
const body = {
|
||||
pc,
|
||||
app,
|
||||
pcModuleParentId: pcParents,
|
||||
appModuleParentId: appParents,
|
||||
platformRelease: JSON.stringify({ pc, app }),
|
||||
}
|
||||
log.info(`POST /visualdev/Base/${opts.formId}/Actions/Module (web 真路径)`)
|
||||
const r = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, body)
|
||||
if (r.code !== 200) {
|
||||
// 修复 (2026-06-19, tdd1 实战发现): 当 pcParents 非空但 Actions/Module 报"名称重复",
|
||||
// 实为 JNPF 在指定父菜单下检测到同名 (可能软删除/全局). 重试用空 pcParents (顶级)
|
||||
const needRetry =
|
||||
r.code === 400 && /名称重复|name.*repeat|enCode.*repeated/i.test(r.msg || '')
|
||||
if (needRetry && pcParents.length > 0 && pcParents[0] !== '0') {
|
||||
log.warn(` ↳ Actions/Module "${r.msg}", 重试用空 pcParents (顶级)`)
|
||||
const retryBody = { ...body, pcModuleParentId: [] }
|
||||
const rr = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, retryBody)
|
||||
if (rr.code === 200) {
|
||||
log.ok(`✓ 菜单发布成功 (重试后顶级, formId=${opts.formId}, pc=${pc}, app=${app})`)
|
||||
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
||||
if (opts.json) printJson(rr)
|
||||
// v2.1+ (2026-07-21): 重试成功 — 落 CommandLog
|
||||
printEnd('success', { formId: opts.formId, mode: 'A-retry' })
|
||||
|
||||
// 模式 A: 挂表单菜单 — 走 web 真路径
|
||||
if (opts.formId) {
|
||||
// --fullName 没传时, 自动从 form.info 拿
|
||||
if (!opts.fullName) {
|
||||
try {
|
||||
const fR = await c.get<{ data?: { fullName?: string; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (fR.data as { fullName?: string; enCode?: string } | undefined) || {}
|
||||
if (fData.fullName) {
|
||||
opts.fullName = fData.fullName
|
||||
log.info(` BS-New-8: --fullName 未传, 自动从 form.info.fullName 拿 = "${opts.fullName}"`)
|
||||
}
|
||||
if (!opts.enCode && fData.enCode) {
|
||||
opts.enCode = fData.enCode
|
||||
log.info(` BS-New-8: --enCode 未传, 自动从 form.info.enCode 拿 = "${opts.enCode}"`)
|
||||
}
|
||||
} catch (e) {
|
||||
log.warn(` BS-New-8 自动取 form.info 失败: ${(e as Error).message?.slice(0, 80)}`)
|
||||
}
|
||||
}
|
||||
if (!opts.fullName) {
|
||||
const errMsg = '--formId 模式: --fullName 必填 (form.info 没拿到 fullName)'
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { formId: opts.formId })
|
||||
return
|
||||
}
|
||||
// D-4 (盲点 40 防御): form webType=4 (视图) 走 Actions/Module 会 400, 自动 fallback 低级 API
|
||||
let formWebType = 0
|
||||
let formEnCode = ''
|
||||
try {
|
||||
const formR = await c.get<{ data?: { webType?: string | number; enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (formR.data as { webType?: string | number; enCode?: string } | undefined) || {}
|
||||
formWebType = Number(fData.webType || 0)
|
||||
formEnCode = fData.enCode || ''
|
||||
if (formWebType === 4) {
|
||||
log.warn(`D-4: form webType=4 (视图), Actions/Module 走不通, 自动 fallback 低级 API`)
|
||||
// 走低级 API, 把菜单挂上
|
||||
const lowBody: Record<string, unknown> = {
|
||||
fullName: opts.fullName,
|
||||
enCode: opts.enCode || formEnCode,
|
||||
parentId: opts.parentId && opts.parentId !== '-1' ? opts.parentId : '836286140288869573', // 没传父, 用第一个 Web 根
|
||||
type: 3, // VisualDev
|
||||
enabledMark: 1,
|
||||
sortCode: 0,
|
||||
// 用 opts.category (默认 Web), 支持 --category=App
|
||||
category: opts.category || 'Web',
|
||||
linkTarget: '_self',
|
||||
// web Form.vue:281-291 — type=3 属表单类 → is*Authorize=1
|
||||
isButtonAuthorize: 1,
|
||||
isColumnAuthorize: 1,
|
||||
isDataAuthorize: 1,
|
||||
isFormAuthorize: 1,
|
||||
icon: opts.icon || 'icon-ym icon-ym-generator',
|
||||
propertyJson: `{"moduleId":"${opts.formId}","iconBackgroundColor":"","isTree":0,"webType":4}`,
|
||||
urlAddress: `model/${formEnCode || opts.enCode}`,
|
||||
pageAddress: `model/${formEnCode || opts.enCode}`,
|
||||
}
|
||||
// 自动从 SelectorFilter 找 pc 父菜单
|
||||
if (lowBody.parentId === '836286140288869573') {
|
||||
const sel = await c.get<{ list?: { id: string; type: number }[] }>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
||||
const root = sel.data?.list?.find((m) => m.type === 0)
|
||||
if (root) lowBody.parentId = root.id
|
||||
}
|
||||
log.info(`POST /system/Menu (D-4 fallback) ${lowBody.enCode} type=3 webType=4`)
|
||||
const r = await c.postJson<{ id?: string }>('/system/Menu', lowBody)
|
||||
if (r.code !== 200) {
|
||||
const errMsg = `D-4 fallback menu create 失败 code=${r.code}: ${r.msg}`
|
||||
log.error(errMsg)
|
||||
if (opts.json) printJson(r)
|
||||
ctx.fail(errMsg, { formId: opts.formId, mode: 'D-4-fallback' })
|
||||
return
|
||||
}
|
||||
// D-4 视图菜单也不返 id, 用 lookup 反查
|
||||
const d4MenuId = await lookupMenuIdByEnCode(formEnCode || opts.enCode || opts.fullName)
|
||||
log.ok(`✓ 视图菜单创建成功 (formId=${opts.formId}, webType=4): id=${d4MenuId || r.data?.id || '(unknown)'} (B-19)`)
|
||||
if (opts.json) printJson({ id: d4MenuId, formId: opts.formId, ...(r.data || {}) })
|
||||
ctx.success({ id: d4MenuId, formId: opts.formId, mode: 'D-4-fallback' })
|
||||
return
|
||||
}
|
||||
log.error(` ↳ 重试仍失败 code=${rr.code}: ${rr.msg}`)
|
||||
} catch (e) {
|
||||
log.warn(`D-4: GET form webType 失败 (${(e as Error).message?.slice(0, 80)}), 继续走 Actions/Module`)
|
||||
}
|
||||
// P0-4 fix Actions/Module 报"找不到该上级" (code=400) 时,
|
||||
// 实为 pcParents=[...] 找不到有效父菜单 (SelectorFilter 自动发现失效 / 跨 app 引用).
|
||||
// 自动 fallback 低级 POST /system/Menu 路径 (Mode B), 用 form 默认值 (parentId=-1, type=3, icon=form).
|
||||
// 用户显式传 --icon/--parentId/--type 高级参数时优先尊重.
|
||||
// 镜像 plan.md §6 修复方向: e.code === 400 && e.msg.includes('找不到该上级') → lowLevelPath()
|
||||
const needFallbackLow =
|
||||
r.code === 400 && /找不到该上级/.test(r.msg || '')
|
||||
if (needFallbackLow) {
|
||||
log.warn(`⚠ P0-4: Actions/Module 失败 (${r.msg}), 自动 fallback 低级 POST /system/Menu 路径`)
|
||||
// 拉 form enCode 拼 urlAddress + propertyJson (镜像 Mode B D-9 逻辑)
|
||||
let fallbackEnCode = opts.enCode || ''
|
||||
try {
|
||||
if (!fallbackEnCode) {
|
||||
const fR = await c.get<{ data?: { enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
fallbackEnCode = (fR.data as { enCode?: string } | undefined)?.enCode || opts.fullName || ''
|
||||
}
|
||||
} catch {
|
||||
fallbackEnCode = fallbackEnCode || opts.fullName || ''
|
||||
}
|
||||
// 复用 Mode B 路径: 强制 type=3 (VisualDev), icon=form 默认 (用户 --icon 优先), parentId=低级默认 (用户 --parentId 优先)
|
||||
const fallbackOpts: Opts = {
|
||||
...opts,
|
||||
type: '3',
|
||||
icon: opts.icon || 'icon-ym icon-ym-form',
|
||||
// parentId 保留 opts.parentId (用户显式值 或 commander 默认 '-1')
|
||||
urlAddress: opts.urlAddress || `model/${fallbackEnCode}`,
|
||||
}
|
||||
log.info(` ↳ fallback params: parentId=${fallbackOpts.parentId} type=3 icon=${fallbackOpts.icon} urlAddress=${fallbackOpts.urlAddress}`)
|
||||
// 直接调用 Mode B 实现 (low-level path)
|
||||
await runLowLevelPath(c, fallbackOpts)
|
||||
|
||||
const pc = opts.pc === false ? 0 : 1
|
||||
const app = opts.app ? 1 : 0
|
||||
if (!pc && !app) {
|
||||
const errMsg = '至少一个发布平台 (pc / app), 当前都是 0'
|
||||
log.error(errMsg)
|
||||
ctx.fail(errMsg, { formId: opts.formId })
|
||||
return
|
||||
}
|
||||
log.error(`menu create (Actions/Module) 失败 code=${r.code}: ${r.msg}`)
|
||||
// Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'menu', { entity: 'menu' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 3, stepName: '后端API' })}`)
|
||||
if (opts.json) printJson(r)
|
||||
// v2.1+ (2026-07-21): 错误路径落 CommandLog
|
||||
printEnd('failure', { formId: opts.formId }, `Actions/Module 失败 code=${r.code}: ${r.msg}`)
|
||||
process.exit(1)
|
||||
// fix (盲点 23 续): 不传 --pcParents 时, 自动从 /system/Menu/SelectorFilter/0
|
||||
// 拉当前 app 的根目录菜单当 parent (web 端 getMenuSelectorFilter({category:'Web'}, '0') 同款)
|
||||
// 旧默认 '0' 在 app 等应用下不存在 → 报 "找不到该上级"
|
||||
// 修复 (2026-06-19, tdd1 实战发现): type===0 是"应用系统"节点 (parentId:-1), 不是真菜单.
|
||||
// 真菜单应该是 type===1 (目录). 优先 type===1, 没则递归 children
|
||||
let pcParents: string[] = opts.pcParents ? opts.pcParents.split(',').filter(Boolean) : []
|
||||
if (pc && pcParents.length === 0) {
|
||||
const sel = await c.get<{
|
||||
list?: { id: string; type: number; children?: { id: string; type: number }[] }[]
|
||||
}>('/system/Menu/SelectorFilter/0', { category: 'Web' })
|
||||
// 递归找第一个 type===1 的菜单 (目录)
|
||||
const findMenu = (
|
||||
items: { id: string; type: number; children?: { id: string; type: number; children?: any }[] }[] | undefined,
|
||||
): string | null => {
|
||||
if (!items) return null
|
||||
for (const it of items) {
|
||||
if (it.type === 1) return it.id
|
||||
const child = findMenu(it.children)
|
||||
if (child) return child
|
||||
}
|
||||
return null
|
||||
}
|
||||
const root = findMenu(sel.data?.list)
|
||||
if (root) {
|
||||
pcParents = [root]
|
||||
log.info(`自动发现父菜单 (Web 目录): id=${root}`)
|
||||
} else {
|
||||
log.warn('SelectorFilter 未返 Web 菜单, 用默认 "0" (Actions/Module 可能报"找不到该上级")')
|
||||
pcParents = ['0']
|
||||
}
|
||||
}
|
||||
const appParents = opts.appParents ? opts.appParents.split(',').filter(Boolean) : []
|
||||
const body = {
|
||||
pc,
|
||||
app,
|
||||
pcModuleParentId: pcParents,
|
||||
appModuleParentId: appParents,
|
||||
platformRelease: JSON.stringify({ pc, app }),
|
||||
}
|
||||
log.info(`POST /visualdev/Base/${opts.formId}/Actions/Module (web 真路径)`)
|
||||
const r = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, body)
|
||||
if (r.code !== 200) {
|
||||
// 修复 (2026-06-19, tdd1 实战发现): 当 pcParents 非空但 Actions/Module 报"名称重复",
|
||||
// 实为 JNPF 在指定父菜单下检测到同名 (可能软删除/全局). 重试用空 pcParents (顶级)
|
||||
const needRetry =
|
||||
r.code === 400 && /名称重复|name.*repeat|enCode.*repeated/i.test(r.msg || '')
|
||||
if (needRetry && pcParents.length > 0 && pcParents[0] !== '0') {
|
||||
log.warn(` ↳ Actions/Module "${r.msg}", 重试用空 pcParents (顶级)`)
|
||||
const retryBody = { ...body, pcModuleParentId: [] }
|
||||
const rr = await c.postJson(`/visualdev/Base/${opts.formId}/Actions/Module`, retryBody)
|
||||
if (rr.code === 200) {
|
||||
log.ok(`✓ 菜单发布成功 (重试后顶级, formId=${opts.formId}, pc=${pc}, app=${app})`)
|
||||
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
||||
if (opts.json) printJson(rr)
|
||||
ctx.success({ formId: opts.formId, mode: 'A-retry' })
|
||||
return
|
||||
}
|
||||
log.error(` ↳ 重试仍失败 code=${rr.code}: ${rr.msg}`)
|
||||
}
|
||||
// P0-4 fix Actions/Module 报"找不到该上级" (code=400) 时,
|
||||
// 实为 pcParents=[...] 找不到有效父菜单 (SelectorFilter 自动发现失效 / 跨 app 引用).
|
||||
// 自动 fallback 低级 POST /system/Menu 路径 (Mode B), 用 form 默认值 (parentId=-1, type=3, icon=form).
|
||||
// 用户显式传 --icon/--parentId/--type 高级参数时优先尊重.
|
||||
// 镜像 plan.md §6 修复方向: e.code === 400 && e.msg.includes('找不到该上级') → lowLevelPath()
|
||||
const needFallbackLow =
|
||||
r.code === 400 && /找不到该上级/.test(r.msg || '')
|
||||
if (needFallbackLow) {
|
||||
log.warn(`⚠ P0-4: Actions/Module 失败 (${r.msg}), 自动 fallback 低级 POST /system/Menu 路径`)
|
||||
// 拉 form enCode 拼 urlAddress + propertyJson (镜像 Mode B D-9 逻辑)
|
||||
let fallbackEnCode = opts.enCode || ''
|
||||
try {
|
||||
if (!fallbackEnCode) {
|
||||
const fR = await c.get<{ data?: { enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
fallbackEnCode = (fR.data as { enCode?: string } | undefined)?.enCode || opts.fullName || ''
|
||||
}
|
||||
} catch {
|
||||
fallbackEnCode = fallbackEnCode || opts.fullName || ''
|
||||
}
|
||||
// 复用 Mode B 路径: 强制 type=3 (VisualDev), icon=form 默认 (用户 --icon 优先), parentId=低级默认 (用户 --parentId 优先)
|
||||
const fallbackOpts: Opts = {
|
||||
...opts,
|
||||
type: '3',
|
||||
icon: opts.icon || 'icon-ym icon-ym-form',
|
||||
// parentId 保留 opts.parentId (用户显式值 或 commander 默认 '-1')
|
||||
urlAddress: opts.urlAddress || `model/${fallbackEnCode}`,
|
||||
}
|
||||
log.info(` ↳ fallback params: parentId=${fallbackOpts.parentId} type=3 icon=${fallbackOpts.icon} urlAddress=${fallbackOpts.urlAddress}`)
|
||||
// 直接调用 Mode B 实现 (low-level path), 把结果回报给 ctx
|
||||
const fallbackResult = await runLowLevelPath(c, fallbackOpts)
|
||||
if (fallbackResult?.success) {
|
||||
ctx.success({ ...fallbackResult.summary, mode: 'P0-4-fallback' })
|
||||
} else {
|
||||
ctx.fail(fallbackResult?.error || 'P0-4 fallback 失败', { ...fallbackResult?.summary, mode: 'P0-4-fallback' })
|
||||
}
|
||||
return
|
||||
}
|
||||
log.error(`menu create (Actions/Module) 失败 code=${r.code}: ${r.msg}`)
|
||||
// Phase A1: 后端错误增强 — 自动从 msg 提取 ErrorCode
|
||||
const enhanced = enhanceFromBackend(r.msg || '', 'menu', { entity: 'menu' })
|
||||
log.error(` ${formatErrorLine(enhanced, { step: 3, stepName: '后端API' })}`)
|
||||
if (opts.json) printJson(r)
|
||||
ctx.fail(`Actions/Module 失败 code=${r.code}: ${r.msg}`, { formId: opts.formId })
|
||||
return
|
||||
}
|
||||
log.ok(`✓ 菜单发布成功 (formId=${opts.formId}, pc=${pc}, app=${app})`)
|
||||
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
||||
// 模式 A Actions/Module 不返 id, 用 lookup 反查 (镜像 B-15 dict)
|
||||
// 后端 menu enCode 默认 = form enCode, 用 form enCode 查
|
||||
let menuId: string | null = null
|
||||
try {
|
||||
const formR = await c.get<{ data?: { enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (formR.data as { enCode?: string } | undefined) || {}
|
||||
const formEnCode = fData.enCode || opts.fullName
|
||||
menuId = await lookupMenuIdByEnCode(formEnCode)
|
||||
} catch {
|
||||
// 拉 form 失败也不阻断 (lookup 仍按 fullName 查)
|
||||
menuId = await lookupMenuIdByEnCode(opts.fullName)
|
||||
}
|
||||
log.ok(` ↳ 菜单 id=${menuId || '(unknown)'} (B-19 反查自 ModuleBySystem)`)
|
||||
if (opts.json) printJson({ id: menuId, formId: opts.formId, fullName: opts.fullName })
|
||||
ctx.success({ id: menuId, formId: opts.formId, fullName: opts.fullName, mode: 'A' })
|
||||
return
|
||||
}
|
||||
log.ok(`✓ 菜单发布成功 (formId=${opts.formId}, pc=${pc}, app=${app})`)
|
||||
log.ok(' ↳ 后端已自动构造 moduleId/propertyJson/urlAddress/pageAddress + 给当前角色授权')
|
||||
// 模式 A Actions/Module 不返 id, 用 lookup 反查 (镜像 B-15 dict)
|
||||
// 后端 menu enCode 默认 = form enCode, 用 form enCode 查
|
||||
let menuId: string | null = null
|
||||
try {
|
||||
const formR = await c.get<{ data?: { enCode?: string } }>(`/visualdev/Base/${opts.formId}`)
|
||||
const fData = (formR.data as { enCode?: string } | undefined) || {}
|
||||
const formEnCode = fData.enCode || opts.fullName
|
||||
menuId = await lookupMenuIdByEnCode(formEnCode)
|
||||
} catch {
|
||||
// 拉 form 失败也不阻断 (lookup 仍按 fullName 查)
|
||||
menuId = await lookupMenuIdByEnCode(opts.fullName)
|
||||
}
|
||||
log.ok(` ↳ 菜单 id=${menuId || '(unknown)'} (B-19 反查自 ModuleBySystem)`)
|
||||
if (opts.json) printJson({ id: menuId, formId: opts.formId, fullName: opts.fullName })
|
||||
// v2.1+ (2026-07-21): Mode A Actions/Module 成功 — 落 CommandLog
|
||||
printEnd('success', { id: menuId, formId: opts.formId, fullName: opts.fullName, mode: 'A' })
|
||||
return
|
||||
}
|
||||
|
||||
// 模式 B: 低级 POST /system/Menu (目录/外链等) — 复用 runLowLevelPath
|
||||
// Mode A Actions/Module "找不到该上级" 失败时也走这个函数 (强制 type=3, icon=form 默认)
|
||||
const modeBResult = await runLowLevelPath(c, opts)
|
||||
// v2.1+ (2026-07-21): Mode B 完成 — 落 CommandLog (L3)
|
||||
if (modeBResult?.success) {
|
||||
printEnd('success', modeBResult.summary, undefined)
|
||||
} else {
|
||||
printEnd('failure', modeBResult?.summary, modeBResult?.error || 'Mode B 失败')
|
||||
if (modeBResult?.shouldExit) process.exit(1)
|
||||
}
|
||||
return
|
||||
// 模式 B: 低级 POST /system/Menu (目录/外链等) — 复用 runLowLevelPath
|
||||
const modeBResult = await runLowLevelPath(c, opts)
|
||||
if (modeBResult?.success) {
|
||||
ctx.success(modeBResult.summary)
|
||||
} else {
|
||||
ctx.fail(modeBResult?.error || 'Mode B 失败', modeBResult?.summary)
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
installHelpHookWithPatterns(cmd, 'menu create', {
|
||||
|
||||
@@ -18,7 +18,7 @@ import { join } from 'node:path'
|
||||
import { homedir } from 'node:os'
|
||||
import { log } from '../../src/core/log.ts'
|
||||
import { readLatestLog, getLogDir } from '../../src/core/logfile.ts'
|
||||
import { setupOutputFilter, addOutputOptions, printCommandEnd } from '../../src/commands/_output_filter.ts'
|
||||
import { setupOutputFilter, addOutputOptions, printCommandEnd, wrapCommand } from '../../src/commands/_output_filter.ts'
|
||||
|
||||
const TEST_APP_CODE = 'unit-test-output-filter'
|
||||
|
||||
@@ -216,3 +216,141 @@ describe('printCommandEnd — fixes 分类过滤', () => {
|
||||
expect(cmdLog!.summary.suggestions).toBe(2)
|
||||
})
|
||||
})
|
||||
|
||||
describe('wrapCommand — 5c 收口 helper (v2.2+ 2026-07-21)', () => {
|
||||
beforeEach(() => {
|
||||
const logDir = getLogDir(TEST_APP_CODE)
|
||||
if (existsSync(logDir)) {
|
||||
try {
|
||||
const tail = join(logDir, 'tail')
|
||||
if (existsSync(tail)) unlinkSync(tail)
|
||||
} catch { /* ignore */ }
|
||||
}
|
||||
})
|
||||
|
||||
it('ctx.success → 落 CommandLog success + stdout summary', async () => {
|
||||
await wrapCommand({
|
||||
command: 'test wrap success',
|
||||
appCode: TEST_APP_CODE,
|
||||
startTime: Date.now() - 50,
|
||||
verbose: false,
|
||||
json: false,
|
||||
fixes: [{ id: 'S1', level: 'silent', summary: 'strip' }],
|
||||
}, async (ctx) => {
|
||||
ctx.success({ id: 'wrap-1', enCode: 'e1' })
|
||||
})
|
||||
|
||||
const cmdLog = readLatestLog(TEST_APP_CODE)
|
||||
expect(cmdLog).not.toBeNull()
|
||||
expect(cmdLog!.command).toBe('test wrap success')
|
||||
expect(cmdLog!.result).toBe('success')
|
||||
expect(cmdLog!.summary.id).toBe('wrap-1')
|
||||
expect(cmdLog!.silent_fixes).toHaveLength(1)
|
||||
})
|
||||
|
||||
it('ctx.partial → result=partial + error 记录', async () => {
|
||||
await wrapCommand({
|
||||
command: 'test wrap partial',
|
||||
appCode: TEST_APP_CODE,
|
||||
startTime: Date.now() - 100,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
ctx.partial('2 个字典项失败', { id: 'wrap-partial' })
|
||||
})
|
||||
|
||||
const cmdLog = readLatestLog(TEST_APP_CODE)
|
||||
expect(cmdLog!.result).toBe('partial')
|
||||
expect(cmdLog!.summary.error).toBe('2 个字典项失败')
|
||||
expect(cmdLog!.summary.id).toBe('wrap-partial')
|
||||
})
|
||||
|
||||
it('ctx.fail → result=failure + error + process.exit(1)', async () => {
|
||||
// 真实运行时 process.exit(1) 会终止进程, mock 后 no-op 让函数正常返回
|
||||
// (不影响 CommandLog 落盘验证)
|
||||
const processExitSpy = vi.spyOn(process, 'exit').mockImplementation((() => {
|
||||
// no-op, 仅记录调用
|
||||
}) as never)
|
||||
|
||||
await wrapCommand({
|
||||
command: 'test wrap fail',
|
||||
appCode: TEST_APP_CODE,
|
||||
startTime: Date.now() - 80,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
ctx.fail('validation failed', { enCode: 'evil' })
|
||||
// mock 时此行会执行 (生产时 process.exit 已终止, 不会到这里)
|
||||
})
|
||||
|
||||
expect(processExitSpy).toHaveBeenCalledWith(1)
|
||||
processExitSpy.mockRestore()
|
||||
|
||||
const cmdLog = readLatestLog(TEST_APP_CODE)
|
||||
expect(cmdLog!.result).toBe('failure')
|
||||
expect(cmdLog!.summary.error).toBe('validation failed')
|
||||
// CommandLog 落盘时 summary 字段被扁平化, enCode → target (非显式但供 stdout 打印)
|
||||
expect(cmdLog!.summary.target).toBe('evil')
|
||||
})
|
||||
|
||||
it('handler throw → catch → result=failure + error message', async () => {
|
||||
// mock process.exit 但不抛, 让外层 catch 路径可以正常落 failure log
|
||||
const processExitSpy = vi.spyOn(process, 'exit').mockImplementation((() => {
|
||||
// no-op
|
||||
}) as never)
|
||||
|
||||
await wrapCommand({
|
||||
command: 'test wrap throw',
|
||||
appCode: TEST_APP_CODE,
|
||||
startTime: Date.now() - 30,
|
||||
fixes: [],
|
||||
}, async (_ctx) => {
|
||||
throw new Error('business logic exploded')
|
||||
})
|
||||
|
||||
expect(processExitSpy).toHaveBeenCalledWith(1)
|
||||
processExitSpy.mockRestore()
|
||||
|
||||
const cmdLog = readLatestLog(TEST_APP_CODE)
|
||||
expect(cmdLog!.result).toBe('failure')
|
||||
expect(cmdLog!.summary.error).toBe('business logic exploded')
|
||||
})
|
||||
|
||||
it('failures 在多个 path 后只落最后一次 (failure 覆盖 success)', async () => {
|
||||
// 验证 fix entries 透传到 CommandLog (不丢)
|
||||
const fixes = [
|
||||
{ id: 'S-X1', level: 'silent' as const, field: 'enCode', summary: 'strip' },
|
||||
{ id: 'A1', level: 'assertive' as const, field: 'f_id', summary: 'relationForm', rollback: 'cmd' },
|
||||
{ id: 'G1', level: 'suggest' as const, field: 'enCode', summary: 'dup', candidates: ['x'] },
|
||||
]
|
||||
await wrapCommand({
|
||||
command: 'test wrap fixes',
|
||||
appCode: TEST_APP_CODE,
|
||||
startTime: Date.now() - 20,
|
||||
fixes,
|
||||
}, async (ctx) => {
|
||||
ctx.success({ id: 'fixes-1' })
|
||||
})
|
||||
|
||||
const cmdLog = readLatestLog(TEST_APP_CODE)
|
||||
expect(cmdLog!.silent_fixes).toHaveLength(1)
|
||||
expect(cmdLog!.assertive_fixes).toHaveLength(1)
|
||||
expect(cmdLog!.suggestions).toHaveLength(1)
|
||||
expect(cmdLog!.summary.silent_fixes).toBe(1)
|
||||
})
|
||||
|
||||
it('无 appCode → 不落 CommandLog, 但 wrapper 不抛', async () => {
|
||||
await wrapCommand({
|
||||
command: 'test wrap noappcode',
|
||||
// 无 appCode
|
||||
startTime: Date.now() - 10,
|
||||
fixes: [],
|
||||
}, async (ctx) => {
|
||||
ctx.success({ id: 'noapp' })
|
||||
})
|
||||
|
||||
// 无 appCode 时 tail 不会被 wrap noappcode 更新 (与 printCommandEnd 一致)
|
||||
const cmdLog = readLatestLog(TEST_APP_CODE)
|
||||
if (cmdLog) {
|
||||
expect(cmdLog.command).not.toBe('test wrap noappcode')
|
||||
}
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user