bpmnlint 11.4.0 → 11.4.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bpmnlint",
   "description": "Validate your BPMN diagrams based on configurable lint rules",
-  "version": "11.4.0",
+  "version": "11.4.2",
   "main": "lib/index.js",
   "keywords": [
     "bpmnlint",

package/rules/end-event-required.js

@@ -28,7 +28,7 @@ module.exports = function() {
     if (!isAny(node, [
       'bpmn:Process',
       'bpmn:SubProcess'
-    ])) {
+    ]) || is(node, 'bpmn:AdHocSubProcess')) {
       return;
     }
 

package/rules/link-event.js

@@ -35,12 +35,12 @@ module.exports = function() {
     const links = (node.flowElements || []).filter(isLinkEvent);
 
     for (const link of links) {
-      if (!link.name) {
-        reporter.report(link.id, 'Link event is missing name');
+      if (!getLinkName(link)) {
+        reporter.report(link.id, 'Link event is missing link name');
       }
     }
 
-    const names = groupBy(links, (link) => link.name);
+    const names = groupBy(links, link => getLinkName(link));
 
     for (const [ name, events ] of Object.entries(names)) {
 
@@ -53,22 +53,20 @@ module.exports = function() {
       if (events.length === 1) {
         const event = events[0];
 
-        reporter.report(event.id, `Link ${isThrowEvent(event) ? 'catch' : 'throw' } event with name <${ name }> missing in scope`);
-      }
-
-      const throwEvents = events.filter(isThrowEvent);
-
-      if (throwEvents.length > 1) {
-        for (const event of throwEvents) {
-          reporter.report(event.id, `Duplicate link throw event with name <${name}> in scope`);
-        }
+        reporter.report(event.id, `Link ${isThrowEvent(event) ? 'catch' : 'throw' } event with link name <${ name }> missing in scope`);
+        continue;
       }
 
       const catchEvents = events.filter(isCatchEvent);
-
       if (catchEvents.length > 1) {
         for (const event of catchEvents) {
-          reporter.report(event.id, `Duplicate link catch event with name <${name}> in scope`);
+          reporter.report(event.id, `Duplicate link catch event with link name <${name}> in scope`);
+        }
+      } else if (catchEvents.length === 0) {
+
+        // all events in scope are throw events
+        for (const event of events) {
+          reporter.report(event.id, `Link catch event with link name <${ name }> missing in scope`);
         }
       }
     }
@@ -96,6 +94,10 @@ function isLinkEvent(node) {
   );
 }
 
+function getLinkName(linkEvent) {
+  return linkEvent.get('eventDefinitions').find(def => is(def, 'bpmn:LinkEventDefinition')).name;
+}
+
 function isThrowEvent(node) {
   return is(node, 'bpmn:ThrowEvent');
 }

package/rules/start-event-required.js

@@ -28,7 +28,7 @@ module.exports = function() {
     if (!isAny(node, [
       'bpmn:Process',
       'bpmn:SubProcess'
-    ])) {
+    ]) || is(node, 'bpmn:AdHocSubProcess')) {
       return;
     }