From 8ea0ef2f1e0a070157bf26552e8126615fa64662 Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 2 Jul 2026 15:23:51 +0800 Subject: [PATCH] =?UTF-8?q?fix(modeler):=20activiti.json=20=E4=BF=AE=20Mod?= =?UTF-8?q?eler.saveXML=20=E5=A4=A7=E5=86=99=E5=85=83=E7=B4=A0=E5=90=8D(?= =?UTF-8?q?=E6=96=AD=E9=83=A8=E7=BD=B2)+=E7=9C=9FModeler=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E5=8C=96=E5=9B=9E=E5=BD=92=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CRITICAL:bpmn-js Modeler.saveXML 把被 activiti.json `extends` 的 bpmn 类型序列化成 PascalCase 元素名(//…),未扩展的 / 仍小写。Flowable 大小写敏感 → 不被识别为流程,ProcessValidator 报 flowable-process-definition-not-executable,部署完全失败。 根因:moddle 把「被扩展类型」的合并描述符 $pkg 设为**最后一个 trait 的包**(moddle index.esm.js:577)。activiti 包缺 `xml.tagAlias:"lowerCase"`,故 moddle-xml 写元素名时不做 首字母小写 → PascalCase。且 tagAlias 是**双向**的(也驱动 fromXML 解析),要求自定义元素类型名 用 activiti/camunda 惯例的 PascalCase,否则解析 找不到类型而丢弃。 修法(对齐 activiti/camunda-bpmn-moddle 标准): - activiti.json + flowable.json 加 `"xml": { "tagAlias": "lowerCase" }`; - 自定义元素类型名改 PascalCase:taskListener→TaskListener / executionListener→ExecutionListener / field→Field / formProperty→FormProperty / value→Value / in→In / out→Out(属性 type 引用同步)。 XML 元素名仍小写(tagAlias),故 fixture 与「toContain('activiti:taskListener')」类 XML 断言不变。 - Eip4Panel.tsx:moddle.create/$type 用 'activiti:TaskListener';测试 fake 类型名同步。 为何旧测试没抓到:T1.1/T1.2 只断言 activiti 扩展属性/元素多重集,从不断言基础 BPMN 元素名大小写; fromXML→toXML 与 create 都走同一 moddle-xml Writer 且都产 PascalCase(本 commit 实证)。 新增 serialization.test.ts(4 例,RED→GREEN):以 BpmnModdle(= Modeler.saveXML 的 moddle 层, jsdom 跑不动 diagram-js SVG)驱动 fromXML→toXML 与 create→toXML,断言基础元素名全小写、无 PascalCase、 isExecutable 保留、扩展元素/属性不丢;flowable 隔离同验。 serialization 4 + fidelity 12 + Eip4Panel 37;全量 231 单测绿,tsc -b rc=0 + build 干净。 Co-Authored-By: Claude Fable 5 --- src/modeler/Eip4Panel.test.tsx | 10 +-- src/modeler/Eip4Panel.tsx | 9 ++- src/modeler/moddle/activiti.json | 21 +++--- src/modeler/moddle/fidelity.test.ts | 10 ++- src/modeler/moddle/flowable.json | 13 ++-- src/modeler/moddle/serialization.test.ts | 95 ++++++++++++++++++++++++ 6 files changed, 130 insertions(+), 28 deletions(-) create mode 100644 src/modeler/moddle/serialization.test.ts diff --git a/src/modeler/Eip4Panel.test.tsx b/src/modeler/Eip4Panel.test.tsx index 58ca69f..5bf83ee 100644 --- a/src/modeler/Eip4Panel.test.tsx +++ b/src/modeler/Eip4Panel.test.tsx @@ -513,8 +513,8 @@ describe('Eip4Panel — 扩展属性(长尾 $attrs)', () => { describe('Eip4Panel — 任务监听器(taskListener)', () => { it('增:新监听器写回 extensionElements,并保留已有监听器的 field(引用不动)', async () => { const { modeler, updateProperties, moddle, select } = makeModeler(); - const fieldObj = moddleEl('activiti:field', { name: 'mailTemplate' }); - const existing = moddleEl('activiti:taskListener', { + const fieldObj = moddleEl('activiti:Field', { name: 'mailTemplate' }); + const existing = moddleEl('activiti:TaskListener', { event: 'complete', class: 'com.dsasp.server.wf.user.listener.TaskCompleteListener', fields: [fieldObj], @@ -543,14 +543,14 @@ describe('Eip4Panel — 任务监听器(taskListener)', () => { fireEvent.change(screen.getByTestId('eip4-listener-event-0'), { target: { value: 'assignment' } }); fireEvent.change(screen.getByTestId('eip4-listener-value-0'), { target: { value: 'com.X.Listener' } }); const ext = lastPayload(updateProperties).extensionElements as { values: Array> }; - const listener = ext.values.find((v) => v.$type === 'activiti:taskListener')!; + const listener = ext.values.find((v) => v.$type === 'activiti:TaskListener')!; expect(listener.event).toBe('assignment'); expect(listener.class).toBe('com.X.Listener'); }); it('删:移除唯一监听器 → extensionElements=undefined', async () => { const { modeler, updateProperties, select } = makeModeler(); - const existing = moddleEl('activiti:taskListener', { event: 'create', class: 'com.X' }); + const existing = moddleEl('activiti:TaskListener', { event: 'create', class: 'com.X' }); render(); await select(userTask({ extensionElements: { values: [existing] } })); fireEvent.click(screen.getByTestId('eip4-listener-remove-0')); @@ -569,7 +569,7 @@ describe('Eip4Panel — 任务监听器(taskListener)', () => { }); fireEvent.change(screen.getByTestId('eip4-listener-value-0'), { target: { value: '${bean}' } }); const ext = lastPayload(updateProperties).extensionElements as { values: Array> }; - const listener = ext.values.find((v) => v.$type === 'activiti:taskListener')!; + const listener = ext.values.find((v) => v.$type === 'activiti:TaskListener')!; expect(listener.delegateExpression).toBe('${bean}'); expect('class' in listener).toBe(false); }); diff --git a/src/modeler/Eip4Panel.tsx b/src/modeler/Eip4Panel.tsx index 240600e..414a744 100644 --- a/src/modeler/Eip4Panel.tsx +++ b/src/modeler/Eip4Panel.tsx @@ -385,10 +385,13 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) { // 任务监听器 const extEl = bo.get('extensionElements') as { values?: unknown[] } | undefined; const values = (extEl?.values ?? []) as unknown[]; - otherExtRef.current = values.filter((v) => (v as { $type?: string }).$type !== 'activiti:taskListener'); + // moddle 类型名遵循 activiti/camunda 惯例=PascalCase(xml.tagAlias:lowerCase 令 XML 元素名仍小写 + // ),故按 $type 'activiti:TaskListener' 识别;小写名会致扩展类型 $pkg 串味、 + // 断部署(见 moddle/serialization.test.ts)。 + otherExtRef.current = values.filter((v) => (v as { $type?: string }).$type !== 'activiti:TaskListener'); setListeners( values - .filter((v) => (v as { $type?: string }).$type === 'activiti:taskListener') + .filter((v) => (v as { $type?: string }).$type === 'activiti:TaskListener') .map((v) => { const cls = mget(v, 'class') as string | undefined; const del = mget(v, 'delegateExpression') as string | undefined; @@ -499,7 +502,7 @@ export function Eip4Panel({ modeler }: { modeler: PanelModeler | null }) { const props: Record = { event: l.event }; props[l.mode] = l.value; if (l.fields && l.fields.length) props.fields = l.fields; - return moddle.create('activiti:taskListener', props); + return moddle.create('activiti:TaskListener', props); }); const all = [...otherExtRef.current, ...listenerEls]; const extEl = all.length ? moddle.create('bpmn:ExtensionElements', { values: all }) : undefined; diff --git a/src/modeler/moddle/activiti.json b/src/modeler/moddle/activiti.json index 03777a3..24977ee 100644 --- a/src/modeler/moddle/activiti.json +++ b/src/modeler/moddle/activiti.json @@ -2,6 +2,7 @@ "name": "Activiti", "uri": "http://activiti.org/bpmn", "prefix": "activiti", + "xml": { "tagAlias": "lowerCase" }, "associations": [], "types": [ { @@ -90,7 +91,7 @@ ] }, { - "name": "taskListener", + "name": "TaskListener", "superClass": ["Element"], "meta": { "allowedIn": ["bpmn:UserTask"] }, "properties": [ @@ -98,11 +99,11 @@ { "name": "class", "isAttr": true, "type": "String" }, { "name": "expression", "isAttr": true, "type": "String" }, { "name": "delegateExpression", "isAttr": true, "type": "String" }, - { "name": "fields", "type": "field", "isMany": true } + { "name": "fields", "type": "Field", "isMany": true } ] }, { - "name": "executionListener", + "name": "ExecutionListener", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -110,11 +111,11 @@ { "name": "class", "isAttr": true, "type": "String" }, { "name": "expression", "isAttr": true, "type": "String" }, { "name": "delegateExpression", "isAttr": true, "type": "String" }, - { "name": "fields", "type": "field", "isMany": true } + { "name": "fields", "type": "Field", "isMany": true } ] }, { - "name": "field", + "name": "Field", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -125,7 +126,7 @@ ] }, { - "name": "formProperty", + "name": "FormProperty", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -140,11 +141,11 @@ { "name": "datePattern", "isAttr": true, "type": "String" }, { "name": "default", "isAttr": true, "type": "String" }, { "name": "value", "isAttr": true, "type": "String" }, - { "name": "values", "type": "value", "isMany": true } + { "name": "values", "type": "Value", "isMany": true } ] }, { - "name": "value", + "name": "Value", "superClass": ["Element"], "properties": [ { "name": "id", "isAttr": true, "type": "String" }, @@ -152,7 +153,7 @@ ] }, { - "name": "in", + "name": "In", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -163,7 +164,7 @@ ] }, { - "name": "out", + "name": "Out", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ diff --git a/src/modeler/moddle/fidelity.test.ts b/src/modeler/moddle/fidelity.test.ts index 23db2f5..9d60f35 100644 --- a/src/modeler/moddle/fidelity.test.ts +++ b/src/modeler/moddle/fidelity.test.ts @@ -37,9 +37,11 @@ function warns(res: any, re: RegExp): any[] { describe('activiti/flowable moddle 描述符 — 语料覆盖', () => { it('§0 全部实测 activiti 属性/元素在 activiti.json 有声明', () => { - const declared = JSON.stringify(activiti); + // 大小写不敏感:自定义元素类型名遵循 activiti/camunda 惯例=PascalCase(TaskListener/Field/…), + // xml.tagAlias:lowerCase 令 XML 元素名仍小写()。见 serialization.test.ts。 + const declared = JSON.stringify(activiti).toLowerCase(); [...CORPUS_ATTRS, ...CORPUS_ELEMENTS].forEach((n) => - expect(declared, `activiti:${n} 未声明`).toContain(`"${n}"`)); + expect(declared, `activiti:${n} 未声明`).toContain(`"${n.toLowerCase()}"`)); }); it('flowable.json 声明命名空间与 flowable:assignee', () => { @@ -85,14 +87,14 @@ describe('activiti round-trip 零丢失(合成 fixture 覆盖全扩展面)', const { rootElement } = await newActiviti().fromXML(SYNTHETIC_BPMN); const receive = findById(rootElement, 't_receive'); const listener = receive.extensionElements.values.find( - (v: any) => v.$type === 'activiti:taskListener', + (v: any) => v.$type === 'activiti:TaskListener', ); expect(listener.event).toBe('complete'); expect(listener.class).toBe('com.dsasp.server.wf.user.listener.TaskCompleteListener'); expect(listener.fields[0].name).toBe('mailTemplate'); expect(listener.fields[0].string).toBe('审批完成通知'); const formProp = receive.extensionElements.values.find( - (v: any) => v.$type === 'activiti:formProperty', + (v: any) => v.$type === 'activiti:FormProperty', ); expect(formProp.id).toBe('fp_remark'); expect(formProp.values.map((v: any) => v.name)).toEqual(['同意', '驳回']); diff --git a/src/modeler/moddle/flowable.json b/src/modeler/moddle/flowable.json index acbf045..69b0279 100644 --- a/src/modeler/moddle/flowable.json +++ b/src/modeler/moddle/flowable.json @@ -2,6 +2,7 @@ "name": "Flowable", "uri": "http://flowable.org/bpmn", "prefix": "flowable", + "xml": { "tagAlias": "lowerCase" }, "associations": [], "types": [ { @@ -44,7 +45,7 @@ ] }, { - "name": "taskListener", + "name": "TaskListener", "superClass": ["Element"], "meta": { "allowedIn": ["bpmn:UserTask"] }, "properties": [ @@ -52,11 +53,11 @@ { "name": "class", "isAttr": true, "type": "String" }, { "name": "expression", "isAttr": true, "type": "String" }, { "name": "delegateExpression", "isAttr": true, "type": "String" }, - { "name": "fields", "type": "field", "isMany": true } + { "name": "fields", "type": "Field", "isMany": true } ] }, { - "name": "field", + "name": "Field", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -67,7 +68,7 @@ ] }, { - "name": "formProperty", + "name": "FormProperty", "superClass": ["Element"], "meta": { "allowedIn": ["*"] }, "properties": [ @@ -75,11 +76,11 @@ { "name": "name", "isAttr": true, "type": "String" }, { "name": "type", "isAttr": true, "type": "String" }, { "name": "required", "isAttr": true, "type": "String" }, - { "name": "values", "type": "value", "isMany": true } + { "name": "values", "type": "Value", "isMany": true } ] }, { - "name": "value", + "name": "Value", "superClass": ["Element"], "properties": [ { "name": "id", "isAttr": true, "type": "String" }, diff --git a/src/modeler/moddle/serialization.test.ts b/src/modeler/moddle/serialization.test.ts new file mode 100644 index 0000000..c693c25 --- /dev/null +++ b/src/modeler/moddle/serialization.test.ts @@ -0,0 +1,95 @@ +import { describe, it, expect } from 'vitest'; +import BpmnModdle from 'bpmn-moddle'; +import activiti from './activiti.json'; +import flowable from './flowable.json'; +import { SYNTHETIC_BPMN } from './fixtures/synthetic-full-surface.bpmn'; + +// 元素名大小写回归(CRITICAL:断部署)。 +// +// 根因:moddle 把「被扩展类型」的合并描述符 $pkg 设为**最后一个 trait 的包** +// (moddle index.esm.js:577)。activiti.json 用 `extends` 给 bpmn:Process/UserTask/StartEvent… +// 加属性 → 这些基础类型的 $pkg 变成 activiti 包;moddle-xml 序列化时按 $pkg 的 +// `xml.tagAlias` 决定元素名首字母是否小写。bpmn 包有 `tagAlias:"lowerCase"`(Process→process), +// activiti 包若无此声明 → 写出 PascalCase `//`。 +// **Flowable 大小写敏感**:`` 不被识别为流程 → 部署时 ProcessValidator 报 +// flowable-process-definition-not-executable(看到 0 个可执行流程),部署完全失败。 +// +// 为何 T1.1/T1.2 没抓到:它们只断言 activiti 扩展属性/元素多重集,**从不断言基础 BPMN 元素名的 +// 大小写**;且 fromXML→toXML 与 create 都走同一 moddle-xml Writer,均产 PascalCase(本文件实证)。 +// +// 为何用 BpmnModdle 而非真 Modeler:bpmn-js Modeler 依赖 diagram-js 的 SVG 布局(getBBox 等), +// jsdom 跑不动;而 Modeler.saveXML 在 moddle 层就是 `moddle.toXML(定义树)`,diagram-js 从不改元素名。 +// 故 `new BpmnModdle({activiti})` 的 fromXML→toXML / create→toXML 忠实复现 saveXML 的元素命名路径。 + +const BASE_TYPES: Array<[create: string, lower: string, pascal: string]> = [ + ['bpmn:Process', 'process', 'Process'], + ['bpmn:UserTask', 'userTask', 'UserTask'], + ['bpmn:StartEvent', 'startEvent', 'StartEvent'], + ['bpmn:ScriptTask', 'scriptTask', 'ScriptTask'], + ['bpmn:EndEvent', 'endEvent', 'EndEvent'], + ['bpmn:SequenceFlow', 'sequenceFlow', 'SequenceFlow'], + ['bpmn:BoundaryEvent', 'boundaryEvent', 'BoundaryEvent'], +]; + +/** 元素名正则(可选 bpmn: 前缀 + 精确 token + 分隔符),大小写敏感。 */ +const openTag = (name: string) => new RegExp('<(bpmn:)?' + name + '[\\s/>]'); + +describe('moddle 序列化——基础 BPMN 元素名小写(断部署回归)', () => { + it('打开存量再导出(fromXML→toXML):基础元素名全小写,无 PascalCase(Flowable 可识别)', async () => { + const moddle = new BpmnModdle({ activiti }); + const { rootElement } = await moddle.fromXML(SYNTHETIC_BPMN); + const { xml } = await moddle.toXML(rootElement, { format: true }); + for (const [, lower, pascal] of BASE_TYPES) { + expect(xml, `应含小写 <${lower}>`).toMatch(openTag(lower)); + expect(xml, `不应含 PascalCase <${pascal}>(Flowable 大小写敏感)`).not.toMatch(openTag(pascal)); + } + }); + + it('isExecutable 症状:process 元素小写且保留 isExecutable="true"', async () => { + const moddle = new BpmnModdle({ activiti }); + const { rootElement } = await moddle.fromXML(SYNTHETIC_BPMN); + const { xml } = await moddle.toXML(rootElement, { format: true }); + // 真正的 bug 是 不被识别("isExecutable 丢失"只是症状)——断言 process 小写即可。 + expect(xml).toMatch(/<(bpmn:)?process[\s][^>]*isExecutable="true"/); + expect(xml).not.toMatch(openTag('Process')); + }); + + it('新建元素(create→toXML):新建流程各基础节点名也全小写', async () => { + const moddle = new BpmnModdle({ activiti }); + const defs = moddle.create('bpmn:Definitions', { targetNamespace: 'http://x' }); + const proc = moddle.create('bpmn:Process', { id: 'p1', isExecutable: true }); + const start = moddle.create('bpmn:StartEvent', { id: 's1' }); + const ut = moddle.create('bpmn:UserTask', { + id: 't1', + 'activiti:candidateUsers': 'X', + 'activiti:formKey': 'K', + }); + const flow = moddle.create('bpmn:SequenceFlow', { id: 'f1', sourceRef: start, targetRef: ut }); + const end = moddle.create('bpmn:EndEvent', { id: 'e1' }); + proc.flowElements = [start, ut, flow, end]; + defs.rootElements = [proc]; + const { xml } = await moddle.toXML(defs, { format: true }); + for (const [, lower, pascal] of BASE_TYPES.filter(([, l]) => l !== 'scriptTask' && l !== 'boundaryEvent')) { + expect(xml, `应含小写 <${lower}>`).toMatch(openTag(lower)); + expect(xml, `不应含 PascalCase <${pascal}>`).not.toMatch(openTag(pascal)); + } + // 扩展属性 / 自定义元素不受影响 + expect(xml).toContain('activiti:candidateUsers="X"'); + expect(xml).toContain('activiti:formKey="K"'); + }); + + it('flowable 描述符隔离同样小写(虽不进 Modeler,防同类潜伏 bug)', async () => { + const moddle = new BpmnModdle({ flowable }); + const defs = moddle.create('bpmn:Definitions', { targetNamespace: 'http://x' }); + const proc = moddle.create('bpmn:Process', { id: 'p1', isExecutable: true }); + const ut = moddle.create('bpmn:UserTask', { id: 't1', 'flowable:assignee': 'u1' }); + proc.flowElements = [ut]; + defs.rootElements = [proc]; + const { xml } = await moddle.toXML(defs, { format: true }); + expect(xml).toMatch(openTag('process')); + expect(xml).toMatch(openTag('userTask')); + expect(xml).not.toMatch(openTag('Process')); + expect(xml).not.toMatch(openTag('UserTask')); + expect(xml).toContain('flowable:assignee="u1"'); + }); +});