bpmnlint 11.13.0 → 11.14.1

package/config/all.js

@@ -25,6 +25,7 @@ const allRules = [
   'start-event-required',
   'sub-process-blank-start-event',
   'superfluous-gateway',
+  'superfluous-label',
   'superfluous-termination'
 ];
 

package/config/recommended.js

@@ -24,6 +24,7 @@ module.exports = {
     'start-event-required': 'error',
     'sub-process-blank-start-event': 'error',
     'superfluous-gateway': 'warn',
+    'superfluous-label': 'warn',
     'superfluous-termination': 'warn'
   }
 };

package/package.json

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

package/rules/no-bpmndi.js

@@ -35,12 +35,12 @@ module.exports = function() {
     // (2) Filter BPMN elements without visual representation
     const visualBpmnElements = bpmnElements.filter(hasVisualRepresentation);
 
-    // (3) Construct array of BPMNDI references
-    const diBpmnReferences = getAllDiBpmnReferences(node);
+    // (3) Construct set of BPMNDI references
+    const referencedBpmnElementIds = getReferencedBpmnElementIds(node);
 
     // (4) Report elements without BPMNDI
     visualBpmnElements.forEach((element) => {
-      if (diBpmnReferences.indexOf(element.id) === -1) {
+      if (!referencedBpmnElementIds.has(element.id)) {
         reporter.report(element.id, 'Element is missing bpmndi');
       }
     });
@@ -105,16 +105,17 @@ function getAllBpmnElements(rootElements) {
 }
 
 /**
- * Get all BPMN elements within a bpmn:Definitions node
+ * Get the ids of all BPMN elements referenced by BPMNDI elements
+ * within a bpmn:Definitions node
  *
  * @param {ModdleElement} definitionsNode - A moddleElement representing the
  *   bpmn:Definitions element
  *
- * @return {string[]} ids of all BPMNDI element part of
- *   this bpmn:Definitions node
+ * @return {Set<string>} ids of all BPMN elements referenced by BPMNDI
+ *   elements part of this bpmn:Definitions node
  */
-function getAllDiBpmnReferences(definitionsNode) {
-  return flatten(
+function getReferencedBpmnElementIds(definitionsNode) {
+  return new Set(flatten(
     definitionsNode.get('diagrams').map((diagram) => {
 
       const diElements = diagram.plane.planeElement || [];
@@ -124,7 +125,7 @@ function getAllDiBpmnReferences(definitionsNode) {
         return element.bpmnElement?.id;
       });
     })
-  );
+  ));
 }
 
 /**

package/rules/superfluous-label.js

@@ -0,0 +1,74 @@
+const {
+  is
+} = require('bpmnlint-utils');
+
+const {
+  annotateRule
+} = require('./helper');
+
+
+/**
+ * A rule that checks that unconditional sequence flows do not
+ * have a label.
+ *
+ * Labels are only meaningful on sequence flows forking out of
+ * XOR/OR gateways, on conditional flows, and on default flows.
+ * Anywhere else they duplicate information already conveyed by
+ * the diagram.
+ *
+ * @type { import('../lib/types.js').RuleFactory }
+ */
+module.exports = function() {
+
+  function check(node, reporter) {
+
+    if (!is(node, 'bpmn:SequenceFlow')) {
+      return;
+    }
+
+    const name = (node.name || '').trim();
+
+    if (!name) {
+      return;
+    }
+
+    if (hasCondition(node) || isDefaultFlow(node) || isGatewayFork(node)) {
+      return;
+    }
+
+    reporter.report(node.id, 'Sequence flow has superfluous label', [ 'name' ]);
+  }
+
+  return annotateRule('superfluous-label', {
+    check
+  });
+
+};
+
+
+// helpers /////////////////////////////
+
+function hasCondition(flow) {
+  return !!flow.conditionExpression;
+}
+
+function isDefaultFlow(flow) {
+  const source = flow.sourceRef;
+
+  return source && source['default'] === flow;
+}
+
+function isGatewayFork(flow) {
+  const source = flow.sourceRef;
+
+  if (!source) {
+    return false;
+  }
+
+  const isDecisionGateway = (
+    is(source, 'bpmn:ExclusiveGateway') ||
+    is(source, 'bpmn:InclusiveGateway')
+  );
+
+  return isDecisionGateway && (source.outgoing || []).length > 1;
+}