bpmn-elements 16.1.0 → 16.2.1

package/dist/error/Errors.js

@@ -12,7 +12,7 @@ class ActivityError extends Error {
     this.type = 'ActivityError';
     this.name = this.constructor.name;
     this.description = description;
-    if (sourceMessage) this.source = (0, _messageHelper.cloneMessage)(sourceMessage, sourceMessage.content && sourceMessage.content.error && {
+    if (sourceMessage) this.source = (0, _messageHelper.cloneMessage)(sourceMessage, sourceMessage.content?.error && {
       error: undefined
     });
     if (inner) {
@@ -31,17 +31,14 @@ class RunError extends ActivityError {
 }
 exports.RunError = RunError;
 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 = (0, _messageHelper.cloneMessage)(sourceMessage, sourceMessage.content && sourceMessage.content.error && {
+    this.code = behaviour?.errorCode?.toString() ?? behaviour?.code;
+    this.id = behaviour?.id;
+    if (sourceMessage) this.source = (0, _messageHelper.cloneMessage)(sourceMessage, sourceMessage.content?.error && {
       error: undefined
     });
     if (inner) this.inner = inner;
@@ -56,7 +53,7 @@ function makeErrorFromMessage(errorMessage) {
   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;
   switch (error.type) {
     case 'ActivityError':

package/dist/eventDefinitions/CancelEventDefinition.js

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

package/dist/eventDefinitions/CompensateEventDefinition.js

@@ -47,8 +47,7 @@ function CompensateEventDefinition(activity, eventDefinition, context) {
 }
 Object.defineProperty(CompensateEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   }
 });
 CompensateEventDefinition.prototype.execute = function execute(executeMessage) {
@@ -95,7 +94,7 @@ CompensateEventDefinition.prototype.executeThrow = function executeThrow(execute
   const {
     parent
   } = executeContent;
-  const parentExecutionId = parent && parent.executionId;
+  const parentExecutionId = parent?.executionId;
   this.logger.debug(`<${parentExecutionId} (${this.id})> throw compensate`);
   const broker = this.broker;
   const throwContent = (0, _messageHelper.cloneContent)(executeContent, {

package/dist/eventDefinitions/ConditionalEventDefinition.js

@@ -29,8 +29,7 @@ function ConditionalEventDefinition(activity, eventDefinition, _context, index)
 }
 Object.defineProperty(ConditionalEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   }
 });
 ConditionalEventDefinition.prototype.execute = function execute(executeMessage) {
@@ -151,7 +150,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);
   }
 };

package/dist/eventDefinitions/ErrorEventDefinition.js

@@ -51,8 +51,7 @@ function ErrorEventDefinition(activity, eventDefinition) {
 }
 Object.defineProperty(ErrorEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   }
 });
 ErrorEventDefinition.prototype.execute = function execute(executeMessage) {
@@ -66,7 +65,7 @@ ErrorEventDefinition.prototype.executeCatch = function executeCatch(executeMessa
     executionId,
     parent
   } = executeContent;
-  const parentExecutionId = parent && parent.executionId;
+  const parentExecutionId = parent?.executionId;
   const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
   this[kMessageQ].consume(this._onThrowApiMessage.bind(this), {
     noAck: true,
@@ -143,7 +142,7 @@ ErrorEventDefinition.prototype._onThrowApiMessage = function onThrowApiMessage(r
   const error = message.content.message;
   if (!this[kReferenceElement]) return this._catchError(routingKey, message, error);
   const info = this[kReferenceInfo];
-  if (info.message.id !== (error && error.id)) return;
+  if (info.message.id !== error?.id) return;
   return this._catchError(routingKey, message, error);
 };
 ErrorEventDefinition.prototype._catchError = function catchError(routingKey, message, error) {

package/dist/eventDefinitions/EscalationEventDefinition.js

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

package/dist/eventDefinitions/LinkEventDefinition.js

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

package/dist/eventDefinitions/MessageEventDefinition.js

@@ -51,8 +51,7 @@ function MessageEventDefinition(activity, eventDefinition) {
 }
 Object.defineProperty(MessageEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   }
 });
 MessageEventDefinition.prototype.execute = function execute(executeMessage) {
@@ -66,7 +65,7 @@ MessageEventDefinition.prototype.executeCatch = function executeCatch(executeMes
     executionId,
     parent
   } = executeContent;
-  const parentExecutionId = parent && parent.executionId;
+  const parentExecutionId = parent?.executionId;
   const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
   this._debug(`expect ${info.description}`);
   const broker = this.broker;

package/dist/eventDefinitions/SignalEventDefinition.js

@@ -52,8 +52,7 @@ function SignalEventDefinition(activity, eventDefinition) {
 }
 Object.defineProperty(SignalEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   }
 });
 SignalEventDefinition.prototype.execute = function execute(executeMessage) {
@@ -67,7 +66,7 @@ SignalEventDefinition.prototype.executeCatch = function executeCatch(executeMess
     executionId,
     parent
   } = executeContent;
-  const parentExecutionId = parent && parent.executionId;
+  const parentExecutionId = parent?.executionId;
   const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
   const broker = this.broker;
   const onCatchMessage = this._onCatchMessage.bind(this);

package/dist/eventDefinitions/TimerEventDefinition.js

@@ -32,8 +32,7 @@ function TimerEventDefinition(activity, eventDefinition) {
 Object.defineProperties(TimerEventDefinition.prototype, {
   executionId: {
     get() {
-      const content = this[kTimerContent];
-      return content && content.executionId;
+      return this[kTimerContent]?.executionId;
     }
   },
   stopped: {
@@ -262,7 +261,7 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
   } else if (!Object.keys(result).length) {
     result.timeout = 0;
   }
-  if (content.inbound && 'repeat' in content.inbound[0]) {
+  if (content.inbound?.[0] && 'repeat' in content.inbound[0]) {
     result.repeat = content.inbound[0].repeat;
   }
   return result;

package/dist/events/BoundaryEvent.js

@@ -32,8 +32,7 @@ function BoundaryEventBehaviour(activity) {
 Object.defineProperties(BoundaryEventBehaviour.prototype, {
   executionId: {
     get() {
-      const message = this[kExecuteMessage];
-      return message && message.content.executionId;
+      return this[kExecuteMessage]?.content.executionId;
     }
   },
   cancelActivity: {
@@ -114,7 +113,7 @@ BoundaryEventBehaviour.prototype._onCompleted = function onCompleted(_, {
     inbound,
     executionId
   } = this[kExecuteMessage].content;
-  const attachedToContent = inbound && inbound[0];
+  const attachedToContent = inbound?.[0];
   const attachedTo = this.attachedTo;
   this.activity.logger.debug(`<${executionId} (${this.id})> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`);
   if (content.isRecovered && !attachedTo.isRunning) {

package/dist/events/StartEvent.js

@@ -23,8 +23,7 @@ function StartEventBehaviour(activity) {
 }
 Object.defineProperty(StartEventBehaviour.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   }
 });
 StartEventBehaviour.prototype.execute = function execute(executeMessage) {

package/dist/flows/Association.js

@@ -58,13 +58,13 @@ Object.defineProperty(Association.prototype, 'counters', {
     };
   }
 });
-Association.prototype.take = function take(content = {}) {
+Association.prototype.take = function take(content) {
   this.logger.debug(`<${this.id}> take target <${this.targetId}>`);
   ++this[kCounters].take;
   this._publishEvent('take', content);
   return true;
 };
-Association.prototype.discard = function discard(content = {}) {
+Association.prototype.discard = function discard(content) {
   this.logger.debug(`<${this.id}> discard target <${this.targetId}>`);
   ++this[kCounters].discard;
   this._publishEvent('discard', content);

package/dist/flows/SequenceFlow.js

@@ -66,19 +66,15 @@ Object.defineProperty(SequenceFlow.prototype, 'counters', {
     };
   }
 });
-SequenceFlow.prototype.take = function take(content = {}) {
-  const {
-    sequenceId
-  } = content;
+SequenceFlow.prototype.take = function take(content) {
+  const sequenceId = content?.sequenceId;
   this.logger.debug(`<${sequenceId} (${this.id})> take, target <${this.targetId}>`);
   ++this[kCounters].take;
   this._publishEvent('take', content);
   return true;
 };
 SequenceFlow.prototype.discard = function discard(content = {}) {
-  const {
-    sequenceId = (0, _shared.getUniqueId)(this.id)
-  } = content;
+  const sequenceId = content?.sequenceId ?? (0, _shared.getUniqueId)(this.id);
   const discardSequence = content.discardSequence = (content.discardSequence || []).slice();
   if (discardSequence.indexOf(this.targetId) > -1) {
     ++this[kCounters].looped;

package/dist/gateways/EventBasedGateway.js

@@ -19,7 +19,7 @@ function EventBasedGatewayBehaviour(activity, context) {
   this.activity = activity;
   this.broker = activity.broker;
   this.context = context;
-  this[kTargets] = activity.outbound.map(flow => context.getActivityById(flow.targetId));
+  this[kTargets] = new Set(activity.outbound.map(flow => context.getActivityById(flow.targetId)));
 }
 EventBasedGatewayBehaviour.prototype.execute = function execute(executeMessage) {
   const executeContent = executeMessage.content;
@@ -30,7 +30,7 @@ EventBasedGatewayBehaviour.prototype.execute = function execute(executeMessage)
   } = executeContent;
   const targets = this[kTargets];
   this[kCompleted] = false;
-  if (!targets.length) return this._complete(executeContent);
+  if (!targets.size) return this._complete(executeContent);
   for (const flow of this.activity.outbound) {
     outbound.push({
       id: flow.id,
@@ -50,9 +50,11 @@ EventBasedGatewayBehaviour.prototype.execute = function execute(executeMessage)
     consumerTag: '_api-stop-execution'
   });
   this[kCompleted] = false;
-  if (!executeMessage.fields.redelivered) return broker.publish('execution', 'execute.outbound.take', (0, _messageHelper.cloneContent)(executeContent, {
-    outboundTaken: true
-  }));
+  if (!executeMessage.fields.redelivered) {
+    return broker.publish('execution', 'execute.outbound.take', (0, _messageHelper.cloneContent)(executeContent, {
+      outboundTaken: true
+    }));
+  }
 };
 EventBasedGatewayBehaviour.prototype._onTargetCompleted = function onTargetCompleted(executeMessage, _, message, owner) {
   const {

package/dist/io/EnvironmentDataObject.js

@@ -23,7 +23,7 @@ function EnvironmentDataObject(dataObjectDef, {
 }
 EnvironmentDataObject.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
   const environment = this.environment;
-  const value = environment.variables._data && environment.variables._data[this.id];
+  const value = environment.variables._data?.[this.id];
   const content = this._createContent(value);
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };

package/dist/io/EnvironmentDataStore.js

@@ -23,7 +23,7 @@ function EnvironmentDataStore(dataStoreDef, {
 }
 EnvironmentDataStore.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
   const environment = this.environment;
-  const value = environment.variables._data && environment.variables._data[this.id];
+  const value = environment.variables._data?.[this.id];
   const content = this._createContent(value);
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };

package/dist/io/EnvironmentDataStoreReference.js

@@ -23,7 +23,7 @@ function EnvironmentDataStoreReference(dataObjectDef, {
 }
 EnvironmentDataStoreReference.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
   const environment = this.environment;
-  const value = environment.variables._data && environment.variables._data[this.id];
+  const value = environment.variables._data?.[this.id];
   const content = this._createContent(value);
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };

package/dist/io/InputOutputSpecification.js

@@ -23,10 +23,10 @@ function IoSpecification(activity, ioSpecificationDef, context) {
 }
 IoSpecification.prototype.activate = function activate(message) {
   if (this[kConsuming]) return;
-  if (message && message.fields.redelivered && message.fields.routingKey === 'run.start') {
+  if (message?.fields.redelivered && message.fields.routingKey === 'run.start') {
     this._onFormatEnter();
   }
-  if (message && message.fields.redelivered && message.fields.routingKey === 'run.end') {
+  if (message?.fields.redelivered && message.fields.routingKey === 'run.end') {
     this._onFormatComplete(message);
   }
   this[kConsuming] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {

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.1.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;