fix(modeler): codec 评审收口——stringToJson引号映射+半角content变体+item未知键透传+形状守卫
评审者跑全库 4794 条真实表达式往返对照原版序列化器,四项收口:
- I-1 build 补 stringToJson 引号契约(BasePropertiesConverter.java:235-280):字符串叶子值
'→‘、"→“(经 JSON.stringify replacer,{}→【】由 halfToFull、\\与控制字符由 stringify 覆盖)。
否则用户输入含 ' 截断外层 JUEL 单引号字面量 / 含 " 截断内层 JSON,部署后表达式解析即断。
语料 ‘/“ 均 0 命中→对存量为 no-op,不破逐字往返。
- I-2 头注释纠偏:「content 不含花括号」被 20 条真实 ${users}(半角)证伪;改为事实——
4774/4794 逐字,20 条半角 content 变体 build 归一为全角,引擎 :54 全局【→{ 还原后运行期等价。
- M-1 item 未知键 known-first 重排+按原序透传(与 meta 全量保留对称,不静默丢未来扩展键)。
- M-2 items 元素形状守卫:元素非对象或 type 非字符串→整体返 null 不抛。
加分:tools/codec-corpus-sweep.mjs(照 modeler-fidelity-sweep 风格,内联镜像 codec 跑全语料):
1512 文档 / 4794 表达式 → 逐字 4774 + 引擎运行期等价 20 + 解析失败 0 + 硬不匹配 0(门禁绿)。
测试 29 例(原 20 + 引号映射/幂等/meta 引号/半角变体运行期等价/未知键透传/形状守卫 9 例);
modeler 全量 66 例绿;tsc -b 干净。
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -199,4 +199,107 @@ describe('非法/空输入返回 null 不抛', () => {
|
||||
"${candidateUsersHandler.getCandidateUsers(execution,'【\"foo\":1】')}";
|
||||
expect(parseCandidateExpression(noItems)).toBeNull();
|
||||
});
|
||||
|
||||
// M-2 形状守卫
|
||||
it('items 元素非对象(字符串)→ null 不抛', () => {
|
||||
const bad =
|
||||
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[\"notanobject\"]】')}";
|
||||
expect(() => parseCandidateExpression(bad)).not.toThrow();
|
||||
expect(parseCandidateExpression(bad)).toBeNull();
|
||||
});
|
||||
|
||||
it('items 元素 type 非字符串(数字)→ null', () => {
|
||||
const bad =
|
||||
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[【\"type\":123,\"content\":\"x\"】]】')}";
|
||||
expect(parseCandidateExpression(bad)).toBeNull();
|
||||
});
|
||||
|
||||
it('items 元素为 null → null', () => {
|
||||
const bad =
|
||||
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[null]】')}";
|
||||
expect(parseCandidateExpression(bad)).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
describe('I-1 stringToJson 引号映射(T2.4 接用户输入前必须)', () => {
|
||||
const CAND_PREFIX = "${candidateUsersHandler.getCandidateUsers(execution,'";
|
||||
function body(built: string): string {
|
||||
return built.slice(CAND_PREFIX.length, built.length - "')}".length);
|
||||
}
|
||||
|
||||
it("content 含 ' 和 \" → build 映射为 ‘/“,值层无裸 '/\"、外层 JUEL 定界符不被截断", () => {
|
||||
const item: UserPropertyItem = {
|
||||
type: 'user',
|
||||
content: `O'Brien "Ann"`,
|
||||
isCandidate: true,
|
||||
isSendMail: false,
|
||||
isSendPhone: false,
|
||||
isSendMessage: false,
|
||||
};
|
||||
const built = buildCandidateExpression([item], 'candidate');
|
||||
// JUEL 单引号字面量安全:整个内容段不得出现裸 ASCII 单引号(否则截断 execution,'...')。
|
||||
// 注意 " 是 JSON 结构定界符会合法出现于内容段,故只对 ' 断言整段无裸值。
|
||||
expect(body(built)).not.toContain("'");
|
||||
// JSON 结构安全:值里的 " 已映射走,build 产物仍是良构表达式,可无损 parse 回来。
|
||||
const r = parseCandidateExpression(built);
|
||||
expect(r).not.toBeNull();
|
||||
const c = r!.items[0].content;
|
||||
expect(c).toContain('‘'); // O‘Brien
|
||||
expect(c).toContain('“'); // “Ann“(开闭同映射为左引号,与 stringToJson 逐字一致)
|
||||
expect(c).not.toContain("'");
|
||||
expect(c).not.toContain('"');
|
||||
expect(built.startsWith(CAND_PREFIX)).toBe(true);
|
||||
expect(built.endsWith("')}")).toBe(true);
|
||||
});
|
||||
|
||||
it('引号映射幂等:build 产物再 parse→build 稳定不变', () => {
|
||||
const built = buildCandidateExpression(
|
||||
[{ type: 'user', content: `x'y"z`, isCandidate: true, isSendMail: false, isSendPhone: false }],
|
||||
'candidate',
|
||||
);
|
||||
const r = parseCandidateExpression(built)!;
|
||||
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(built);
|
||||
});
|
||||
|
||||
it('meta 字符串叶子(messageTemplate)同样应用引号映射', () => {
|
||||
const built = buildCandidateExpression(
|
||||
[{ type: 'user', content: 'u1', isCandidate: true, isSendMail: false, isSendPhone: false }],
|
||||
'candidate',
|
||||
{ messageTemplate: `it's` },
|
||||
);
|
||||
expect(built).toContain('it‘s');
|
||||
expect(body(built)).not.toContain("'");
|
||||
});
|
||||
});
|
||||
|
||||
describe('I-2 半角 content 变体(scriptUser ${users})——运行期等价', () => {
|
||||
// 语料实测 20 条:content 用半角 ${users}(非 stringToJson 产物)。parse 保留原值,
|
||||
// build 把结构性 {} 连同 content 里半角 {} 一并规范化为全角——非字节逐字,但引擎运行期
|
||||
// 对整串全局 【→{ 还原后完全等价。
|
||||
const HALF =
|
||||
"${multiInstanceUsersHandler.getUsers(execution,'【\"items\":[【\"type\":\"scriptUser\",\"content\":\"${users}\",\"isCandidate\":true,\"isSendMail\":false,\"isSendPhone\":false】]】')}";
|
||||
// 镜像引擎 CandidateUsersHandler:54 的全局字面替换
|
||||
const engineRestore = (s: string): string => s.split('【').join('{').split('】').join('}');
|
||||
|
||||
it('半角 content 可解析,原值保留', () => {
|
||||
const r = parseCandidateExpression(HALF)!;
|
||||
expect(r.items[0]).toMatchObject({ type: 'scriptUser', content: '${users}' });
|
||||
});
|
||||
|
||||
it('build 输出恒全角(content 半角{}被规范化),但引擎全局替换后与原文等价', () => {
|
||||
const r = parseCandidateExpression(HALF)!;
|
||||
const built = buildCandidateExpression(r.items, r.variant, r.meta);
|
||||
expect(built).toContain('$【users】'); // 非字节逐字
|
||||
expect(engineRestore(built)).toBe(engineRestore(HALF)); // 运行期等价
|
||||
});
|
||||
});
|
||||
|
||||
describe('M-1 item 未知键透传(不静默丢未来扩展键,与 meta 全量保留对称)', () => {
|
||||
it('未知 item 键排在已知键之后,往返逐字不丢', () => {
|
||||
const WITH_UNKNOWN =
|
||||
"${candidateUsersHandler.getCandidateUsers(execution,'【\"items\":[【\"type\":\"user\",\"content\":\"u1\",\"isCandidate\":true,\"isSendMail\":false,\"isSendPhone\":false,\"futureFlag\":true】]】')}";
|
||||
const r = parseCandidateExpression(WITH_UNKNOWN)!;
|
||||
expect((r.items[0] as Record<string, unknown>).futureFlag).toBe(true);
|
||||
expect(buildCandidateExpression(r.items, r.variant, r.meta)).toBe(WITH_UNKNOWN);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user