bpmn-elements 15.0.0 → 15.0.1

package/dist/Environment.js

@@ -10,13 +10,13 @@ var _Timers = require("./Timers.js");
 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/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/activity/Activity.js

@@ -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;
@@ -392,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]);
 };
@@ -401,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,
@@ -415,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':
@@ -500,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
@@ -609,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
@@ -621,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, {
@@ -660,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':
       {
@@ -920,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');

package/dist/definition/Definition.js

@@ -45,7 +45,7 @@ function Definition(context, options) {
     discarded: 0
   };
   this[kStopped] = false;
-  this[kExec] = {};
+  this[kExec] = new Map();
   const onBrokerReturn = this._onBrokerReturnFn.bind(this);
   this[kMessageHandlers] = {
     onBrokerReturn,
@@ -79,12 +79,12 @@ Object.defineProperties(Definition.prototype, {
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     }
   },
   executionId: {
     get() {
-      return this[kExec].executionId;
+      return this[kExec].get('executionId');
     }
   },
   isRunning: {
@@ -105,7 +105,8 @@ Object.defineProperties(Definition.prototype, {
   },
   activityStatus: {
     get() {
-      return this[kExec].execution && this[kExec].execution.activityStatus || 'idle';
+      const execution = this[kExec].get('execution');
+      return execution && execution.activityStatus || 'idle';
     }
   }
 });
@@ -120,7 +121,8 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
     addConsumerCallbacks(this, callback);
   }
   const exec = this[kExec];
-  exec.executionId = (0, _shared.getUniqueId)(this.id);
+  const executionId = (0, _shared.getUniqueId)(this.id);
+  exec.set('executionId', executionId);
   const content = this._createMessage({
     ...runOptions
   });
@@ -128,7 +130,7 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
   broker.publish('run', 'run.enter', content);
   broker.publish('run', 'run.start', (0, _messageHelper.cloneContent)(content));
   broker.publish('run', 'run.execute', (0, _messageHelper.cloneContent)(content));
-  this.logger.debug(`<${this.executionId} (${this.id})> run`);
+  this.logger.debug(`<${executionId} (${this.id})> run`);
   this._activateRunConsumers();
   return this;
 };
@@ -167,7 +169,7 @@ Definition.prototype.recover = function recover(state) {
   this[kStopped] = !!state.stopped;
   this[kStatus] = state.status;
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
   if (state.counters) {
     this[kCounters] = {
       ...this[kCounters],
@@ -176,7 +178,7 @@ Definition.prototype.recover = function recover(state) {
   }
   this.environment.recover(state.environment);
   if (state.execution) {
-    exec.execution = new _DefinitionExecution.default(this, this.context).recover(state.execution);
+    exec.set('execution', new _DefinitionExecution.default(this, this.context).recover(state.execution));
   }
   this.broker.recover(state.broker);
   return this;
@@ -337,7 +339,7 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
         this.logger.debug(`<${this.executionId} (${this.id})> enter`);
         this[kStatus] = 'entered';
         if (fields.redelivered) break;
-        exec.execution = undefined;
+        exec.delete('execution');
         this._publishEvent('enter', content);
         break;
       }
@@ -352,7 +354,8 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
       {
         this[kStatus] = 'executing';
         const executeMessage = (0, _messageHelper.cloneMessage)(message);
-        if (fields.redelivered && !exec.execution) {
+        let execution = exec.get('execution');
+        if (fields.redelivered && !execution) {
           executeMessage.fields.redelivered = undefined;
         }
         this[kExecuteMessage] = message;
@@ -360,11 +363,14 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
           exclusive: true,
           consumerTag: '_definition-execution'
         });
-        exec.execution = exec.execution || new _DefinitionExecution.default(this, this.context);
+        if (!execution) {
+          execution = new _DefinitionExecution.default(this, this.context);
+          exec.set('execution', execution);
+        }
         if (executeMessage.fields.redelivered) {
           this._publishEvent('resume', content);
         }
-        return exec.execution.execute(executeMessage);
+        return execution.execute(executeMessage);
       }
     case 'run.end':
       {
@@ -475,7 +481,7 @@ Definition.prototype._onBrokerReturnFn = function onBrokerReturn(message) {
   }
 };
 Definition.prototype._reset = function reset() {
-  this[kExec].executionId = undefined;
+  this[kExec].delete('executionId');
   this._deactivateRunConsumers();
   this.broker.purgeQueue('run-q');
   this.broker.purgeQueue('execution-q');

package/dist/eventDefinitions/TimerEventDefinition.js

@@ -10,7 +10,7 @@ var _Errors = require("../error/Errors.js");
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
-const timerTypes = ['timeDuration', 'timeDate', 'timeCycle'];
+const timerTypes = new Set(['timeDuration', 'timeDate', 'timeCycle']);
 function TimerEventDefinition(activity, eventDefinition) {
   const type = this.type = eventDefinition.type || 'TimerEventDefinition';
   this.activity = activity;

package/dist/process/Process.js

@@ -47,7 +47,7 @@ function Process(processDef, context) {
     discarded: 0
   };
   this[kConsuming] = false;
-  this[kExec] = {};
+  this[kExec] = new Map();
   this[kStatus] = undefined;
   this[kStopped] = false;
   const {
@@ -103,16 +103,13 @@ Object.defineProperties(Process.prototype, {
   },
   executionId: {
     get() {
-      const {
-        executionId,
-        initExecutionId
-      } = this[kExec];
-      return executionId || initExecutionId;
+      const exec = this[kExec];
+      return exec.get('executionId') || exec.get('initExecutionId');
     }
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     }
   },
   status: {
@@ -122,13 +119,14 @@ Object.defineProperties(Process.prototype, {
   },
   activityStatus: {
     get() {
-      return this[kExec].execution && this[kExec].execution.activityStatus || 'idle';
+      const execution = this[kExec].get('execution');
+      return execution && execution.activityStatus || 'idle';
     }
   }
 });
 Process.prototype.init = function init(useAsExecutionId) {
-  const exec = this[kExec];
-  const initExecutionId = exec.initExecutionId = useAsExecutionId || (0, _shared.getUniqueId)(this.id);
+  const initExecutionId = useAsExecutionId || (0, _shared.getUniqueId)(this.id);
+  this[kExec].set('initExecutionId', initExecutionId);
   this._debug(`initialized with executionId <${initExecutionId}>`);
   this._publishEvent('init', this._createMessage({
     executionId: initExecutionId
@@ -137,8 +135,9 @@ Process.prototype.init = function init(useAsExecutionId) {
 Process.prototype.run = function run(runContent) {
   if (this.isRunning) throw new Error(`process <${this.id}> is already running`);
   const exec = this[kExec];
-  const executionId = exec.executionId = exec.initExecutionId || (0, _shared.getUniqueId)(this.id);
-  exec.initExecutionId = undefined;
+  const executionId = exec.get('initExecutionId') || (0, _shared.getUniqueId)(this.id);
+  exec.delete('initExecutionId');
+  exec.set('executionId', executionId);
   const content = this._createMessage({
     ...runContent,
     executionId
@@ -179,14 +178,14 @@ Process.prototype.recover = function recover(state) {
   this[kStopped] = !!state.stopped;
   this[kStatus] = state.status;
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
   this[kCounters] = {
     ...this[kCounters],
     ...state.counters
   };
   this.environment.recover(state.environment);
   if (state.execution) {
-    exec.execution = new _ProcessExecution.default(this, this.context).recover(state.execution);
+    exec.set('execution', new _ProcessExecution.default(this, this.context).recover(state.execution));
   }
   this.broker.recover(state.broker);
   return this;
@@ -246,7 +245,6 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
   if (routingKey === 'run.resume') {
     return this._onResumeMessage(message);
   }
-  const exec = this[kExec];
   this[kStateMessage] = message;
   switch (routingKey) {
     case 'run.enter':
@@ -254,7 +252,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
         this._debug('enter');
         this[kStatus] = 'entered';
         if (fields.redelivered) break;
-        exec.execution = undefined;
+        this[kExec].delete('execution');
         this._publishEvent('enter', content);
         break;
       }
@@ -267,9 +265,11 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
       }
     case 'run.execute':
       {
+        const exec = this[kExec];
         this[kStatus] = 'executing';
         const executeMessage = (0, _messageHelper.cloneMessage)(message);
-        if (fields.redelivered && !exec.execution) {
+        let execution = exec.get('execution');
+        if (fields.redelivered && !execution) {
           executeMessage.fields.redelivered = undefined;
         }
         this[kExecuteMessage] = message;
@@ -277,7 +277,8 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
           exclusive: true,
           consumerTag: '_process-execution'
         });
-        const execution = exec.execution = exec.execution || new _ProcessExecution.default(this, this.context);
+        execution = execution || new _ProcessExecution.default(this, this.context);
+        exec.set('execution', execution);
         return execution.execute(executeMessage);
       }
     case 'run.error':

package/dist/shared.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.brokerSafeId = brokerSafeId;
-exports.filterUndefined = filterUndefined;
 exports.generateId = generateId;
 exports.getOptionsAndCallback = getOptionsAndCallback;
 exports.getUniqueId = getUniqueId;
@@ -18,13 +17,6 @@ function brokerSafeId(id) {
 function getUniqueId(prefix) {
   return `${brokerSafeId(prefix)}_${generateId()}`;
 }
-function filterUndefined(obj) {
-  return Object.keys(obj).reduce((filtered, key) => {
-    const objValue = obj[key];
-    if (objValue !== undefined) filtered[key] = objValue;
-    return filtered;
-  }, {});
-}
 function getOptionsAndCallback(optionsOrCallback, callback) {
   let options;
   if (typeof optionsOrCallback === 'function') {

package/dist/tasks/ScriptTask.js

@@ -33,8 +33,8 @@ ScriptTaskBehaviour.prototype.execute = function execute(executeMessage) {
   if (loopCharacteristics && executeContent.isRootScope) {
     return loopCharacteristics.execute(executeMessage);
   }
-  const activity = this.activity,
-    scriptFormat = this.scriptFormat;
+  const activity = this.activity;
+  const scriptFormat = this.scriptFormat;
   const script = this.environment.getScript(scriptFormat, activity, (0, _messageHelper.cloneMessage)(executeMessage));
   if (!script) {
     return activity.emitFatal(new _Errors.ActivityError(`Script format ${scriptFormat} is unsupported or was not registered for <${activity.id}>`, executeMessage), executeContent);

package/dist/tasks/SubProcess.js

@@ -10,7 +10,7 @@ var _ProcessExecution = _interopRequireDefault(require("../process/ProcessExecut
 var _messageHelper = require("../messageHelper.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const kExecutions = Symbol.for('executions');
-const kMessageHandlers = Symbol.for('messageHandlers');
+const kOnExecutionCompleted = Symbol.for('execution completed handler');
 function SubProcess(activityDef, context) {
   const triggeredByEvent = activityDef.behaviour && activityDef.behaviour.triggeredByEvent;
   const subProcess = new _Activity.default(SubProcessBehaviour, {
@@ -55,9 +55,7 @@ function SubProcessBehaviour(activity, context) {
   this.broker = activity.broker;
   this.executionId = undefined;
   this[kExecutions] = new Set();
-  this[kMessageHandlers] = {
-    onExecutionCompleted: this._onExecutionCompleted.bind(this)
-  };
+  this[kOnExecutionCompleted] = this._onExecutionCompleted.bind(this);
 }
 Object.defineProperties(SubProcessBehaviour.prototype, {
   execution: {
@@ -143,7 +141,7 @@ SubProcessBehaviour.prototype._upsertExecution = function upsertExecution(execut
   return execution;
 };
 SubProcessBehaviour.prototype._addListeners = function addListeners(executionId) {
-  this.broker.subscribeTmp('subprocess-execution', `execution.#.${executionId}`, this[kMessageHandlers].onExecutionCompleted, {
+  this.broker.subscribeTmp('subprocess-execution', `execution.#.${executionId}`, this[kOnExecutionCompleted], {
     noAck: true,
     consumerTag: `_sub-process-execution-${executionId}`
   });
@@ -179,7 +177,6 @@ SubProcessBehaviour.prototype._onExecutionCompleted = function onExecutionComple
 SubProcessBehaviour.prototype._completeExecution = function completeExecution(completeRoutingKey, content) {
   if (this.loopCharacteristics) {
     const execution = this._getExecutionById(content.executionId);
-    if (!execution) return;
     this[kExecutions].delete(execution);
   }
   this.broker.publish('execution', completeRoutingKey, (0, _messageHelper.cloneContent)(content));
@@ -191,6 +188,7 @@ SubProcessBehaviour.prototype.getApi = function getApi(apiMessage) {
   if (execution = this._getExecutionById(content.parent.executionId)) {
     return execution.getApi(apiMessage);
   }
+  if (!content.parent.path) return;
   for (const pp of content.parent.path) {
     if (execution = this._getExecutionById(pp.executionId)) return execution.getApi(apiMessage);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "15.0.0",
+  "version": "15.0.1",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -72,7 +72,7 @@
     "@bonniernews/hot-bev": "^0.4.0",
     "@types/node": "^16.18.95",
     "bpmn-moddle": "^9.0.1",
-    "c8": "^9.1.0",
+    "c8": "^10.1.1",
     "camunda-bpmn-moddle": "^7.0.1",
     "chai": "^5.1.0",
     "chronokinesis": "^6.0.0",
@@ -89,6 +89,6 @@
   },
   "dependencies": {
     "@0dep/piso": "^0.1.3",
-    "smqp": "^9.0.1"
+    "smqp": "^9.0.2"
   }
 }

package/src/Environment.js

@@ -1,11 +1,11 @@
 import Expressions from './Expressions.js';
-import { Scripts as IScripts } from './Scripts.js';
+import { Scripts } from './Scripts.js';
 import { Timers } from './Timers.js';
 
 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']);
 
 export default function Environment(options = {}) {
   this.options = validateOptions(options);
@@ -13,7 +13,7 @@ export default function Environment(options = {}) {
   this.expressions = options.expressions || Expressions();
   this.extensions = options.extensions;
   this.output = options.output || {};
-  this.scripts = options.scripts || IScripts();
+  this.scripts = options.scripts || new Scripts();
   this.timers = options.timers || new Timers();
   this.settings = { ...options.settings };
   this.Logger = options.Logger || DummyLogger;
@@ -125,7 +125,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/src/Scripts.js

@@ -1,9 +1,4 @@
-export function Scripts() {
-  return {
-    getScript,
-    register,
-  };
+export function Scripts() {}
 
-  function getScript(/*scriptType, activity*/) {}
-  function register(/*activity*/) {}
-}
+Scripts.prototype.getScript = function getScript(/*scriptType, activity*/) {};
+Scripts.prototype.register = function register(/*activity*/) {};

package/src/activity/Activity.js

@@ -71,7 +71,7 @@ function Activity(Behaviour, activityDef, context) {
   const flows = (this[kFlows] = {
     inboundSequenceFlows,
     inboundAssociations,
-    inboundJoinFlows: [],
+    inboundJoinFlows: new Set(),
     inboundTriggers,
     outboundSequenceFlows,
     outboundEvaluator: new OutboundEvaluator(this, outboundSequenceFlows),
@@ -90,7 +90,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),
@@ -113,12 +113,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: {
@@ -250,7 +250,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 || getUniqueId(id));
+  const executionId = exec.has('initExecutionId') ? exec.get('initExecutionId') : getUniqueId(id);
+  exec.set('initExecutionId', executionId);
   this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
   this._publishEvent('init', this._createMessage({ ...initContent, executionId }));
 };
@@ -260,8 +261,9 @@ Activity.prototype.run = function run(runContent) {
   if (this.isRunning) throw new Error(`activity <${id}> is already running`);
 
   const exec = this[kExec];
-  const executionId = (exec.executionId = exec.initExecutionId || getUniqueId(id));
-  exec.initExecutionId = null;
+  const executionId = exec.get('initExecutionId') || getUniqueId(id);
+  exec.set('executionId', executionId);
+  exec.delete('initExecutionId');
 
   this._consumeApi();
 
@@ -278,6 +280,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;
 
@@ -285,11 +289,11 @@ Activity.prototype.getState = function getState() {
     id: this.id,
     type: this.type,
     ...(status && { status }),
-    executionId: exec.executionId,
+    executionId,
     stopped: this.stopped,
     counters: this.counters,
     broker: brokerState,
-    execution: exec.execution && exec.execution.getState(),
+    ...(execution && { execution: execution.getState() }),
   };
 };
 
@@ -300,12 +304,12 @@ 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(this, this.context).recover(state.execution);
+    exec.set('execution', new ActivityExecution(this, this.context).recover(state.execution));
   }
 
   this.broker.recover(state.broker);
@@ -332,7 +336,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();
@@ -389,7 +393,7 @@ Activity.prototype.evaluateOutbound = function evaluateOutbound(fromMessage, dis
 };
 
 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 ActivityApi(this.broker, message || this[kStateMessage]);
 };
@@ -400,8 +404,9 @@ Activity.prototype.getActivityById = function getActivityById(elementId) {
 
 Activity.prototype._runDiscard = function runDiscard(discardContent) {
   const exec = this[kExec];
-  const executionId = (exec.executionId = exec.initExecutionId || getUniqueId(this.id));
-  exec.initExecutionId = null;
+  const executionId = exec.get('initExecutionId') || getUniqueId(this.id);
+  exec.set('executionId', executionId);
+  exec.delete('initExecutionId');
 
   this._consumeApi();
 
@@ -416,7 +421,7 @@ 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) {
@@ -497,42 +502,50 @@ Activity.prototype._onInbound = function onInbound(routingKey, message) {
 
 Activity.prototype._onJoinInbound = function onJoinInbound(routingKey, message) {
   const { content } = message;
-  const { inboundSequenceFlows, inboundJoinFlows, inboundTriggers } = this[kFlows];
-  const idx = inboundJoinFlows.findIndex((msg) => msg.content.id === content.id);
+  const { inboundJoinFlows, inboundTriggers } = this[kFlows];
+  let alreadyTouched = false;
 
-  inboundJoinFlows.push(message);
+  const touched = new Set();
 
-  if (idx > -1) return;
+  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 allTouched = inboundJoinFlows.length >= inboundTriggers.length;
-  if (!allTouched) {
-    const remaining = inboundSequenceFlows.filter((inb, i, list) => list.indexOf(inb) === i).length - inboundJoinFlows.length;
+  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 cloneContent(im.content);
-  });
+    inbound.push(cloneContent(im.content));
+  }
 
-  let discardSequence;
+  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 });
+  if (!taken) return this._runDiscard({ inbound, discardSequence: [...discardSequence] });
   return this.run({ inbound });
 };
 
@@ -606,7 +619,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
 
       this.status = 'entered';
       if (!isRedelivered) {
-        this[kExec].execution = null;
+        this[kExec].delete('execution');
         if (this.extensions) this.extensions.activate(cloneMessage(message));
         this._publishEvent('enter', content, { correlationId });
       }
@@ -616,7 +629,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(cloneMessage(message));
 
@@ -649,11 +662,11 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
 
       const exec = this[kExec];
       if (isRedelivered && this.extensions) this.extensions.activate(cloneMessage(message));
-      if (!exec.execution) exec.execution = new ActivityExecution(this, this.context);
+      if (!exec.has('execution')) exec.set('execution', new ActivityExecution(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': {
       this.logger.debug(`<${id}> end`, isRedelivered ? 'redelivered' : '');
@@ -904,7 +917,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');

package/src/definition/Definition.js

@@ -41,7 +41,7 @@ export function Definition(context, options) {
   };
 
   this[kStopped] = false;
-  this[kExec] = {};
+  this[kExec] = new Map();
 
   const onBrokerReturn = this._onBrokerReturnFn.bind(this);
   this[kMessageHandlers] = {
@@ -71,12 +71,12 @@ Object.defineProperties(Definition.prototype, {
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     },
   },
   executionId: {
     get() {
-      return this[kExec].executionId;
+      return this[kExec].get('executionId');
     },
   },
   isRunning: {
@@ -97,7 +97,8 @@ Object.defineProperties(Definition.prototype, {
   },
   activityStatus: {
     get() {
-      return (this[kExec].execution && this[kExec].execution.activityStatus) || 'idle';
+      const execution = this[kExec].get('execution');
+      return (execution && execution.activityStatus) || 'idle';
     },
   },
 });
@@ -115,7 +116,8 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
   }
 
   const exec = this[kExec];
-  exec.executionId = getUniqueId(this.id);
+  const executionId = getUniqueId(this.id);
+  exec.set('executionId', executionId);
   const content = this._createMessage({ ...runOptions });
 
   const broker = this.broker;
@@ -123,7 +125,7 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
   broker.publish('run', 'run.start', cloneContent(content));
   broker.publish('run', 'run.execute', cloneContent(content));
 
-  this.logger.debug(`<${this.executionId} (${this.id})> run`);
+  this.logger.debug(`<${executionId} (${this.id})> run`);
 
   this._activateRunConsumers();
 
@@ -171,7 +173,7 @@ Definition.prototype.recover = function recover(state) {
   this[kStatus] = state.status;
 
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
   if (state.counters) {
     this[kCounters] = { ...this[kCounters], ...state.counters };
   }
@@ -179,7 +181,7 @@ Definition.prototype.recover = function recover(state) {
   this.environment.recover(state.environment);
 
   if (state.execution) {
-    exec.execution = new DefinitionExecution(this, this.context).recover(state.execution);
+    exec.set('execution', new DefinitionExecution(this, this.context).recover(state.execution));
   }
 
   this.broker.recover(state.broker);
@@ -350,7 +352,7 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
       this[kStatus] = 'entered';
       if (fields.redelivered) break;
 
-      exec.execution = undefined;
+      exec.delete('execution');
       this._publishEvent('enter', content);
       break;
     }
@@ -363,7 +365,8 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
     case 'run.execute': {
       this[kStatus] = 'executing';
       const executeMessage = cloneMessage(message);
-      if (fields.redelivered && !exec.execution) {
+      let execution = exec.get('execution');
+      if (fields.redelivered && !execution) {
         executeMessage.fields.redelivered = undefined;
       }
       this[kExecuteMessage] = message;
@@ -372,13 +375,16 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
         consumerTag: '_definition-execution',
       });
 
-      exec.execution = exec.execution || new DefinitionExecution(this, this.context);
+      if (!execution) {
+        execution = new DefinitionExecution(this, this.context);
+        exec.set('execution', execution);
+      }
 
       if (executeMessage.fields.redelivered) {
         this._publishEvent('resume', content);
       }
 
-      return exec.execution.execute(executeMessage);
+      return execution.execute(executeMessage);
     }
     case 'run.end': {
       if (this[kStatus] === 'end') break;
@@ -502,7 +508,7 @@ Definition.prototype._onBrokerReturnFn = function onBrokerReturn(message) {
 };
 
 Definition.prototype._reset = function reset() {
-  this[kExec].executionId = undefined;
+  this[kExec].delete('executionId');
   this._deactivateRunConsumers();
   this.broker.purgeQueue('run-q');
   this.broker.purgeQueue('execution-q');

package/src/eventDefinitions/TimerEventDefinition.js

@@ -6,7 +6,7 @@ const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
 
-const timerTypes = ['timeDuration', 'timeDate', 'timeCycle'];
+const timerTypes = new Set(['timeDuration', 'timeDate', 'timeCycle']);
 
 export default function TimerEventDefinition(activity, eventDefinition) {
   const type = (this.type = eventDefinition.type || 'TimerEventDefinition');

package/src/process/Process.js

@@ -36,7 +36,7 @@ export function Process(processDef, context) {
     discarded: 0,
   };
   this[kConsuming] = false;
-  this[kExec] = {};
+  this[kExec] = new Map();
   this[kStatus] = undefined;
   this[kStopped] = false;
 
@@ -90,13 +90,13 @@ Object.defineProperties(Process.prototype, {
   },
   executionId: {
     get() {
-      const { executionId, initExecutionId } = this[kExec];
-      return executionId || initExecutionId;
+      const exec = this[kExec];
+      return exec.get('executionId') || exec.get('initExecutionId');
     },
   },
   execution: {
     get() {
-      return this[kExec].execution;
+      return this[kExec].get('execution');
     },
   },
   status: {
@@ -106,14 +106,16 @@ Object.defineProperties(Process.prototype, {
   },
   activityStatus: {
     get() {
-      return (this[kExec].execution && this[kExec].execution.activityStatus) || 'idle';
+      const execution = this[kExec].get('execution');
+      return (execution && execution.activityStatus) || 'idle';
     },
   },
 });
 
 Process.prototype.init = function init(useAsExecutionId) {
-  const exec = this[kExec];
-  const initExecutionId = (exec.initExecutionId = useAsExecutionId || getUniqueId(this.id));
+  const initExecutionId = useAsExecutionId || getUniqueId(this.id);
+  this[kExec].set('initExecutionId', initExecutionId);
+
   this._debug(`initialized with executionId <${initExecutionId}>`);
   this._publishEvent('init', this._createMessage({ executionId: initExecutionId }));
 };
@@ -122,8 +124,9 @@ Process.prototype.run = function run(runContent) {
   if (this.isRunning) throw new Error(`process <${this.id}> is already running`);
 
   const exec = this[kExec];
-  const executionId = (exec.executionId = exec.initExecutionId || getUniqueId(this.id));
-  exec.initExecutionId = undefined;
+  const executionId = exec.get('initExecutionId') || getUniqueId(this.id);
+  exec.delete('initExecutionId');
+  exec.set('executionId', executionId);
 
   const content = this._createMessage({ ...runContent, executionId });
 
@@ -168,12 +171,12 @@ Process.prototype.recover = function recover(state) {
   this[kStopped] = !!state.stopped;
   this[kStatus] = state.status;
   const exec = this[kExec];
-  exec.executionId = state.executionId;
+  exec.set('executionId', state.executionId);
   this[kCounters] = { ...this[kCounters], ...state.counters };
   this.environment.recover(state.environment);
 
   if (state.execution) {
-    exec.execution = new ProcessExecution(this, this.context).recover(state.execution);
+    exec.set('execution', new ProcessExecution(this, this.context).recover(state.execution));
   }
 
   this.broker.recover(state.broker);
@@ -228,7 +231,6 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
     return this._onResumeMessage(message);
   }
 
-  const exec = this[kExec];
   this[kStateMessage] = message;
 
   switch (routingKey) {
@@ -238,7 +240,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
       this[kStatus] = 'entered';
       if (fields.redelivered) break;
 
-      exec.execution = undefined;
+      this[kExec].delete('execution');
       this._publishEvent('enter', content);
 
       break;
@@ -250,9 +252,11 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
       break;
     }
     case 'run.execute': {
+      const exec = this[kExec];
       this[kStatus] = 'executing';
       const executeMessage = cloneMessage(message);
-      if (fields.redelivered && !exec.execution) {
+      let execution = exec.get('execution');
+      if (fields.redelivered && !execution) {
         executeMessage.fields.redelivered = undefined;
       }
       this[kExecuteMessage] = message;
@@ -262,7 +266,8 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
         consumerTag: '_process-execution',
       });
 
-      const execution = (exec.execution = exec.execution || new ProcessExecution(this, this.context));
+      execution = execution || new ProcessExecution(this, this.context);
+      exec.set('execution', execution);
       return execution.execute(executeMessage);
     }
     case 'run.error': {

package/src/shared.js

@@ -12,14 +12,6 @@ export function getUniqueId(prefix) {
   return `${brokerSafeId(prefix)}_${generateId()}`;
 }
 
-export function filterUndefined(obj) {
-  return Object.keys(obj).reduce((filtered, key) => {
-    const objValue = obj[key];
-    if (objValue !== undefined) filtered[key] = objValue;
-    return filtered;
-  }, {});
-}
-
 export function getOptionsAndCallback(optionsOrCallback, callback) {
   let options;
   if (typeof optionsOrCallback === 'function') {

package/src/tasks/ScriptTask.js

@@ -29,8 +29,8 @@ ScriptTaskBehaviour.prototype.execute = function execute(executeMessage) {
     return loopCharacteristics.execute(executeMessage);
   }
 
-  const activity = this.activity,
-    scriptFormat = this.scriptFormat;
+  const activity = this.activity;
+  const scriptFormat = this.scriptFormat;
   const script = this.environment.getScript(scriptFormat, activity, cloneMessage(executeMessage));
   if (!script) {
     return activity.emitFatal(

package/src/tasks/SubProcess.js

@@ -3,7 +3,7 @@ import ProcessExecution from '../process/ProcessExecution.js';
 import { cloneContent } from '../messageHelper.js';
 
 const kExecutions = Symbol.for('executions');
-const kMessageHandlers = Symbol.for('messageHandlers');
+const kOnExecutionCompleted = Symbol.for('execution completed handler');
 
 export default function SubProcess(activityDef, context) {
   const triggeredByEvent = activityDef.behaviour && activityDef.behaviour.triggeredByEvent;
@@ -39,9 +39,7 @@ export function SubProcessBehaviour(activity, context) {
   this.executionId = undefined;
 
   this[kExecutions] = new Set();
-  this[kMessageHandlers] = {
-    onExecutionCompleted: this._onExecutionCompleted.bind(this),
-  };
+  this[kOnExecutionCompleted] = this._onExecutionCompleted.bind(this);
 }
 
 Object.defineProperties(SubProcessBehaviour.prototype, {
@@ -147,7 +145,7 @@ SubProcessBehaviour.prototype._upsertExecution = function upsertExecution(execut
 };
 
 SubProcessBehaviour.prototype._addListeners = function addListeners(executionId) {
-  this.broker.subscribeTmp('subprocess-execution', `execution.#.${executionId}`, this[kMessageHandlers].onExecutionCompleted, {
+  this.broker.subscribeTmp('subprocess-execution', `execution.#.${executionId}`, this[kOnExecutionCompleted], {
     noAck: true,
     consumerTag: `_sub-process-execution-${executionId}`,
   });
@@ -184,7 +182,6 @@ SubProcessBehaviour.prototype._onExecutionCompleted = function onExecutionComple
 SubProcessBehaviour.prototype._completeExecution = function completeExecution(completeRoutingKey, content) {
   if (this.loopCharacteristics) {
     const execution = this._getExecutionById(content.executionId);
-    if (!execution) return;
     this[kExecutions].delete(execution);
   }
 
@@ -201,6 +198,8 @@ SubProcessBehaviour.prototype.getApi = function getApi(apiMessage) {
     return execution.getApi(apiMessage);
   }
 
+  if (!content.parent.path) return;
+
   for (const pp of content.parent.path) {
     if ((execution = this._getExecutionById(pp.executionId))) return execution.getApi(apiMessage);
   }