From a2aeeba2967eb48088bf6f4a1a1351f5633c04c9 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 09:47:02 +0800 Subject: [PATCH] =?UTF-8?q?fix(modeler):=20T1.1=20=E8=AF=84=E5=AE=A1?= =?UTF-8?q?=E6=94=B6=E5=8F=A3=E2=80=94=E2=80=94bpmn-moddle=20=E6=98=BE?= =?UTF-8?q?=E5=BC=8FdevDep+$attrs=E6=96=AD=E8=A8=80+=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 评审 I-1 / M-1 / TS7016 收口(承接 8fdfe68): - I-1 幻影依赖:devDependencies 显式声明 bpmn-moddle ^8.1.0(npm dedupe 到与 bpmn-js 同一份 8.1.0),保真测试不再依赖传递提升、与 Modeler 运行时同版本。 - M-1 断言意图纠偏:fidelity.test.ts 原注释「未声明时 .get() 返 undefined」实证有误—— moddle .get() 对未声明属性会回落 $attrs 返原值(已实证:flowable:assignee 未声明时 .get() 返 "X")。改注释 + 增 `expect($attrs?.['activiti:candidateUsers']).toBeUndefined()` 直接断言值未落 lax $attrs(=真 typed 化,声明属性确不在 $attrs)。 - TS7016:新增 src/modeler/moddle/bpmn-moddle.d.ts(最小 ambient 声明)消编辑器诊断。 验证:npx vitest run src/modeler 12/12 绿;npx tsc -b 干净(exit 0)。 Co-Authored-By: Claude Fable 5 --- package-lock.json | 1 + package.json | 1 + src/modeler/moddle/bpmn-moddle.d.ts | 3 +++ src/modeler/moddle/fidelity.test.ts | 5 ++++- 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/modeler/moddle/bpmn-moddle.d.ts diff --git a/package-lock.json b/package-lock.json index 58189fe..529224f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,6 +31,7 @@ "amis-formula": "^6.13.0", "amis-theme-editor-helper": "^6.12.0-ab.1", "amis-ui": "^6.13.0", + "bpmn-moddle": "^8.1.0", "i18n-runtime": "^1.0.13", "jsdom": "^29.1.1", "typescript": "5.6.3", diff --git a/package.json b/package.json index 8239497..fbed8c6 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "amis-formula": "^6.13.0", "amis-theme-editor-helper": "^6.12.0-ab.1", "amis-ui": "^6.13.0", + "bpmn-moddle": "^8.1.0", "i18n-runtime": "^1.0.13", "jsdom": "^29.1.1", "typescript": "5.6.3", diff --git a/src/modeler/moddle/bpmn-moddle.d.ts b/src/modeler/moddle/bpmn-moddle.d.ts new file mode 100644 index 0000000..b576946 --- /dev/null +++ b/src/modeler/moddle/bpmn-moddle.d.ts @@ -0,0 +1,3 @@ +// bpmn-moddle 8.x 无自带类型声明(TS7016)。最小 ambient 声明消编辑器诊断; +// 运行时行为以 fidelity.test.ts 的 round-trip 断言为准。 +declare module 'bpmn-moddle'; diff --git a/src/modeler/moddle/fidelity.test.ts b/src/modeler/moddle/fidelity.test.ts index c5b904d..23db2f5 100644 --- a/src/modeler/moddle/fidelity.test.ts +++ b/src/modeler/moddle/fidelity.test.ts @@ -63,8 +63,11 @@ describe('activiti round-trip 零丢失(合成 fixture 覆盖全扩展面)', it('candidateUsers 被识别为 typed 属性且逐字保留(全角【】+ 尾空格 + JSON 原样)', async () => { const { rootElement } = await newActiviti().fromXML(SYNTHETIC_BPMN); const receive = findById(rootElement, 't_receive'); - // 若描述符未声明 candidateUsers,值会落进 $attrs 而 .get() 返 undefined —— 该断言同时守住 typed 化。 + // 逐字保真:解析值 byte-exact 等于原文。 expect(receive.get('activiti:candidateUsers')).toBe(EXPECTED_CANDIDATE_USERS); + // typed 化的直接证据:值走声明属性、未回落 lax $attrs。 + // (moddle .get() 对未声明属性也会回落 $attrs 返原值,故单看 .get() 不足以证明 typed 化。) + expect(receive.$attrs?.['activiti:candidateUsers']).toBeUndefined(); }); it('多实例 collection/elementVariable/completionCondition 解析为结构化模型', async () => {