bpmn-elements 16.2.0 → 16.2.1

package/dist/io/Properties.js

@@ -12,9 +12,9 @@ function Properties(activity, propertiesDef, context) {
   this.activity = activity;
   this.broker = activity.broker;
   const props = this[kProperties] = {
-    properties: [],
-    dataInputObjects: [],
-    dataOutputObjects: []
+    properties: new Set(),
+    dataInputObjects: new Set(),
+    dataOutputObjects: new Set()
   };
   for (const {
     id,
@@ -23,16 +23,16 @@ function Properties(activity, propertiesDef, context) {
     const source = {
       id,
       type: def.type,
-      name: def.behaviour && def.behaviour.name
+      name: def.behaviour?.name
     };
-    props.properties.push(source);
+    props.properties.add(source);
     const inputDataObjectId = (0, _getPropertyValue.default)(def, 'behaviour.dataInput.association.source.dataObject.id');
     const outputDataObjectId = (0, _getPropertyValue.default)(def, 'behaviour.dataOutput.association.target.dataObject.id');
     const inputDataStoreId = (0, _getPropertyValue.default)(def, 'behaviour.dataInput.association.source.dataStore.id');
     const outputDataStoreId = (0, _getPropertyValue.default)(def, 'behaviour.dataOutput.association.target.dataStore.id');
     if (inputDataObjectId) {
       const reference = context.getDataObjectById(inputDataObjectId);
-      props.dataInputObjects.push({
+      props.dataInputObjects.add({
         id,
         reference
       });
@@ -42,7 +42,7 @@ function Properties(activity, propertiesDef, context) {
     }
     if (outputDataObjectId) {
       const reference = context.getDataObjectById(outputDataObjectId);
-      props.dataOutputObjects.push({
+      props.dataOutputObjects.add({
         id,
         reference: reference
       });
@@ -52,7 +52,7 @@ function Properties(activity, propertiesDef, context) {
     }
     if (inputDataStoreId) {
       const reference = context.getDataStoreById(inputDataStoreId);
-      props.dataInputObjects.push({
+      props.dataInputObjects.add({
         id,
         reference
       });
@@ -62,7 +62,7 @@ function Properties(activity, propertiesDef, context) {
     }
     if (outputDataStoreId) {
       const reference = context.getDataStoreById(outputDataStoreId);
-      props.dataOutputObjects.push({
+      props.dataOutputObjects.add({
         id,
         reference
       });
@@ -100,7 +100,7 @@ Properties.prototype._formatOnEnter = function formatOnEnter(message) {
   const startRoutingKey = 'run.enter.bpmn-properties';
   const dataInputObjects = this[kProperties].dataInputObjects;
   const broker = this.broker;
-  if (!dataInputObjects.length) {
+  if (!dataInputObjects.size) {
     return broker.getQueue('format-run-q').queueMessage({
       routingKey: startRoutingKey
     }, {
@@ -114,7 +114,7 @@ Properties.prototype._formatOnEnter = function formatOnEnter(message) {
     endRoutingKey,
     properties: this._getProperties(message)
   });
-  return read(broker, dataInputObjects, (_, responses) => {
+  return read(broker, [...dataInputObjects], (_, responses) => {
     broker.publish('format', endRoutingKey, {
       properties: this._getProperties(message, responses)
     });
@@ -126,7 +126,7 @@ Properties.prototype._formatOnComplete = function formatOnComplete(message) {
   const outputProperties = this._getProperties(message, messageOutput);
   const dataOutputObjects = this[kProperties].dataOutputObjects;
   const broker = this.broker;
-  if (!dataOutputObjects.length) {
+  if (!dataOutputObjects.size) {
     return broker.getQueue('format-run-q').queueMessage({
       routingKey: startRoutingKey
     }, {
@@ -140,7 +140,7 @@ Properties.prototype._formatOnComplete = function formatOnComplete(message) {
     endRoutingKey,
     properties: outputProperties
   });
-  return write(broker, dataOutputObjects, outputProperties, (_, responses) => {
+  return write(broker, [...dataOutputObjects], outputProperties, (_, responses) => {
     broker.publish('format', endRoutingKey, {
       properties: this._getProperties(message, responses)
     });
@@ -194,7 +194,7 @@ function read(broker, dataReferences, callback) {
   }
 }
 function write(broker, dataReferences, properties, callback) {
-  const responses = [];
+  const responses = {};
   let count = 0;
   const dataWriteConsumer = broker.subscribeTmp('data', 'data.write.#', onDataWriteResponse, {
     noAck: true

package/dist/process/Process.js

@@ -81,8 +81,7 @@ Object.defineProperties(Process.prototype, {
   },
   lanes: {
     get() {
-      const lanes = this[kLanes];
-      return lanes && lanes.slice();
+      return this[kLanes]?.slice();
     }
   },
   extensions: {
@@ -119,8 +118,7 @@ Object.defineProperties(Process.prototype, {
   },
   activityStatus: {
     get() {
-      const execution = this[kExec].get('execution');
-      return execution && execution.activityStatus || 'idle';
+      return this[kExec].get('execution')?.activityStatus || 'idle';
     }
   }
 });
@@ -169,7 +167,7 @@ Process.prototype.getState = function getState() {
     stopped: this.stopped,
     counters: this.counters,
     broker: this.broker.getState(true),
-    execution: this.execution && this.execution.getState()
+    execution: this.execution?.getState()
   };
 };
 Process.prototype.recover = function recover(state) {
@@ -378,10 +376,10 @@ Process.prototype._publishEvent = function publishEvent(state, content) {
   });
 };
 Process.prototype.sendMessage = function sendMessage(message) {
-  const messageContent = message && message.content;
+  const messageContent = message?.content;
   if (!messageContent) return;
   let targetsFound = false;
-  if (messageContent.target && messageContent.target.id && this.getActivityById(messageContent.target.id)) {
+  if (messageContent.target?.id && this.getActivityById(messageContent.target.id)) {
     targetsFound = true;
   } else if (messageContent.message && this.getStartActivities({
     referenceId: messageContent.message.id,

package/dist/process/ProcessExecution.js

@@ -41,8 +41,8 @@ function ProcessExecution(parentActivity, context) {
     associations: context.getAssociations(id),
     flows: context.getSequenceFlows(id),
     outboundMessageFlows: context.getMessageFlows(id),
-    startActivities: [],
-    triggeredByEvent: [],
+    startActivities: new Set(),
+    triggeredByEvent: new Set(),
     detachedActivities: new Set(),
     startSequences: {}
   };
@@ -127,7 +127,7 @@ ProcessExecution.prototype.resume = function resume() {
     detachedActivities,
     postponed
   } = this[kElements];
-  if (startActivities.length > 1) {
+  if (startActivities.size > 1) {
     for (const a of startActivities) a.shake();
   }
   postponed.clear();
@@ -182,7 +182,7 @@ ProcessExecution.prototype.getState = function getState() {
       flows: flowStates
     }),
     ...(outboundMessageFlows.length && {
-      messageFlows: outboundMessageFlows.length && outboundMessageFlows.map(f => f.getState()).filter(Boolean)
+      messageFlows: outboundMessageFlows.map(f => f.getState()).filter(Boolean)
     }),
     ...(associations.length && {
       associations: associations.map(f => f.getState()).filter(Boolean)
@@ -349,7 +349,7 @@ ProcessExecution.prototype._start = function start() {
     postponed,
     detachedActivities
   } = this[kElements];
-  if (startActivities.length > 1) {
+  if (startActivities.size > 1) {
     for (const a of startActivities) a.shake();
   }
   for (const a of startActivities) a.init();
@@ -411,8 +411,8 @@ ProcessExecution.prototype._activate = function activate() {
       priority: 200
     });
   }
-  startActivities.splice(0);
-  triggeredByEvent.splice(0);
+  startActivities.clear();
+  triggeredByEvent.clear();
   for (const activity of children) {
     if (activity.placeholder) continue;
     activity.activate(this);
@@ -421,8 +421,8 @@ ProcessExecution.prototype._activate = function activate() {
       consumerTag: '_process-activity-consumer',
       priority: 200
     });
-    if (activity.isStart) startActivities.push(activity);
-    if (activity.triggeredByEvent) triggeredByEvent.push(activity);
+    if (activity.isStart) startActivities.add(activity);
+    if (activity.triggeredByEvent) triggeredByEvent.add(activity);
   }
   this[kActivated] = true;
 };
@@ -458,14 +458,14 @@ ProcessExecution.prototype._onDelegateEvent = function onDelegateEvent(message)
   const eventType = message.properties.type;
   let delegate = true;
   const content = message.content;
-  if (content.message && content.message.id) {
+  if (content.message?.id) {
     this._debug(`delegate ${eventType} event with id <${content.message.id}>`);
   } else {
     this._debug(`delegate ${eventType} anonymous event`);
   }
   for (const activity of this[kElements].triggeredByEvent) {
     if (activity.getStartActivities({
-      referenceId: content.message && content.message.id,
+      referenceId: content.message?.id,
       referenceType: eventType
     }).length) {
       delegate = false;
@@ -588,7 +588,7 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
       {
         let eventCaughtBy;
         for (const msg of this[kElements].postponed) {
-          if (msg.fields.routingKey === 'activity.catch' && msg.content.source && msg.content.source.executionId === content.executionId) {
+          if (msg.fields.routingKey === 'activity.catch' && msg.content.source?.executionId === content.executionId) {
             eventCaughtBy = msg;
             break;
           }
@@ -676,7 +676,7 @@ ProcessExecution.prototype._onChildCompleted = function onChildCompleted(message
       type: 'cancel'
     });
   }
-  if (isEnd && startActivities.length) {
+  if (isEnd && startActivities.size) {
     const startSequences = this[kElements].startSequences;
     for (const msg of postponed) {
       const postponedId = msg.content.id;

package/dist/tasks/ServiceTask.js

@@ -80,7 +80,7 @@ ServiceTaskBehaviour.prototype._onApiMessage = function onApiMessage(executeMess
         const executionId = executeMessage.content.executionId;
         broker.cancel(`_api-${executionId}`);
         const service = this.service;
-        if (service && service.stop) service.stop(message);
+        if (service?.stop) service.stop(message);
         return this.activity.logger.debug(`<${executionId} (${this.id})> stopped`);
       }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "16.2.0",
+  "version": "16.2.1",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -103,7 +103,7 @@
     "texample": "^0.0.6"
   },
   "dependencies": {
-    "@0dep/piso": "^2.0.2",
+    "@0dep/piso": "^2.2.0",
     "smqp": "^9.0.2"
   }
 }

package/src/Api.js

@@ -71,7 +71,7 @@ Api.prototype.resolveExpression = function resolveExpression(expression) {
 };
 
 Api.prototype.sendApiMessage = function sendApiMessage(action, content, options) {
-  const correlationId = (options && options.correlationId) || getUniqueId(`${this.id || this.messagePrefix}_signal`);
+  const correlationId = options?.correlationId || getUniqueId(`${this.id || this.messagePrefix}_signal`);
   let key = `${this.messagePrefix}.${action}`;
   if (this.executionId) key += `.${this.executionId}`;
   this.broker.publish('api', key, this.createMessage(content), { ...options, correlationId, type: action });

package/src/Context.js

@@ -206,7 +206,8 @@ ContextInstance.prototype.getDataStoreById = function getDataStoreById(reference
 };
 
 ContextInstance.prototype.getStartActivities = function getStartActivities(filterOptions, scopeId) {
-  const { referenceId, referenceType = 'unknown' } = filterOptions || {};
+  const referenceId = filterOptions?.referenceId;
+  const referenceType = filterOptions?.referenceType || 'unknown';
   const result = [];
   for (const activity of this.getActivities()) {
     if (!activity.isStart) continue;

package/src/Environment.js

@@ -59,7 +59,7 @@ Environment.prototype.recover = function recover(state) {
   return this;
 };
 
-Environment.prototype.clone = function clone(overrideOptions = {}) {
+Environment.prototype.clone = function clone(overrideOptions) {
   const services = this[kServices];
   const newOptions = {
     settings: { ...this.settings },
@@ -74,7 +74,7 @@ Environment.prototype.clone = function clone(overrideOptions = {}) {
     services,
   };
 
-  if (overrideOptions.services) newOptions.services = { ...services, ...overrideOptions.services };
+  if (overrideOptions?.services) newOptions.services = { ...services, ...overrideOptions.services };
 
   return new this.constructor(newOptions);
 };
@@ -109,7 +109,7 @@ Environment.prototype.getServiceByName = function getServiceByName(serviceName)
   return this[kServices][serviceName];
 };
 
-Environment.prototype.resolveExpression = function resolveExpression(expression, message = {}, expressionFnContext) {
+Environment.prototype.resolveExpression = function resolveExpression(expression, message, expressionFnContext) {
   const from = {
     environment: this,
     ...message,

package/src/EventBroker.js

@@ -78,7 +78,7 @@ EventBroker.prototype.on = function on(eventName, callback, eventOptions = { onc
   }
 };
 
-EventBroker.prototype.once = function once(eventName, callback, eventOptions = {}) {
+EventBroker.prototype.once = function once(eventName, callback, eventOptions) {
   return this.on(eventName, callback, { ...eventOptions, once: true });
 };
 

package/src/MessageFormatter.js

@@ -65,7 +65,7 @@ Formatter.prototype._onMessage = function onMessage(routingKey, message) {
     default: {
       message.ack();
 
-      const endRoutingKey = message.content && message.content.endRoutingKey;
+      const endRoutingKey = message.content?.endRoutingKey;
       if (endRoutingKey) {
         this._decorate(message.content);
         pending.push(message);
@@ -99,7 +99,7 @@ Formatter.prototype._complete = function complete(message, isError) {
   this.broker.cancel(message.fields.consumerTag);
 
   if (isError) {
-    const error = (message.content && message.content.error) || new Error('formatting failed');
+    const error = message.content?.error || new Error('formatting failed');
     const errMessage = error.message || 'formatting failed';
     this._debug(`formatting of ${formatKey} failed with ${message.fields.routingKey}: ${errMessage}`);
     return callback(new ActivityError(errMessage, cloneMessage(runMessage), error));

package/src/Tracker.js

@@ -30,6 +30,7 @@ ActivityTracker.prototype.track = function track(routingKey, message) {
       break;
     case 'activity.execution.outbound.take':
     case 'activity.detach':
+    case 'activity.call':
     case 'activity.wait': {
       if (content.isMultiInstance) this._waiting(content.parent.executionId);
       else this._waiting(executionId);

package/src/activity/Activity.js

@@ -94,7 +94,7 @@ function Activity(Behaviour, activityDef, context) {
     isTransaction: activityDef.isTransaction,
     isParallelJoin,
     isThrowing: activityDef.isThrowing,
-    lane: activityDef.lane && activityDef.lane.id,
+    lane: activityDef.lane?.id,
   };
   this[kExec] = new Map();
 
@@ -105,7 +105,7 @@ function Activity(Behaviour, activityDef, context) {
     onExecutionMessage: this._onExecutionMessage.bind(this),
   };
 
-  this[kEventDefinitions] = eventDefinitions && eventDefinitions.map((ed, idx) => new ed.Behaviour(this, ed, context, idx));
+  this[kEventDefinitions] = eventDefinitions?.map((ed, idx) => new ed.Behaviour(this, ed, context, idx));
   this[kExtensions] = context.loadExtensions(this);
   this[kConsuming] = false;
   this[kConsumingRunQ] = undefined;
@@ -135,7 +135,7 @@ Object.defineProperties(Activity.prototype, {
   bpmnIo: {
     get() {
       const extensions = this[kExtensions];
-      return extensions && extensions.extensions.find((e) => e.type === 'bpmnio');
+      return extensions?.extensions.find((e) => e.type === 'bpmnio');
     },
   },
   formatter: {
@@ -655,7 +655,7 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
       break;
     }
     case 'run.execute.passthrough': {
-      const execution = this.execution;
+      const execution = this[kExec].get('execution');
       if (!isRedelivered && execution) {
         if (execution.completed) return message.ack();
         this[kExecuteMessage] = message;
@@ -666,13 +666,19 @@ Activity.prototype._continueRunMessage = function continueRunMessage(routingKey,
       this.status = 'executing';
       this[kExecuteMessage] = message;
 
-      const exec = this[kExec];
       if (isRedelivered && this.extensions) this.extensions.activate(cloneMessage(message));
-      if (!exec.has('execution')) exec.set('execution', new ActivityExecution(this, this.context));
+
+      const exec = this[kExec];
+      let execution = exec.get('execution');
+      if (!execution) {
+        execution = new ActivityExecution(this, this.context);
+        exec.set('execution', execution);
+      }
+
       this.broker
         .getQueue('execution-q')
         .assertConsumer(this[kMessageHandlers].onExecutionMessage, { exclusive: true, consumerTag: '_activity-execution' });
-      return exec.get('execution').execute(message);
+      return execution.execute(message);
     }
     case 'run.end': {
       this.logger.debug(`<${id}> end`, isRedelivered ? 'redelivered' : '');
@@ -827,14 +833,14 @@ Activity.prototype._doOutbound = function doOutbound(fromMessage, isDiscarded, c
   const fromContent = fromMessage.content;
 
   let discardSequence = fromContent.discardSequence;
-  if (isDiscarded && !discardSequence && this[kFlags].attachedTo && fromContent.inbound && fromContent.inbound[0]) {
+  if (isDiscarded && !discardSequence && this[kFlags].attachedTo && fromContent.inbound?.[0]) {
     discardSequence = [fromContent.inbound[0].id];
   }
 
   let outboundFlows;
   if (isDiscarded) {
     outboundFlows = outboundSequenceFlows.map((flow) => formatFlowAction(flow, { action: 'discard' }));
-  } else if (fromContent.outbound && fromContent.outbound.length) {
+  } else if (fromContent.outbound?.length) {
     outboundFlows = outboundSequenceFlows.map((flow) => formatFlowAction(flow, fromContent.outbound.filter((f) => f.id === flow.id).pop()));
   }
 
@@ -914,7 +920,7 @@ Activity.prototype._onResumeMessage = function onResumeMessage(message) {
   return this.broker.publish('run', fields.routingKey, cloneContent(stateMessage.content), stateMessage.properties);
 };
 
-Activity.prototype._publishEvent = function publishEvent(state, content, properties = {}) {
+Activity.prototype._publishEvent = function publishEvent(state, content, properties) {
   this.broker.publish('event', `activity.${state}`, cloneContent(content, { state }), {
     ...properties,
     type: state,
@@ -969,9 +975,8 @@ Activity.prototype._onApiMessage = function onApiMessage(routingKey, message) {
 };
 
 Activity.prototype._createMessage = function createMessage(override) {
-  const name = this.name,
-    status = this.status,
-    parent = this.parent;
+  const { name, status, parent } = this;
+
   const result = {
     ...override,
     id: this.id,

package/src/activity/ActivityExecution.js

@@ -32,7 +32,7 @@ Object.defineProperty(ActivityExecution.prototype, 'completed', {
 
 ActivityExecution.prototype.execute = function execute(executeMessage) {
   if (!executeMessage) throw new Error('Execution requires message');
-  const executionId = executeMessage.content && executeMessage.content.executionId;
+  const executionId = executeMessage.content?.executionId;
   if (!executionId) throw new Error('Execution requires execution id');
 
   this.executionId = executionId;
@@ -347,7 +347,7 @@ ActivityExecution.prototype._onParentApiMessage = function onParentApiMessage(ro
 };
 
 ActivityExecution.prototype._onStop = function onStop(message) {
-  const stoppedId = message && message.content && message.content.executionId;
+  const stoppedId = message?.content?.executionId;
   const running = this.getPostponed();
   for (const api of running) {
     if (stoppedId !== api.content.executionId) {

package/src/activity/outbound-evaluator.js

@@ -11,7 +11,6 @@ export function OutboundEvaluator(activity, outboundFlows) {
     flows.push(defaultFlow);
   }
 
-  this.defaultFlowIdx = outboundFlows.findIndex(({ isDefault }) => isDefault);
   this._onEvaluated = this.onEvaluated.bind(this);
   this.evaluateArgs = {};
 }

package/src/definition/Definition.js

@@ -98,7 +98,7 @@ Object.defineProperties(Definition.prototype, {
   activityStatus: {
     get() {
       const execution = this[kExec].get('execution');
-      return (execution && execution.activityStatus) || 'idle';
+      return execution?.activityStatus || 'idle';
     },
   },
 });
@@ -160,7 +160,7 @@ Definition.prototype.getState = function getState() {
     stopped: this.stopped,
     counters: this.counters,
     environment: this.environment.getState(),
-    execution: this.execution && this.execution.getState(),
+    execution: this.execution?.getState(),
     broker: this.broker.getState(true),
   });
 };
@@ -289,8 +289,8 @@ Definition.prototype.cancelActivity = function cancelActivity(message) {
 Definition.prototype.sendMessage = function sendMessage(message) {
   const messageContent = { message };
   let messageType = 'message';
-  const reference = message && message.id && this.getElementById(message.id);
-  if (reference && reference.resolve) {
+  const reference = message?.id && this.getElementById(message.id);
+  if (reference?.resolve) {
     const resolvedReference = reference.resolve(this._createMessage({ message }));
     messageType = resolvedReference.messageType || messageType;
     messageContent.message = { ...message, ...resolvedReference };

package/src/definition/DefinitionExecution.js

@@ -408,7 +408,7 @@ DefinitionExecution.prototype._onProcessMessage = function onProcessMessage(rout
       this[kStatus] = 'executing';
       break;
     case 'process.discarded': {
-      if (inbound && inbound.length) {
+      if (inbound?.length) {
         const calledFrom = inbound[0];
         this._getProcessApi({ content: calledFrom }).cancel({
           executionId: calledFrom.executionId,
@@ -417,7 +417,7 @@ DefinitionExecution.prototype._onProcessMessage = function onProcessMessage(rout
       break;
     }
     case 'process.end': {
-      if (inbound && inbound.length) {
+      if (inbound?.length) {
         const calledFrom = inbound[0];
 
         this._getProcessApi({ content: calledFrom }).signal({
@@ -430,7 +430,7 @@ DefinitionExecution.prototype._onProcessMessage = function onProcessMessage(rout
       break;
     }
     case 'process.error': {
-      if (inbound && inbound.length) {
+      if (inbound?.length) {
         const calledFrom = inbound[0];
 
         this._getProcessApi({ content: calledFrom }).sendApiMessage(
@@ -478,7 +478,7 @@ DefinitionExecution.prototype._onProcessCompleted = function onProcessCompleted(
   message.ack();
   this._debug(`left <${executionId} (${id})> (${type}), pending runs ${this.postponedCount}`);
 
-  if (inbound && inbound.length) {
+  if (inbound?.length) {
     const bp = this._removeProcessByExecutionId(executionId);
     this._deactivateProcess(bp);
   }
@@ -651,7 +651,7 @@ DefinitionExecution.prototype._onDelegateMessage = function onDelegateMessage(ro
   const delegateMessage = executeMessage.content.message;
 
   const reference = this.context.getActivityById(delegateMessage.id);
-  const message = reference && reference.resolve(executeMessage);
+  const message = reference?.resolve(executeMessage);
 
   this._debug(
     `<${reference ? `${messageType} ${delegateMessage.id}>` : `anonymous ${messageType}`} event received from <${content.parent.id}.${content.id}>. Delegating.`,
@@ -710,7 +710,7 @@ DefinitionExecution.prototype._complete = function complete(completionType, cont
   );
 };
 
-DefinitionExecution.prototype._createMessage = function createMessage(content = {}) {
+DefinitionExecution.prototype._createMessage = function createMessage(content) {
   return {
     id: this.id,
     type: this.type,

package/src/error/Errors.js

@@ -6,8 +6,7 @@ class ActivityError extends Error {
     this.type = 'ActivityError';
     this.name = this.constructor.name;
     this.description = description;
-    if (sourceMessage)
-      this.source = cloneMessage(sourceMessage, sourceMessage.content && sourceMessage.content.error && { error: undefined });
+    if (sourceMessage) this.source = cloneMessage(sourceMessage, sourceMessage.content?.error && { error: undefined });
     if (inner) {
       this.inner = inner;
       if (inner.name) this.name = inner.name;
@@ -24,17 +23,14 @@ class RunError extends ActivityError {
 }
 
 class BpmnError extends Error {
-  constructor(description, behaviour = {}, sourceMessage, inner) {
-    const { errorCode } = behaviour;
-
+  constructor(description, behaviour, sourceMessage, inner) {
     super(description);
     this.type = 'BpmnError';
-    this.name = behaviour.name || this.constructor.name;
+    this.name = behaviour?.name ?? this.constructor.name;
     this.description = description;
-    this.code = ('errorCode' in behaviour && errorCode && errorCode.toString()) || behaviour.code;
-    this.id = behaviour.id;
-    if (sourceMessage)
-      this.source = cloneMessage(sourceMessage, sourceMessage.content && sourceMessage.content.error && { error: undefined });
+    this.code = behaviour?.errorCode?.toString() ?? behaviour?.code;
+    this.id = behaviour?.id;
+    if (sourceMessage) this.source = cloneMessage(sourceMessage, sourceMessage.content?.error && { error: undefined });
     if (inner) this.inner = inner;
   }
 }
@@ -47,7 +43,7 @@ function makeErrorFromMessage(errorMessage) {
   if (isKnownError(content)) return content;
 
   const { error } = content;
-  if (!error) return new Error(`Malformatted error message with routing key ${errorMessage.fields && errorMessage.fields.routingKey}`);
+  if (!error) return new Error(`Malformatted error message with routing key ${errorMessage.fields?.routingKey}`);
 
   if (isKnownError(error)) return error;
 

package/src/eventDefinitions/CancelEventDefinition.js

@@ -19,8 +19,7 @@ export default function CancelEventDefinition(activity, eventDefinition) {
 
 Object.defineProperty(CancelEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   },
 });
 

package/src/eventDefinitions/CompensateEventDefinition.js

@@ -30,8 +30,7 @@ export default function CompensateEventDefinition(activity, eventDefinition, con
 
 Object.defineProperty(CompensateEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   },
 });
 
@@ -87,7 +86,7 @@ CompensateEventDefinition.prototype.executeCatch = function executeCatch(execute
 CompensateEventDefinition.prototype.executeThrow = function executeThrow(executeMessage) {
   const executeContent = executeMessage.content;
   const { parent } = executeContent;
-  const parentExecutionId = parent && parent.executionId;
+  const parentExecutionId = parent?.executionId;
 
   this.logger.debug(`<${parentExecutionId} (${this.id})> throw compensate`);
 

package/src/eventDefinitions/ConditionalEventDefinition.js

@@ -20,8 +20,7 @@ export default function ConditionalEventDefinition(activity, eventDefinition, _c
 
 Object.defineProperty(ConditionalEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   },
 });
 
@@ -149,7 +148,7 @@ ConditionalEventDefinition.prototype.getCondition = function getCondition(index)
 };
 
 ConditionalEventDefinition.prototype._onDelegateApiMessage = function onDelegateApiMessage(routingKey, message) {
-  if (message.content.message && message.content.message.id === this.id) {
+  if (message.content.message?.id === this.id) {
     this._onApiMessage(routingKey, message);
   }
 };