bpmn-elements 7.0.0 → 8.1.0

package/src/activity/Activity.js

@@ -7,19 +7,19 @@ import {Formatter} from '../MessageFormatter';
 import {cloneContent, cloneParent, cloneMessage} from '../messageHelper';
 import {makeErrorFromMessage, ActivityError} from '../error/Errors';
 
-const activityDefSymbol = Symbol.for('activityDefinition');
-const bpmnIoSymbol = Symbol.for('bpmnIo');
-const consumingSymbol = Symbol.for('consuming');
-const countersSymbol = Symbol.for('counters');
-const eventDefinitionsSymbol = Symbol.for('eventDefinitions');
-const execSymbol = Symbol.for('exec');
-const executeMessageSymbol = Symbol.for('executeMessage');
-const extensionsSymbol = Symbol.for('extensions');
-const flagsSymbol = Symbol.for('flags');
-const flowsSymbol = Symbol.for('flows');
-const formatterSymbol = Symbol.for('formatter');
-const messageHandlersSymbol = Symbol.for('messageHandlers');
-const stateMessageSymbol = Symbol.for('stateMessage');
+const kActivityDef = Symbol.for('activityDefinition');
+const kBpmnIo = Symbol.for('bpmnIo');
+const kConsuming = Symbol.for('consuming');
+const kCounters = Symbol.for('counters');
+const kEventDefinitions = Symbol.for('eventDefinitions');
+const kExec = Symbol.for('exec');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kExtensions = Symbol.for('extensions');
+const kFlags = Symbol.for('flags');
+const kFlows = Symbol.for('flows');
+const kFormatter = Symbol.for('formatter');
+const kMessageHandlers = Symbol.for('messageHandlers');
+const kStateMessage = Symbol.for('stateMessage');
 
 export default Activity;
 
