P2-5 修复: _encode_validator dead code 清理 (2026-07-02)
FINDING-S1: detectEnCodeScope/adaptEnCodeForScope/EnCodeScope type 三个导出零引用 - grep 整个 codebase 只在自己文件内出现 - BS-56 formValidate 正则已统一 form/dict/menu/di, 不需要 scope 区分 - audit 建议: 要么接入 form/dict/menu/di 要么删 修复: - 删 adaptEnCodeForScope 函数 (15 行) - 删 detectEnCodeScope 函数 (6 行) - 删 EnCodeScope type (4 行) - 加 v0.15+ 注释说明 dead code 已清 - 保留 validateEnCode/validateFullName/suggestEnCode/ENCODE_REGEXP/FULLNAME_REGEXP 等真用的 审计: dacli/docs/cmd-review/v0.14-rollout-audit-2026-07-02.md §5.1 S1
This commit is contained in:
1 parent
33219644fd
commit
50e170cae0
1 file changed
+4
-41
@@ -118,44 +118,7 @@ export function validateFullName(fullName: string | undefined, field = 'fullName
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* BS-108 (jyzs 2026-07-02): 跨命令 enCode 适配
|
||||
*
|
||||
* 实战发现: 不同命令后端正则不一致 (jyzs 实战踩坑):
|
||||
* - form / dict: 允许下划线 (web formValidate 不严, 但 dacli BS-56 已统一禁)
|
||||
* - portal / workflow / menu: VS030 严格 (字母数字小数点, 强制去下划线)
|
||||
* - di: 无强校验 (web 端无正则, 允许下划线)
|
||||
*
|
||||
* 解决: `adaptEnCodeForScope(enCode, scope)` 根据目标 scope 自动转换:
|
||||
* - scope='strict' (portal/workflow/menu): 去下划线 (默认)
|
||||
* - scope='loose' (di): 保留 (但 dacli BS-56 仍会校验)
|
||||
* - scope='auto' (默认): 根据 enCode 是否含下划线判断, 含 → strict, 不含 → loose
|
||||
*
|
||||
* @param enCode 原始 enCode
|
||||
* @param scope 目标 scope: 'strict' | 'loose' | 'auto'
|
||||
* @returns 适配后的 enCode (若已合法则返回原值)
|
||||
*/
|
||||
export type EnCodeScope = 'strict' | 'loose' | 'auto'
|
||||
|
||||
export function adaptEnCodeForScope(enCode: string | undefined, scope: EnCodeScope = 'auto'): string {
|
||||
if (!enCode) return ''
|
||||
const enc = String(enCode).trim()
|
||||
// 已合法 → 返回原值
|
||||
if (ENCODE_REGEXP.test(enc)) return enc
|
||||
|
||||
// scope='loose' (DI 允许下划线): 保留原值 (让 web 后端校验)
|
||||
if (scope === 'loose') return enc
|
||||
|
||||
// scope='strict' 或 'auto' (含下划线 → strict): 去下划线/连字符/空格
|
||||
return suggestEnCode(enc)
|
||||
}
|
||||
|
||||
/**
|
||||
* BS-108: 跨命令 enCode scope 检测 — 自动判断 scope
|
||||
*/
|
||||
export function detectEnCodeScope(commandName: string): EnCodeScope {
|
||||
const strictCmds = ['portal', 'workflow', 'menu', 'workflow create', 'portal release']
|
||||
if (strictCmds.some((s) => commandName.includes(s))) return 'strict'
|
||||
// di / dict / form / role / identity: BS-56 统一校验, 走 strict
|
||||
return 'strict'
|
||||
}
|
||||
// v0.15+ (P2-5, 2026-07-02): 删 BS-108 adaptEnCodeForScope/detectEnCodeScope dead code
|
||||
// - 整个 codebase 零引用 (grep 只在自己文件内)
|
||||
// - BS-56 formValidate 正则已经统一 form/dict/menu/di, 不需要 scope 区分
|
||||
// - audit FINDING-S1: '要么接入 form/dict/menu/di 要么删', 选删 (form 走 web 端后端校验)
|
||||
Reference in new issue
Block a user