bpmn-elements 14.1.0 → 15.0.1

package/README.md

@@ -76,7 +76,3 @@ The following elements are tested and supported.
 - Transaction
 
 All activities share the same [base](/docs/Activity.md) and and [api](/docs/SharedApi.md).
-
-# Acknowledgments
-
-ISO 8601 duration parser [iso8601-duration](https://www.npmjs.com/package/iso8601-duration) source is copied and extended with repeat pattern. License [MIT @ tolu](https://tolu.mit-license.org/)

package/dist/Context.js

@@ -7,7 +7,7 @@ exports.default = Context;
 var _BpmnIO = _interopRequireDefault(require("./io/BpmnIO.js"));
 var _Environment = _interopRequireDefault(require("./Environment.js"));
 var _shared = require("./shared.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const kOwner = Symbol.for('owner');
 const kActivated = Symbol.for('activated');
 function Context(definitionContext, environment) {
@@ -28,17 +28,7 @@ function ContextInstance(definitionContext, environment, owner) {
   this.definitionContext = definitionContext;
   this.environment = environment;
   this.extensionsMapper = new ExtensionsMapper(this);
-  this.refs = {
-    activityRefs: {},
-    associationRefs: [],
-    dataObjectRefs: {},
-    dataStoreRefs: {},
-    messageFlows: [],
-    processes: [],
-    processRefs: {},
-    sequenceFlowRefs: {},
-    sequenceFlows: []
-  };
+  this.refs = new Map([['activityRefs', new Map()], ['sequenceFlowRefs', new Map()], ['processRefs', new Map()], ['messageFlows', new Set()], ['associationRefs', new Map()], ['dataObjectRefs', new Map()], ['dataStoreRefs', new Map()]]);
   this[kOwner] = owner;
 }
 Object.defineProperty(ContextInstance.prototype, 'owner', {
@@ -47,20 +37,21 @@ Object.defineProperty(ContextInstance.prototype, 'owner', {
   }
 });
 ContextInstance.prototype.getActivityById = function getActivityById(activityId) {
-  const activityInstance = this.refs.activityRefs[activityId];
+  const activityInstance = this.refs.get('activityRefs').get(activityId);
   if (activityInstance) return activityInstance;
   const activity = this.definitionContext.getActivityById(activityId);
   if (!activity) return null;
   return this.upsertActivity(activity);
 };
 ContextInstance.prototype.upsertActivity = function upsertActivity(activityDef) {
-  let activityInstance = this.refs.activityRefs[activityDef.id];
+  let activityInstance = this.refs.get('activityRefs').get(activityDef.id);
   if (activityInstance) return activityInstance;
-  activityInstance = this.refs.activityRefs[activityDef.id] = new activityDef.Behaviour(activityDef, this);
+  activityInstance = new activityDef.Behaviour(activityDef, this);
+  this.refs.get('activityRefs').set(activityDef.id, activityInstance);
   return activityInstance;
 };
 ContextInstance.prototype.getSequenceFlowById = function getSequenceFlowById(sequenceFlowId) {
-  const flowInstance = this.refs.sequenceFlowRefs[sequenceFlowId];
+  const flowInstance = this.refs.get('sequenceFlowRefs').get(sequenceFlowId);
   if (flowInstance) return flowInstance;
   const flowDef = this.definitionContext.getSequenceFlowById(sequenceFlowId);
   if (!flowDef) return null;
@@ -85,36 +76,37 @@ ContextInstance.prototype.getSequenceFlows = function getSequenceFlows(scopeId)
   return (this.definitionContext.getSequenceFlows(scopeId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
 ContextInstance.prototype.upsertSequenceFlow = function upsertSequenceFlow(flowDefinition) {
-  const refs = this.refs.sequenceFlowRefs;
-  let flowInstance = refs[flowDefinition.id];
+  const sequenceFlowRefs = this.refs.get('sequenceFlowRefs');
+  let flowInstance = sequenceFlowRefs.get(flowDefinition.id);
   if (flowInstance) return flowInstance;
-  flowInstance = refs[flowDefinition.id] = new flowDefinition.Behaviour(flowDefinition, this);
-  this.refs.sequenceFlows.push(flowInstance);
+  flowInstance = new flowDefinition.Behaviour(flowDefinition, this);
+  sequenceFlowRefs.set(flowDefinition.id, flowInstance);
   return flowInstance;
 };
 ContextInstance.prototype.getAssociations = function getAssociations(scopeId) {
   return (this.definitionContext.getAssociations(scopeId) || []).map(association => this.upsertAssociation(association));
 };
 ContextInstance.prototype.upsertAssociation = function upsertAssociation(associationDefinition) {
-  const refs = this.refs.associationRefs;
-  let instance = refs[associationDefinition.id];
+  const associationRefs = this.refs.get('associationRefs');
+  let instance = associationRefs.get(associationDefinition.id);
   if (instance) return instance;
-  instance = refs[associationDefinition.id] = new associationDefinition.Behaviour(associationDefinition, this);
+  instance = new associationDefinition.Behaviour(associationDefinition, this);
+  associationRefs.set(associationDefinition.id, instance);
   return instance;
 };
 ContextInstance.prototype.clone = function clone(newEnvironment, newOwner) {
   return new ContextInstance(this.definitionContext, newEnvironment || this.environment, newOwner);
 };
 ContextInstance.prototype.getProcessById = function getProcessById(processId) {
-  const refs = this.refs.processRefs;
-  let bp = this.refs.processRefs[processId];
+  const processRefs = this.refs.get('processRefs');
+  let bp = processRefs.get(processId);
   if (bp) return bp;
   const processDefinition = this.definitionContext.getProcessById(processId);
   if (!processDefinition) return null;
   const bpContext = this.clone(this.environment.clone());
-  bp = refs[processId] = new processDefinition.Behaviour(processDefinition, bpContext);
+  bp = new processDefinition.Behaviour(processDefinition, bpContext);
+  processRefs.set(processId, bp);
   bpContext[kOwner] = bp;
-  this.refs.processes.push(bp);
   return bp;
 };
 ContextInstance.prototype.getNewProcessById = function getNewProcessById(processId) {
@@ -136,26 +128,40 @@ ContextInstance.prototype.getExecutableProcesses = function getExecutableProcess
   }) => this.getProcessById(processId));
 };
 ContextInstance.prototype.getMessageFlows = function getMessageFlows(sourceId) {
-  if (!this.refs.messageFlows.length) {
-    const flows = this.definitionContext.getMessageFlows() || [];
-    this.refs.messageFlows.push(...flows.map(flow => new flow.Behaviour(flow, this)));
+  const messageFlowRefs = this.refs.get('messageFlows');
+  const result = [];
+  if (!messageFlowRefs.size) {
+    const msgFlows = this.definitionContext.getMessageFlows() || [];
+    for (const msgFlow of msgFlows) {
+      const flow = new msgFlow.Behaviour(msgFlow, this);
+      messageFlowRefs.add(flow);
+      if (flow.source.processId === sourceId) result.push(flow);
+    }
+  } else {
+    for (const flow of messageFlowRefs) {
+      if (flow.source.processId === sourceId) result.push(flow);
+    }
   }
-  return this.refs.messageFlows.filter(flow => flow.source.processId === sourceId);
+  return result;
 };
 ContextInstance.prototype.getDataObjectById = function getDataObjectById(referenceId) {
+  const dataObjectRefs = this.refs.get('dataObjectRefs');
   let dataObject;
-  if (dataObject = this.refs.dataObjectRefs[referenceId]) return dataObject;
+  if (dataObject = dataObjectRefs.get(referenceId)) return dataObject;
   const dataObjectDef = this.definitionContext.getDataObjectById(referenceId);
   if (!dataObjectDef) return;
-  dataObject = this.refs.dataObjectRefs[dataObjectDef.id] = new dataObjectDef.Behaviour(dataObjectDef, this);
+  dataObject = new dataObjectDef.Behaviour(dataObjectDef, this);
+  dataObjectRefs.set(dataObjectDef.id, dataObject);
   return dataObject;
 };
 ContextInstance.prototype.getDataStoreById = function getDataStoreById(referenceId) {
+  const dataStoreRefs = this.refs.get('dataStoreRefs');
   let dataStore;
-  if (dataStore = this.refs.dataStoreRefs[referenceId]) return dataStore;
+  if (dataStore = dataStoreRefs.get(referenceId)) return dataStore;
   const dataStoreDef = this.definitionContext.getDataStoreById(referenceId) || this.definitionContext.getDataStoreReferenceById(referenceId);
   if (!dataStoreDef) return;
-  dataStore = this.refs.dataStoreRefs[dataStoreDef.id] = new dataStoreDef.Behaviour(dataStoreDef, this);
+  dataStore = new dataStoreDef.Behaviour(dataStoreDef, this);
+  dataStoreRefs.set(dataStoreDef.id, dataStore);
   return dataStore;
 };
 ContextInstance.prototype.getStartActivities = function getStartActivities(filterOptions, scopeId) {

package/dist/Environment.js

@@ -7,16 +7,16 @@ exports.default = Environment;
 var _Expressions = _interopRequireDefault(require("./Expressions.js"));
 var _Scripts = require("./Scripts.js");
 var _Timers = require("./Timers.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const kServices = Symbol.for('services');
 const kVariables = Symbol.for('variables');
-const defaultOptions = ['expressions', 'extensions', 'Logger', 'output', 'scripts', 'services', 'settings', 'timers', 'variables'];
+const defaultOptions = new Set(['expressions', 'extensions', 'Logger', 'output', 'scripts', 'services', 'settings', 'timers', 'variables']);
 function Environment(options = {}) {
   this.options = validateOptions(options);
   this.expressions = options.expressions || (0, _Expressions.default)();
   this.extensions = options.extensions;
   this.output = options.output || {};
-  this.scripts = options.scripts || (0, _Scripts.Scripts)();
+  this.scripts = options.scripts || new _Scripts.Scripts();
   this.timers = options.timers || new _Timers.Timers();
   this.settings = {
     ...options.settings
@@ -124,7 +124,7 @@ Environment.prototype.addService = function addService(name, fn) {
 function validateOptions(input) {
   const options = {};
   for (const key in input) {
-    if (defaultOptions.indexOf(key) === -1) {
+    if (!defaultOptions.has(key)) {
       options[key] = input[key];
     }
   }

package/dist/Expressions.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Expressions;
 var _getPropertyValue = _interopRequireDefault(require("./getPropertyValue.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const isExpressionPattern = /^\${(.+?)}$/;
 const expressionPattern = /\${(.+?)}/;
 function Expressions() {

package/dist/MessageFormatter.js

@@ -20,7 +20,6 @@ function Formatter(element, formatQ) {
   this.broker = broker;
   this.logger = logger;
   this.formatQ = formatQ;
-  this.pendingFormats = [];
   this[kOnMessage] = this._onMessage.bind(this);
 }
 Formatter.prototype.format = function format(message, callback) {

package/dist/Scripts.js

@@ -4,11 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Scripts = Scripts;
-function Scripts() {
-  return {
-    getScript,
-    register
-  };
-  function getScript( /*scriptType, activity*/) {}
-  function register( /*activity*/) {}
-}
+function Scripts() {}
+Scripts.prototype.getScript = function getScript( /*scriptType, activity*/) {};
+Scripts.prototype.register = function register( /*activity*/) {};

package/dist/Timers.js

@@ -14,13 +14,13 @@ function Timers(options) {
     clearTimeout,
     ...options
   };
-  this[kExecuting] = [];
+  this[kExecuting] = new Set();
   this.setTimeout = this.setTimeout.bind(this);
   this.clearTimeout = this.clearTimeout.bind(this);
 }
 Object.defineProperty(Timers.prototype, 'executing', {
   get() {
-    return this[kExecuting].slice();
+    return [...this[kExecuting]];
   }
 });
 Timers.prototype.register = function register(owner) {
@@ -30,10 +30,7 @@ Timers.prototype.setTimeout = function wrappedSetTimeout(callback, delay, ...arg
   return this._setTimeout(null, callback, delay, ...args);
 };
 Timers.prototype.clearTimeout = function wrappedClearTimeout(ref) {
-  const executing = this[kExecuting];
-  const idx = executing.indexOf(ref);
-  if (idx > -1) {
-    executing.splice(idx, 1);
+  if (this[kExecuting].delete(ref)) {
     ref.timerRef = this.options.clearTimeout(ref.timerRef);
     return;
   }
@@ -42,14 +39,13 @@ Timers.prototype.clearTimeout = function wrappedClearTimeout(ref) {
 Timers.prototype._setTimeout = function setTimeout(owner, callback, delay, ...args) {
   const executing = this[kExecuting];
   const ref = this._getReference(owner, callback, delay, args);
-  executing.push(ref);
+  executing.add(ref);
   if (delay < MAX_DELAY) {
     ref.timerRef = this.options.setTimeout(onTimeout, ref.delay, ...ref.args);
   }
   return ref;
   function onTimeout(...rargs) {
-    const idx = executing.indexOf(ref);
-    if (idx > -1) executing.splice(idx, 1);
+    executing.delete(ref);
     return callback(...rargs);
   }
 };

package/dist/Tracker.js

@@ -7,17 +7,17 @@ exports.ActivityTracker = ActivityTracker;
 function ActivityTracker(parentId) {
   this.id = parentId;
   this.status = {
-    wait: [],
-    execute: [],
-    timer: []
+    wait: new Set(),
+    execute: new Set(),
+    timer: new Set()
   };
 }
 Object.defineProperty(ActivityTracker.prototype, 'activityStatus', {
   get() {
     const status = this.status;
-    if (status.execute.length) return 'executing';
-    if (status.timer.length) return 'timer';
-    return status.wait.length ? 'wait' : 'idle';
+    if (status.execute.size) return 'executing';
+    if (status.timer.size) return 'timer';
+    return status.wait.size ? 'wait' : 'idle';
   }
 });
 ActivityTracker.prototype.track = function track(routingKey, message) {
@@ -55,27 +55,24 @@ ActivityTracker.prototype._executing = function executing(id) {
     wait,
     execute
   } = this.status;
-  if (execute.indexOf(id) === -1) execute.push(id);
-  let idx;
-  if ((idx = wait.indexOf(id)) !== -1) wait.splice(idx, 1);
+  wait.delete(id);
+  execute.add(id);
 };
 ActivityTracker.prototype._waiting = function waiting(id) {
   const {
     wait,
     execute
   } = this.status;
-  if (wait.indexOf(id) === -1) wait.push(id);
-  let idx;
-  if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
+  execute.delete(id);
+  wait.add(id);
 };
 ActivityTracker.prototype._timer = function timerFn(id) {
   const {
     timer,
     execute
   } = this.status;
-  if (timer.indexOf(id) === -1) timer.push(id);
-  let idx;
-  if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
+  execute.delete(id);
+  timer.add(id);
 };
 ActivityTracker.prototype._leave = function leave(id) {
   const {
@@ -83,8 +80,7 @@ ActivityTracker.prototype._leave = function leave(id) {
     execute,
     timer
   } = this.status;
-  let idx;
-  if ((idx = wait.indexOf(id)) !== -1) wait.splice(idx, 1);
-  if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
-  if ((idx = timer.indexOf(id)) !== -1) timer.splice(idx, 1);
+  execute.delete(id);
+  timer.delete(id);
+  wait.delete(id);
 };

package/dist/activity/Activity.js

@@ -11,7 +11,7 @@ var _EventBroker = require("../EventBroker.js");
 var _MessageFormatter = require("../MessageFormatter.js");
 var _messageHelper = require("../messageHelper.js");
 var _Errors = require("../error/Errors.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const kActivityDef = Symbol.for('activityDefinition');
 const kConsuming = Symbol.for('consuming');
 const kConsumingRunQ = Symbol.for('run queue consumer');
@@ -87,7 +87,7 @@ function Activity(Behaviour, activityDef, context) {
   const flows = this[kFlows] = {
     inboundSequenceFlows,
     inboundAssociations,
-    inboundJoinFlows: [],
+    inboundJoinFlows: new Set(),
     inboundTriggers,
     outboundSequenceFlows,
     outboundEvaluator: new OutboundEvaluator(this, outboundSequenceFlows)
@@ -105,7 +105,7 @@ function Activity(Behaviour, activityDef, context) {
     isThrowing: activityDef.isThrowing,
     lane: activityDef.lane && activityDef.lane.id
   };
-  this[kExec] = {};
+  this[kExec] = new Map();
   this[kMessageHandlers] = {
     onInbound: isParallelJoin ? this._onJoinInbound.bind(this) : this._onInbound.bind(this),
     onRunMessage: this._onRunMessage.bind(this),
@@ -127,12 +127,12 @@ Object.defineProperties(Activity.prototype, {
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     }
   },
   executionId: {
     get() {
-      return this[kExec].executionId;
+      return this[kExec].get('executionId');
     }
   },
   extensions: {
@@ -257,7 +257,8 @@ Activity.prototype.deactivate = function deactivate() {
 Activity.prototype.init = function init(initContent) {
   const id = this.id;
   const exec = this[kExec];
-  const executionId = exec.initExecutionId = exec.initExecutionId || (0, _shared.getUniqueId)(id);
+  const executionId = exec.has('initExecutionId') ? exec.get('initExecutionId') : (0, _shared.getUniqueId)(id);
+  exec.set('initExecutionId', executionId);
   this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
   this._publishEvent('init', this._createMessage({
     ...initContent,
@@ -268,8 +269,9 @@ Activity.prototype.run = function run(runContent) {
   const id = this.id;
   if (this.isRunning) throw new Error(`activity <${id}> is already running`);
   const exec = this[kExec];
-  const executionId = exec.executionId = exec.initExecutionId || (0, _shared.getUniqueId)(id);
-  exec.initExecutionId = null;
+  const executionId = exec.get('initExecutionId') || (0, _shared.getUniqueId)(id);
+  exec.set('executionId', executionId);
+  exec.delete('initExecutionId');
   this._consumeApi();
   const content = this._createMessage({
     ...runContent,
@@ -284,6 +286,8 @@ Activity.prototype.run = function run(runContent) {
 Activity.prototype.getState = function getState() {
   const status = this.status;
   const exec = this[kExec];
+  const execution = exec.get('execution');
+  const executionId = exec.get('executionId');
   const brokerState = this.broker.getState(true);
   if (!brokerState && this.environment.settings.disableTrackState) return;
   return {
@@ -292,11 +296,13 @@ Activity.prototype.getState = function getState() {
     ...(status && {
       status
     }),
-    executionId: exec.executionId,
+    executionId,
     stopped: this.stopped,
     counters: this.counters,
     broker: brokerState,
-    execution: exec.execution && exec.execution.getState()
+    ...(execution && {
+      execution: execution.getState()
+    })
   };
 };
 Activity.prototype.recover = function recover(state) {
@@ -305,13 +311,13 @@ Activity.prototype.recover = function recover(state) {
   this.stopped = state.stopped;
   this.status = state.status;
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
   this[kCounters] = {
     ...this[kCounters],
     ...state.counters
   };
   if (state.execution) {
-    exec.execution = new _ActivityExecution.default(this, this.context).recover(state.execution);
+    exec.set('execution', new _ActivityExecution.default(this, this.context).recover(state.execution));
   }
   this.broker.recover(state.broker);
   return this;
@@ -332,7 +338,7 @@ Activity.prototype.resume = function resume() {
 };
 Activity.prototype.discard = function discard(discardContent) {
   if (!this.status) return this._runDiscard(discardContent);
-  const execution = this[kExec].execution;
+  const execution = this[kExec].get('execution');
   if (execution && !execution.completed) return execution.discard();
   this._deactivateRunConsumers();
   const broker = this.broker;
@@ -345,16 +351,22 @@ Activity.prototype.addInboundListeners = function addInboundListeners() {
   const onInboundEvent = this._onInboundEvent.bind(this);
   const triggerConsumerTag = `_inbound-${this.id}`;
   for (const trigger of this[kFlows].inboundTriggers) {
-    if (trigger.isSequenceFlow) trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, {
-      noAck: true,
-      consumerTag: triggerConsumerTag
-    });else if (this.isForCompensation) trigger.broker.subscribeTmp('event', 'association.#', onInboundEvent, {
-      noAck: true,
-      consumerTag: triggerConsumerTag
-    });else trigger.broker.subscribeTmp('event', 'activity.#', onInboundEvent, {
-      noAck: true,
-      consumerTag: triggerConsumerTag
-    });
+    if (trigger.isSequenceFlow) {
+      trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, {
+        noAck: true,
+        consumerTag: triggerConsumerTag
+      });
+    } else if (this.isForCompensation) {
+      trigger.broker.subscribeTmp('event', 'association.#', onInboundEvent, {
+        noAck: true,
+        consumerTag: triggerConsumerTag
+      });
+    } else {
+      trigger.broker.subscribeTmp('event', 'activity.#', onInboundEvent, {
+        noAck: true,
+        consumerTag: triggerConsumerTag
+      });
+    }
   }
 };
 Activity.prototype.removeInboundListeners = function removeInboundListeners() {
@@ -386,7 +398,7 @@ Activity.prototype.evaluateOutbound = function evaluateOutbound(fromMessage, dis
   return this[kFlows].outboundEvaluator.evaluate(fromMessage, discardRestAtTake, callback);
 };
 Activity.prototype.getApi = function getApi(message) {
-  const execution = this[kExec].execution;
+  const execution = this[kExec].get('execution');
   if (execution && !execution.completed) return execution.getApi(message);
   return (0, _Api.ActivityApi)(this.broker, message || this[kStateMessage]);
 };
@@ -395,8 +407,9 @@ Activity.prototype.getActivityById = function getActivityById(elementId) {
 };
 Activity.prototype._runDiscard = function runDiscard(discardContent) {
   const exec = this[kExec];
-  const executionId = exec.executionId = exec.initExecutionId || (0, _shared.getUniqueId)(this.id);
-  exec.initExecutionId = null;
+  const executionId = exec.get('initExecutionId') || (0, _shared.getUniqueId)(this.id);
+  exec.set('executionId', executionId);
+  exec.delete('initExecutionId');
   this._consumeApi();
   const content = this._createMessage({
     ...discardContent,
@@ -409,7 +422,7 @@ Activity.prototype._runDiscard = function runDiscard(discardContent) {
 Activity.prototype._discardRun = function discardRun() {
   const status = this.status;
   if (!status) return;
-  const execution = this[kExec].execution;
+  const execution = this[kExec].get('execution');
   if (execution && !execution.completed) return;
   switch (status) {
     case 'end':
@@ -494,39 +507,45 @@ Activity.prototype._onJoinInbound = function onJoinInbound(routingKey, message)
     content
   } = message;
   const {
-    inboundSequenceFlows,
     inboundJoinFlows,
     inboundTriggers
   } = this[kFlows];
-  const idx = inboundJoinFlows.findIndex(msg => msg.content.id === content.id);
-  inboundJoinFlows.push(message);
-  if (idx > -1) return;
-  const allTouched = inboundJoinFlows.length >= inboundTriggers.length;
-  if (!allTouched) {
-    const remaining = inboundSequenceFlows.filter((inb, i, list) => list.indexOf(inb) === i).length - inboundJoinFlows.length;
+  let alreadyTouched = false;
+  const touched = new Set();
+  let taken;
+  for (const msg of inboundJoinFlows) {
+    const flowId = msg.content.id;
+    touched.add(flowId);
+    if (flowId === content.id) {
+      alreadyTouched = true;
+    }
+  }
+  inboundJoinFlows.add(message);
+  if (alreadyTouched) return;
+  const remaining = inboundTriggers.length - touched.size - 1;
+  if (remaining) {
     return this.logger.debug(`<${this.id}> inbound ${message.content.action} from <${message.content.id}>, ${remaining} remaining`);
   }
-  const evaluatedInbound = inboundJoinFlows.splice(0);
-  let taken;
-  const inbound = evaluatedInbound.map(im => {
+  const inbound = [];
+  for (const im of inboundJoinFlows) {
     if (im.fields.routingKey === 'flow.take') taken = true;
     im.ack();
-    return (0, _messageHelper.cloneContent)(im.content);
-  });
-  let discardSequence;
+    inbound.push((0, _messageHelper.cloneContent)(im.content));
+  }
+  const discardSequence = new Set();
   if (!taken) {
-    discardSequence = [];
-    for (const im of evaluatedInbound) {
+    for (const im of inboundJoinFlows) {
       if (!im.content.discardSequence) continue;
       for (const sourceId of im.content.discardSequence) {
-        if (discardSequence.indexOf(sourceId) === -1) discardSequence.push(sourceId);
+        discardSequence.add(sourceId);
       }
     }
   }
+  inboundJoinFlows.clear();
   this.broker.cancel('_run-on-inbound');
   if (!taken) return this._runDiscard({
     inbound,
-    discardSequence
+    discardSequence: [...discardSequence]
   });
   return this.run({
     inbound
@@ -603,7 +622,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
         this.logger.debug(`<${id}> enter`, isRedelivered ? 'redelivered' : '');
         this.status = 'entered';
         if (!isRedelivered) {
-          this[kExec].execution = null;
+          this[kExec].delete('execution');
           if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
           this._publishEvent('enter', content, {
             correlationId
@@ -615,7 +634,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
       {
         this.logger.debug(`<${id}> discard`, isRedelivered ? 'redelivered' : '');
         this.status = 'discard';
-        this[kExec].execution = null;
+        this[kExec].delete('execution');
         if (this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
         if (!isRedelivered) {
           this.broker.publish('run', 'run.discarded', content, {
@@ -654,12 +673,12 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
         this[kExecuteMessage] = message;
         const exec = this[kExec];
         if (isRedelivered && this.extensions) this.extensions.activate((0, _messageHelper.cloneMessage)(message));
-        if (!exec.execution) exec.execution = new _ActivityExecution.default(this, this.context);
+        if (!exec.has('execution')) exec.set('execution', new _ActivityExecution.default(this, this.context));
         this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {
           exclusive: true,
           consumerTag: '_activity-execution'
         });
-        return exec.execution.execute(message);
+        return exec.get('execution').execute(message);
       }
     case 'run.end':
       {
@@ -914,7 +933,7 @@ Activity.prototype._onStop = function onStop(message) {
   }
 };
 Activity.prototype._consumeApi = function consumeApi() {
-  const executionId = this[kExec].executionId;
+  const executionId = this[kExec].get('executionId');
   if (!executionId) return;
   const broker = this.broker;
   broker.cancel('_activity-api');