@@ -27,7 +27,7 @@ function Activity(Behaviour, activityDef, context) {
   const {id, type = 'activity', name, behaviour = {}} = activityDef;
   const {attachedTo: attachedToRef, eventDefinitions} = behaviour;
 
-  this[activityDefSymbol] = activityDef;
+  this[kActivityDef] = activityDef;
   this.id = id;
   this.type = type;
   this.name = name;
@@ -37,7 +37,7 @@ function Activity(Behaviour, activityDef, context) {
   this.logger = context.environment.Logger(type.toLowerCase());
   this.environment = context.environment;
   this.context = context;
-  this[countersSymbol] = {
+  this[kCounters] = {
     taken: 0,
     discarded: 0,
   };
@@ -60,7 +60,7 @@ function Activity(Behaviour, activityDef, context) {
   const inboundAssociations = context.getInboundAssociations(id);
   const inboundTriggers = attachedToActivity ? [attachedToActivity] : inboundSequenceFlows.slice();
   const outboundSequenceFlows = context.getOutboundSequenceFlows(id);
-  const flows = this[flowsSymbol] = {
+  const flows = this[kFlows] = {
     inboundSequenceFlows,
     inboundAssociations,
     inboundJoinFlows: [],
@@ -71,7 +71,7 @@ function Activity(Behaviour, activityDef, context) {
 
   const isForCompensation = !!behaviour.isForCompensation;
   const isParallelJoin = activityDef.isParallelGateway && flows.inboundSequenceFlows.length > 1;
-  this[flagsSymbol] = {
+  this[kFlags] = {
     isEnd: flows.outboundSequenceFlows.length === 0,
     isStart: flows.inboundSequenceFlows.length === 0 && !attachedTo && !behaviour.triggeredByEvent && !isForCompensation,
     isSubProcess: activityDef.isSubProcess,
@@ -82,9 +82,9 @@ function Activity(Behaviour, activityDef, context) {
     isParallelJoin,
     isThrowing: activityDef.isThrowing,
   };
-  this[execSymbol] = {};
+  this[kExec] = {};
 
-  this[messageHandlersSymbol] = {
+  this[kMessageHandlers] = {
     onInbound: isParallelJoin ? this._onJoinInbound.bind(this) : this._onInbound.bind(this),
     onRunMessage: this._onRunMessage.bind(this),
     onApiMessage: this._onApiMessage.bind(this),
@@ -104,7 +104,7 @@ function Activity(Behaviour, activityDef, context) {
     }
   }
 
-  this[eventDefinitionsSymbol] = eventDefinitions && eventDefinitions.map((ed) => new ed.Behaviour(this, ed, this.context));
+  this[kEventDefinitions] = eventDefinitions && eventDefinitions.map((ed) => new ed.Behaviour(this, ed, this.context));
 }
 
 const proto = Activity.prototype;
@@ -112,29 +112,29 @@ const proto = Activity.prototype;
 Object.defineProperty(proto, 'counters', {
   enumerable: true,
   get() {
-    return {...this[countersSymbol]};
+    return {...this[kCounters]};
   },
 });
 
 Object.defineProperty(proto, 'execution', {
   enumerable: true,
   get() {
-    return this[execSymbol].execution;
+    return this[kExec].execution;
   },
 });
 
 Object.defineProperty(proto, 'executionId', {
   enumerable: true,
   get() {
-    return this[execSymbol].executionId;
+    return this[kExec].executionId;
   },
 });
 
 Object.defineProperty(proto, 'bpmnIo', {
   enumerable: true,
   get() {
-    if (bpmnIoSymbol in this) return this[bpmnIoSymbol];
-    const bpmnIo = this[bpmnIoSymbol] = new BpmnIO(this, this.context);
+    if (kBpmnIo in this) return this[kBpmnIo];
+    const bpmnIo = this[kBpmnIo] = new BpmnIO(this, this.context);
     return bpmnIo;
   },
 });
@@ -142,8 +142,8 @@ Object.defineProperty(proto, 'bpmnIo', {
 Object.defineProperty(proto, 'extensions', {
   enumerable: true,
   get() {
-    if (extensionsSymbol in this) return this[extensionsSymbol];
-    const extensions = this[extensionsSymbol] = this.context.loadExtensions(this);
+    if (kExtensions in this) return this[kExtensions];
+    const extensions = this[kExtensions] = this.context.loadExtensions(this);
     return extensions;
   },
 });
@@ -151,11 +151,11 @@ Object.defineProperty(proto, 'extensions', {
 Object.defineProperty(proto, 'formatter', {
   enumerable: true,
   get() {
-    let formatter = this[formatterSymbol];
+    let formatter = this[kFormatter];
     if (formatter) return formatter;
 
     const broker = this.broker;
-    formatter = this[formatterSymbol] = new Formatter({
+    formatter = this[kFormatter] = new Formatter({
       id: this.id,
       broker,
       logger: this.logger,
@@ -167,7 +167,7 @@ Object.defineProperty(proto, 'formatter', {
 Object.defineProperty(proto, 'isRunning', {
   enumerable: true,
   get() {
-    if (!this[consumingSymbol]) return false;
+    if (!this[kConsuming]) return false;
     return !!this.status;
   },
 });
@@ -175,66 +175,66 @@ Object.defineProperty(proto, 'isRunning', {
 Object.defineProperty(proto, 'outbound', {
   enumerable: true,
   get() {
-    return this[flowsSymbol].outboundSequenceFlows;
+    return this[kFlows].outboundSequenceFlows;
   },
 });
 
 Object.defineProperty(proto, 'inbound', {
   enumerable: true,
   get() {
-    return this[flowsSymbol].inboundSequenceFlows;
+    return this[kFlows].inboundSequenceFlows;
   },
 });
 
 Object.defineProperty(proto, 'isEnd', {
   enumerable: true,
   get() {
-    return this[flagsSymbol].isEnd;
+    return this[kFlags].isEnd;
   },
 });
 Object.defineProperty(proto, 'isStart', {
   enumerable: true,
   get() {
-    return this[flagsSymbol].isStart;
+    return this[kFlags].isStart;
   },
 });
 Object.defineProperty(proto, 'isSubProcess', {
   enumerable: true,
   get() {
-    return this[flagsSymbol].isSubProcess;
+    return this[kFlags].isSubProcess;
   },
 });
 
 Object.defineProperty(proto, 'isMultiInstance', {
   enumerable: true,
   get() {
-    return this[flagsSymbol].isMultiInstance;
+    return this[kFlags].isMultiInstance;
   },
 });
 
 Object.defineProperty(proto, 'isThrowing', {
   enumerable: true,
   get() {
-    return this[flagsSymbol].isThrowing;
+    return this[kFlags].isThrowing;
   },
 });
 Object.defineProperty(proto, 'isForCompensation', {
   enumerable: true,
   get() {
-    return this[flagsSymbol].isForCompensation;
+    return this[kFlags].isForCompensation;
   },
 });
 Object.defineProperty(proto, 'triggeredByEvent', {
   enumerable: true,
   get() {
-    return this[activityDefSymbol].triggeredByEvent;
+    return this[kActivityDef].triggeredByEvent;
   },
 });
 
 Object.defineProperty(proto, 'attachedTo', {
   enumerable: true,
   get() {
-    const attachedToId = this[flagsSymbol].attachedTo;
+    const attachedToId = this[kFlags].attachedTo;
     if (!attachedToId) return null;
     return this.getActivityById(attachedToId);
   },
@@ -243,12 +243,12 @@ Object.defineProperty(proto, 'attachedTo', {
 Object.defineProperty(proto, 'eventDefinitions', {
   enumerable: true,
   get() {
-    return this[eventDefinitionsSymbol];
+    return this[kEventDefinitions];
   },
 });
 
 proto.activate = function activate() {
-  if (this[flagsSymbol].isForCompensation) return;
+  if (this[kFlags].isForCompensation) return;
   return this._consumeInbound();
 };
 
@@ -260,7 +260,7 @@ proto.deactivate = function deactivate() {
 
 proto.init = function init(initContent) {
   const id = this.id;
-  const exec = this[execSymbol];
+  const exec = this[kExec];
   const executionId = exec.initExecutionId = exec.initExecutionId || getUniqueId(id);
   this.logger.debug(`<${id}> initialized with executionId <${executionId}>`);
   this._publishEvent('init', this._createMessage({...initContent, executionId}));
@@ -270,7 +270,7 @@ proto.run = function run(runContent) {
   const id = this.id;
   if (this.isRunning) throw new Error(`activity <${id}> is already running`);
 
-  const exec = this[execSymbol];
+  const exec = this[kExec];
   const executionId = exec.executionId = exec.initExecutionId || getUniqueId(id);
   exec.initExecutionId = null;
 
@@ -291,10 +291,10 @@ proto.recover = function recover(state) {
 
   this.stopped = state.stopped;
   this.status = state.status;
-  const exec = this[execSymbol];
+  const exec = this[kExec];
   exec.executionId = state.executionId;
 
-  this[countersSymbol] = {...this[countersSymbol], ...state.counters};
+  this[kCounters] = {...this[kCounters], ...state.counters};
 
   if (state.execution) {
     exec.execution = new ActivityExecution(this, this.context).recover(state.execution);
@@ -306,7 +306,7 @@ proto.recover = function recover(state) {
 };
 
 proto.resume = function resume() {
-  if (this[consumingSymbol]) {
+  if (this[kConsuming]) {
     throw new Error(`cannot resume running activity <${this.id}>`);
   }
   if (!this.status) return this.activate();
@@ -322,24 +322,24 @@ proto.resume = function resume() {
 
 proto.discard = function discard(discardContent) {
   if (!this.status) return this._runDiscard(discardContent);
-  const execution = this[execSymbol].execution;
+  const execution = this[kExec].execution;
   if (execution && !execution.completed) return execution.discard();
 
   this._deactivateRunConsumers();
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', cloneContent(this[stateMessageSymbol].content));
+  broker.publish('run', 'run.discard', cloneContent(this[kStateMessage].content));
   this._consumeRunQ();
 };
 
 proto.stop = function stop() {
-  if (!this[consumingSymbol]) return;
+  if (!this[kConsuming]) return;
   return this.getApi().stop();
 };
 
 proto.next = function next() {
   if (!this.environment.settings.step) return;
-  const stateMessage = this[stateMessageSymbol];
+  const stateMessage = this[kStateMessage];
   if (!stateMessage) return;
   if (this.status === 'executing') return false;
   if (this.status === 'formatting') return false;
@@ -353,13 +353,13 @@ proto.shake = function shake() {
 };
 
 proto.evaluateOutbound = function evaluateOutbound(fromMessage, discardRestAtTake, callback) {
-  return this[flowsSymbol].outboundEvaluator.evaluate(fromMessage, discardRestAtTake, callback);
+  return this[kFlows].outboundEvaluator.evaluate(fromMessage, discardRestAtTake, callback);
 };
 
 proto.getState = function getState() {
   const msg = this._createMessage();
 
-  const exec = this[execSymbol];
+  const exec = this[kExec];
   return {
     ...msg,
     executionId: exec.executionId,
@@ -372,9 +372,9 @@ proto.getState = function getState() {
 };
 
 proto.getApi = function getApi(message) {
-  const execution = this[execSymbol].execution;
+  const execution = this[kExec].execution;
   if (execution && !execution.completed) return execution.getApi(message);
-  return ActivityApi(this.broker, message || this[stateMessageSymbol]);
+  return ActivityApi(this.broker, message || this[kStateMessage]);
 };
 
 proto.getActivityById = function getActivityById(elementId) {
@@ -382,7 +382,7 @@ proto.getActivityById = function getActivityById(elementId) {
 };
 
 proto._runDiscard = function runDiscard(discardContent) {
-  const exec = this[execSymbol];
+  const exec = this[kExec];
   const executionId = exec.executionId = exec.initExecutionId || getUniqueId(this.id);
   exec.initExecutionId = null;
 
@@ -398,7 +398,7 @@ proto._discardRun = function discardRun() {
   const status = this.status;
   if (!status) return;
 
-  const execution = this[execSymbol].execution;
+  const execution = this[kExec].execution;
   if (execution && !execution.completed) return;
   switch (status) {
     case 'executing':
@@ -411,7 +411,7 @@ proto._discardRun = function discardRun() {
   if (this.extensions) this.extensions.deactivate();
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', cloneContent(this[stateMessageSymbol].content));
+  broker.publish('run', 'run.discard', cloneContent(this[kStateMessage].content));
   this._consumeRunQ();
 };
 
@@ -423,21 +423,21 @@ proto._shakeOutbound = function shakeOutbound(sourceMessage) {
   const broker = this.broker;
   this.broker.publish('api', 'activity.shake.start', message.content, {persistent: false, type: 'shake'});
 
-  if (this[flagsSymbol].isEnd) {
+  if (this[kFlags].isEnd) {
     return broker.publish('event', 'activity.shake.end', message.content, {persistent: false, type: 'shake'});
   }
 
-  for (const flow of this[flowsSymbol].outboundSequenceFlows) flow.shake(message);
+  for (const flow of this[kFlows].outboundSequenceFlows) flow.shake(message);
 };
 
 proto._consumeInbound = function consumeInbound() {
   if (this.status) return;
   const inboundQ = this.broker.getQueue('inbound-q');
-  if (this[flagsSymbol].isParallelJoin) {
-    return inboundQ.consume(this[messageHandlersSymbol].onInbound, {consumerTag: '_run-on-inbound', prefetch: 1000});
+  if (this[kFlags].isParallelJoin) {
+    return inboundQ.consume(this[kMessageHandlers].onInbound, {consumerTag: '_run-on-inbound', prefetch: 1000});
   }
 
-  return inboundQ.consume(this[messageHandlersSymbol].onInbound, {consumerTag: '_run-on-inbound'});
+  return inboundQ.consume(this[kMessageHandlers].onInbound, {consumerTag: '_run-on-inbound'});
 };
 
 proto._onInbound = function onInbound(routingKey, message) {
@@ -452,6 +452,7 @@ proto._onInbound = function onInbound(routingKey, message) {
   switch (routingKey) {
     case 'association.take':
     case 'flow.take':
+    case 'activity.restart':
     case 'activity.enter':
       return this.run({
         message: content.message,
@@ -478,7 +479,7 @@ proto._onInbound = function onInbound(routingKey, message) {
 
 proto._onJoinInbound = function onJoinInbound(routingKey, message) {
   const {content} = message;
-  const {inboundSequenceFlows, inboundJoinFlows, inboundTriggers} = this[flowsSymbol];
+  const {inboundSequenceFlows, inboundJoinFlows, inboundTriggers} = this[kFlows];
   const idx = inboundJoinFlows.findIndex((msg) => msg.content.id === content.id);
 
   inboundJoinFlows.push(message);
@@ -522,7 +523,7 @@ proto._onInboundEvent = function onInboundEvent(routingKey, message) {
   switch (routingKey) {
     case 'activity.enter':
     case 'activity.discard': {
-      if (content.id === this[flagsSymbol].attachedTo) {
+      if (content.id === this[kFlags].attachedTo) {
         inboundQ.queueMessage(fields, cloneContent(content), properties);
       }
       break;
@@ -539,7 +540,7 @@ proto._onInboundEvent = function onInboundEvent(routingKey, message) {
       return inboundQ.purge();
     }
     case 'association.complete': {
-      if (!this[flagsSymbol].isForCompensation) break;
+      if (!this[kFlags].isForCompensation) break;
 
       inboundQ.queueMessage(fields, cloneContent(content), properties);
 
@@ -557,10 +558,10 @@ proto._onInboundEvent = function onInboundEvent(routingKey, message) {
 };
 
 proto._consumeRunQ = function consumeRunQ() {
-  if (this[consumingSymbol]) return;
+  if (this[kConsuming]) return;
 
-  this[consumingSymbol] = true;
-  this.broker.getQueue('run-q').assertConsumer(this[messageHandlersSymbol].onRunMessage, {exclusive: true, consumerTag: '_activity-run'});
+  this[kConsuming] = true;
+  this.broker.getQueue('run-q').assertConsumer(this[kMessageHandlers].onRunMessage, {exclusive: true, consumerTag: '_activity-run'});
 };
 
 proto._onRunMessage = function onRunMessage(routingKey, message, messageProperties) {
@@ -591,7 +592,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
 
   const id = this.id;
   const step = this.environment.settings.step;
-  this[stateMessageSymbol] = message;
+  this[kStateMessage] = message;
 
   switch (routingKey) {
     case 'run.enter': {
@@ -599,7 +600,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
 
       this.status = 'entered';
       if (!isRedelivered) {
-        this[execSymbol].execution = null;
+        this[kExec].execution = null;
       }
 
       if (this.extensions) this.extensions.activate(cloneMessage(message), this);
@@ -612,7 +613,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.logger.debug(`<${id}> discard`, isRedelivered ? 'redelivered' : '');
 
       this.status = 'discard';
-      this[execSymbol].execution = null;
+      this[kExec].execution = null;
 
       if (this.extensions) this.extensions.activate(cloneMessage(message), this);
       if (this.bpmnIo) this.bpmnIo.activate(message);
@@ -636,16 +637,16 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
     case 'run.execute.passthrough': {
       const execution = this.execution;
       if (!isRedelivered && execution) {
-        this[executeMessageSymbol] = message;
+        this[kExecuteMessage] = message;
         return execution.passthrough(message);
       }
     }
     case 'run.execute': {
       this.status = 'executing';
-      this[executeMessageSymbol] = message;
+      this[kExecuteMessage] = message;
 
-      this.broker.getQueue('execution-q').assertConsumer(this[messageHandlersSymbol].onExecutionMessage, {exclusive: true, consumerTag: '_activity-execution'});
-      const exec = this[execSymbol];
+      this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {exclusive: true, consumerTag: '_activity-execution'});
+      const exec = this[kExec];
       if (!exec.execution) exec.execution = new ActivityExecution(this, this.context);
 
       if (isRedelivered) {
@@ -662,12 +663,10 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
     case 'run.end': {
       if (this.status === 'end') break;
 
-      this[countersSymbol].taken++;
+      this[kCounters].taken++;
 
       this.status = 'end';
 
-      if (isRedelivered) break;
-
       return this._doRunLeave(message, false, () => {
         this._publishEvent('end', content, {correlationId});
         if (!step) message.ack();
@@ -682,7 +681,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
     }
     case 'run.discarded': {
       this.logger.debug(`<${content.executionId} (${id})> discarded`);
-      this[countersSymbol].discarded++;
+      this[kCounters].discarded++;
 
       this.status = 'discarded';
       content.outbound = undefined;
@@ -727,7 +726,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
 };
 
 proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
-  const executeMessage = this[executeMessageSymbol];
+  const executeMessage = this[kExecuteMessage];
   const content = cloneContent({
     ...executeMessage.content,
     ...message.content,
@@ -771,8 +770,8 @@ proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
 
 proto._ackRunExecuteMessage = function ackRunExecuteMessage() {
   if (this.environment.settings.step) return;
-  const executeMessage = this[executeMessageSymbol];
-  this[executeMessageSymbol] = null;
+  const executeMessage = this[kExecuteMessage];
+  this[kExecuteMessage] = null;
   executeMessage.ack();
 };
 
@@ -790,7 +789,7 @@ proto._doRunLeave = function doRunLeave(message, isDiscarded, onOutbound) {
     }
 
     this.broker.publish('run', 'run.leave', cloneContent(content, {
-      ...(outbound.length ? {outbound} : undefined),
+      ...(outbound.length && {outbound}),
     }), {correlationId});
 
     onOutbound();
@@ -798,13 +797,13 @@ proto._doRunLeave = function doRunLeave(message, isDiscarded, onOutbound) {
 };
 
 proto._doOutbound = function doOutbound(fromMessage, isDiscarded, callback) {
-  const outboundSequenceFlows = this[flowsSymbol].outboundSequenceFlows;
+  const outboundSequenceFlows = this[kFlows].outboundSequenceFlows;
   if (!outboundSequenceFlows.length) return callback(null, []);
 
   const fromContent = fromMessage.content;
 
   let discardSequence = fromContent.discardSequence;
-  if (isDiscarded && !discardSequence && this[flagsSymbol].attachedTo && fromContent.inbound && fromContent.inbound[0]) {
+  if (isDiscarded && !discardSequence && this[kFlags].attachedTo && fromContent.inbound && fromContent.inbound[0]) {
     discardSequence = [fromContent.inbound[0].id];
   }
 
@@ -834,7 +833,7 @@ proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequ
       flow: {
         ...outboundFlow,
         sequenceId: getUniqueId(`${flowId}_${action}`),
-        ...(discardSequence ? {discardSequence: discardSequence.slice()} : undefined),
+        ...(discardSequence && {discardSequence: discardSequence.slice()}),
       },
     }));
   }
@@ -844,7 +843,7 @@ proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequ
 proto._onResumeMessage = function onResumeMessage(message) {
   message.ack();
 
-  const stateMessage = this[stateMessageSymbol];
+  const stateMessage = this[kStateMessage];
   const {fields} = stateMessage;
 
   switch (fields.routingKey) {
@@ -875,11 +874,11 @@ proto._publishEvent = function publishEvent(state, content, properties = {}) {
 };
 
 proto._onStop = function onStop(message) {
-  const running = this[consumingSymbol];
+  const running = this[kConsuming];
 
   this.stopped = true;
 
-  this[consumingSymbol] = false;
+  this[kConsuming] = false;
   const broker = this.broker;
   broker.cancel('_activity-run');
   broker.cancel('_activity-api');
@@ -894,11 +893,11 @@ proto._onStop = function onStop(message) {
 };
 
 proto._consumeApi = function consumeApi() {
-  const executionId = this[execSymbol].executionId;
+  const executionId = this[kExec].executionId;
   if (!executionId) return;
   const broker = this.broker;
   broker.cancel('_activity-api');
-  broker.subscribeTmp('api', `activity.*.${executionId}`, this[messageHandlersSymbol].onApiMessage, {noAck: true, consumerTag: '_activity-api', priority: 100});
+  broker.subscribeTmp('api', `activity.*.${executionId}`, this[kMessageHandlers].onApiMessage, {noAck: true, consumerTag: '_activity-api', priority: 100});
 };
 
 proto._onApiMessage = function onApiMessage(routingKey, message) {
@@ -921,12 +920,12 @@ proto._createMessage = function createMessage(override) {
     ...override,
     id: this.id,
     type: this.type,
-    ...(name ? {name} : undefined),
-    ...(status ? {status} : undefined),
-    ...(parent ? {parent: cloneParent(parent)} : undefined),
+    ...(name && {name}),
+    ...(status && {status}),
+    ...(parent && {parent: cloneParent(parent)}),
   };
 
-  for (const [flag, value] of Object.entries(this[flagsSymbol])) {
+  for (const [flag, value] of Object.entries(this[kFlags])) {
     if (value) result[flag] = value;
   }
 
@@ -934,7 +933,7 @@ proto._createMessage = function createMessage(override) {
 };
 
 proto._getOutboundSequenceFlowById = function getOutboundSequenceFlowById(flowId) {
-  return this[flowsSymbol].outboundSequenceFlows.find((flow) => flow.id === flowId);
+  return this[kFlows].outboundSequenceFlows.find((flow) => flow.id === flowId);
 };
 
 proto._resumeExtensions = function resumeExtensions(message, callback) {
@@ -956,7 +955,7 @@ proto._deactivateRunConsumers = function _deactivateRunConsumers() {
   broker.cancel('_activity-api');
   broker.cancel('_activity-run');
   broker.cancel('_activity-execution');
-  this[consumingSymbol] = false;
+  this[kConsuming] = false;
 };
 
 function OutboundEvaluator(activity, outboundFlows) {
@@ -1072,7 +1071,7 @@ OutboundEvaluator.prototype.completed = function completed(err) {
   for (const flow of Object.values(result)) {
     evaluationResult.push({
       ...flow,
-      ...(message !== undefined ? {message} : undefined),
+      ...(message !== undefined && {message}),
     });
   }
 
@@ -1084,6 +1083,6 @@ function formatFlowAction(flow, options) {
     ...options,
     id: flow.id,
     action: options.action,
-    ...(flow.isDefault ? {isDefault: true} : undefined),
+    ...(flow.isDefault && {isDefault: true}),
   };
 }