Skip to content

FOUR-29398: improve validation of id properties for events definitions #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
caleeli wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FOUR-29398: improve validation of id properties for events definitions #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ yarn-error.log*
*.njsproj
*.sln
*.sw*
.semantic-code-mcp/
18 changes: 3 additions & 15 deletions rules/id-required.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,9 @@ module.exports = function() {
return node.$type.startsWith('bpmndi') || node.$type.startsWith('dc');
}

function isEventDefinition(node) {
return isAny(node, [
'bpmn:CancelEventDefinition',
'bpmn:CompensateDefinition',
'bpmn:ErrorEventDefinition',
'bpmn:EscalationEventDefinition',
function isExemptFromId(node) {
return is(node, 'bpmn:EventDefinition') || isAny(node, [
'bpmn:Expression',
'bpmn:LinkEventDefinition',
'bpmn:MessageEventDefinition',
'bpmn:SignalEventDefinition',
'bpmn:TerminateEventDefinition',
'bpmn:TimeCycle',
'bpmn:TimeDate',
'bpmn:TimeDuration',
'bpmn:TimerEventDefinition',
'bpmn:Documentation',
'bpmn:InputOutputSpecification',
'bpmn:InputSet',
Expand All @@ -31,7 +19,7 @@ module.exports = function() {
}

function check(node, reporter) {
if (is(node, 'bpmn:Definitions') || isNonBpmnType(node) || isEventDefinition(node)) {
if (is(node, 'bpmn:Definitions') || isNonBpmnType(node) || isExemptFromId(node)) {
return;
}

Expand Down
20 changes: 19 additions & 1 deletion test-diagrams/event-definitions.valid.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_03dabax" targetNamespace="http://bpmn.io/schema/bpmn" exporter="ProcessMaker Modeler" exporterVersion="1.0">
<bpmn:process id="Process_1" isExecutable="true">
<bpmn:startEvent id="node_2" name="Signal Start Event">
<bpmn:signalEventDefinition />
Expand Down Expand Up @@ -28,6 +28,15 @@
<bpmn:timeDuration>PT1H</bpmn:timeDuration>
</bpmn:timerEventDefinition>
</bpmn:intermediateCatchEvent>
<bpmn:intermediateCatchEvent id="node_13" name="Intermediate Conditional Event">
<bpmn:conditionalEventDefinition>
<bpmn:condition xsi:type="bpmn:tFormalExpression">true</bpmn:condition>
</bpmn:conditionalEventDefinition>
</bpmn:intermediateCatchEvent>
<bpmn:boundaryEvent id="node_14" name="Boundary Compensate Event" attachedToRef="node_15">
<bpmn:compensateEventDefinition />
</bpmn:boundaryEvent>
<bpmn:task id="node_15" name="Task" />
</bpmn:process>
<bpmn:error id="node_9_error" name="node_9_error" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
Expand All @@ -53,6 +62,15 @@
<bpmndi:BPMNShape id="node_12_di" bpmnElement="node_12">
<dc:Bounds x="360" y="310" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="node_13_di" bpmnElement="node_13">
<dc:Bounds x="210" y="310" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="node_14_di" bpmnElement="node_14">
<dc:Bounds x="522" y="302" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="node_15_di" bpmnElement="node_15">
<dc:Bounds x="490" y="280" width="100" height="80" />
</bpmndi:BPMNShape>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>