bpmn-js 10.1.0 → 10.2.1

package/lib/features/modeling/behavior/EventBasedGatewayBehavior.js

@@ -9,62 +9,75 @@ export default function EventBasedGatewayBehavior(eventBus, modeling) {
   CommandInterceptor.call(this, eventBus);
 
   /**
-   * Remove existing sequence flows of event-based target before connecting
-   * from event-based gateway.
+   * Remove incoming sequence flows of event-based target when creating
+   * sequence flow.
+   *
+   * 1. If source is event-based gateway remove all incoming sequence flows
+   * 2. If source is not event-based gateway remove all incoming sequence flows
+   * whose source is event-based gateway
    */
   this.preExecuted('connection.create', function(event) {
-
     var context = event.context,
+        connection = context.connection,
         source = context.source,
         target = context.target,
-        existingIncomingConnections = target.incoming.slice();
+        hints = context.hints;
 
-    if (context.hints && context.hints.createElementsBehavior === false) {
+    if (hints && hints.createElementsBehavior === false) {
       return;
     }
 
-    if (
-      is(source, 'bpmn:EventBasedGateway') &&
-      target.incoming.length
-    ) {
+    if (!isSequenceFlow(connection)) {
+      return;
+    }
 
-      existingIncomingConnections.filter(isSequenceFlow)
-        .forEach(function(sequenceFlow) {
-          modeling.removeConnection(sequenceFlow);
-        });
+    var sequenceFlows = [];
+
+    if (is(source, 'bpmn:EventBasedGateway')) {
+      sequenceFlows = target.incoming.filter(isSequenceFlow);
+    } else {
+      sequenceFlows = target.incoming.filter(function(connection) {
+        return isSequenceFlow(connection)
+          && is(connection.source, 'bpmn:EventBasedGateway');
+      });
     }
+
+    sequenceFlows.forEach(function(sequenceFlow) {
+      modeling.removeConnection(sequenceFlow);
+    });
   });
 
   /**
-   *  After replacing shape with event-based gateway, remove incoming sequence
-   *  flows of event-based targets which do not belong to event-based gateway
-   *  source.
+   * Remove incoming sequence flows of event-based targets when replacing source
+   * with event-based gateway.
    */
   this.preExecuted('shape.replace', function(event) {
-
-    var newShape = event.context.newShape,
-        newShapeTargets,
-        newShapeTargetsIncomingSequenceFlows;
+    var context = event.context,
+        newShape = context.newShape;
 
     if (!is(newShape, 'bpmn:EventBasedGateway')) {
       return;
     }
 
-    newShapeTargets = newShape.outgoing.filter(isSequenceFlow)
-      .map(function(sequenceFlow) {
-        return sequenceFlow.target;
-      });
+    var targets = newShape.outgoing.filter(isSequenceFlow)
+      .reduce(function(targets, sequenceFlow) {
+        if (!targets.includes(sequenceFlow.target)) {
+          return targets.concat(sequenceFlow.target);
+        }
 
-    newShapeTargetsIncomingSequenceFlows = newShapeTargets.reduce(function(sequenceFlows, target) {
-      var incomingSequenceFlows = target.incoming.filter(isSequenceFlow);
+        return targets;
+      }, []);
 
-      return sequenceFlows.concat(incomingSequenceFlows);
-    }, []);
+    targets.forEach(function(target) {
+      target.incoming.filter(isSequenceFlow).forEach(function(sequenceFlow) {
+        const sequenceFlowsFromNewShape = target.incoming.filter(isSequenceFlow).filter(function(sequenceFlow) {
+          return sequenceFlow.source === newShape;
+        });
 
-    newShapeTargetsIncomingSequenceFlows.forEach(function(sequenceFlow) {
-      if (sequenceFlow.source !== newShape) {
-        modeling.removeConnection(sequenceFlow);
-      }
+        if (sequenceFlow.source !== newShape || sequenceFlowsFromNewShape.length > 1) {
+          modeling.removeConnection(sequenceFlow);
+        }
+      });
     });
   });
 }
@@ -76,10 +89,8 @@ EventBasedGatewayBehavior.$inject = [
 
 inherits(EventBasedGatewayBehavior, CommandInterceptor);
 
-
-
-// helpers //////////////////////
+// helpers //////////
 
 function isSequenceFlow(connection) {
   return is(connection, 'bpmn:SequenceFlow');
-}
+}

package/lib/features/rules/BpmnRules.js

@@ -855,16 +855,6 @@ function canConnectMessageFlow(source, target) {
 }
 
 function canConnectSequenceFlow(source, target) {
-
-  if (
-    isEventBasedTarget(target) &&
-    target.incoming.length > 0 &&
-    areOutgoingEventBasedGatewayConnections(target.incoming) &&
-    !is(source, 'bpmn:EventBasedGateway')
-  ) {
-    return false;
-  }
-
   return isSequenceFlowSource(source) &&
          isSequenceFlowTarget(target) &&
          isSameScope(source, target) &&
@@ -936,19 +926,6 @@ function canCopy(elements, element) {
   return true;
 }
 
-function isOutgoingEventBasedGatewayConnection(connection) {
-
-  if (connection && connection.source) {
-    return is(connection.source, 'bpmn:EventBasedGateway');
-  }
-}
-
-function areOutgoingEventBasedGatewayConnections(connections) {
-  connections = connections || [];
-
-  return connections.some(isOutgoingEventBasedGatewayConnection);
-}
-
 function getRootElement(element) {
   return getParent(element, 'bpmn:Process') || getParent(element, 'bpmn:Collaboration');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-js",
-  "version": "10.1.0",
+  "version": "10.2.1",
   "description": "A bpmn 2.0 toolkit and web modeler",
   "main": "index.js",
   "files": [
@@ -69,10 +69,10 @@
     "eslint-plugin-bpmn-io": "^0.16.0",
     "eslint-plugin-import": "^2.26.0",
     "execa": "^5.1.1",
-    "karma": "^6.4.0",
+    "karma": "^6.4.1",
     "karma-chrome-launcher": "^3.1.1",
     "karma-coverage": "^2.2.0",
-    "karma-debug-launcher": "0.0.4",
+    "karma-debug-launcher": "^0.0.5",
     "karma-env-preprocessor": "^0.1.1",
     "karma-firefox-launcher": "^2.1.2",
     "karma-mocha": "^2.0.1",
@@ -83,8 +83,7 @@
     "mocha": "^9.0.0",
     "mocha-test-container-support": "0.2.0",
     "npm-run-all": "^4.1.2",
-    "promise-polyfill": "^8.2.0",
-    "puppeteer": "^16.1.1",
+    "puppeteer": "^18.0.5",
     "rollup": "^2.78.0",
     "rollup-plugin-json": "^4.0.0",
     "rollup-plugin-license": "^2.8.1",
@@ -95,7 +94,7 @@
     "webpack": "^5.74.0"
   },
   "dependencies": {
-    "bpmn-moddle": "^7.1.3",
+    "bpmn-moddle": "^8.0.0",
     "css.escape": "^1.5.1",
     "diagram-js": "^9.1.0",
     "diagram-js-direct-editing": "^2.0.0",