chore: review feedback

bpmn-io · Aug 29, 2024 · ecfaba1 · ecfaba1
1 parent 3982439
commit ecfaba1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 35 deletions.
diff --git a/lib/simulator/behaviors/ParallelGatewayBehavior.js b/lib/simulator/behaviors/ParallelGatewayBehavior.js
@@ -13,50 +13,39 @@ export default function ParallelGatewayBehavior(
   simulator.registerBehavior('bpmn:ParallelGateway', this);
 }
 
-var incomingToken = [];
-
 ParallelGatewayBehavior.prototype.enter = function(context) {
 
-  const incomingFlows = filterSequenceFlows(context.scope.element.incoming);
-
-  if (incomingFlows.length < 2) {
+  const {
+    scope,
+    element
+  } = context;
 
-    // fork-only gateways are activated immediately
-    this._simulator.exit(context);
-    return;
-  }
+  const sequenceFlows = filterSequenceFlows(element.incoming);
 
-  const arrivingToken = {
-    source: context.source,
-    scope: context.scope
-  };
-  incomingToken.push(arrivingToken);
+  const {
+    parent: parentScope
+  } = scope;
 
-  var consumableToken = [];
+  const elementScopes = this._simulator.findScopes({
+    parent: parentScope,
+    element: element
+  });
 
-  for (const flow of incomingFlows) {
-    const waitingToken = incomingToken.filter(t => {
-      return (
-        t.source === flow &&
-        t.scope.initiator === context.scope.initiator
-      );
-    });
+  const finishedScopes = sequenceFlows
+    .map(
+      flow => elementScopes
+        .find(scope => scope.initiator.element === flow)
+    )
+    .filter(scope => scope);
 
-    if (waitingToken.length !== 0) {
+  if (finishedScopes.length === sequenceFlows.length) {
 
-      // only one token per incoming flow is consumed on join
-      consumableToken.push(waitingToken[0]);
-    } else {
-      break;
-    }
-  }
+    for (const childScope of finishedScopes) {
 
-  if (consumableToken.length === incomingFlows.length) {
-    for (const consumedToken of consumableToken) {
-      incomingToken.splice(incomingToken.indexOf(consumedToken), 1);
+      if (childScope !== scope) {
 
-      if (consumedToken.scope !== context.scope) {
-        this._simulator.destroyScope(consumedToken.scope.complete(), context.scope);
+        // complete joining child scope
+        this._simulator.destroyScope(childScope.complete(), scope);
       }
     }
 

diff --git a/lib/simulator/behaviors/SequenceFlowBehavior.js b/lib/simulator/behaviors/SequenceFlowBehavior.js
@@ -19,7 +19,7 @@ SequenceFlowBehavior.prototype.exit = function(context) {
   } = context;
 
   this._simulator.enter({
-    source: element,
+    initiator: scope,
     element: element.target,
     scope: scope.parent
   });