bpmn-elements 16.2.0 → 16.2.1

package/src/eventDefinitions/ErrorEventDefinition.js

@@ -38,8 +38,7 @@ export default function ErrorEventDefinition(activity, eventDefinition) {
 
 Object.defineProperty(ErrorEventDefinition.prototype, 'executionId', {
   get() {
-    const message = this[kExecuteMessage];
-    return message && message.content.executionId;
+    return this[kExecuteMessage]?.content.executionId;
   },
 });
 
@@ -53,7 +52,7 @@ ErrorEventDefinition.prototype.executeCatch = function executeCatch(executeMessa
 
   const executeContent = executeMessage.content;
   const { executionId, parent } = executeContent;
-  const parentExecutionId = parent && parent.executionId;
+  const parentExecutionId = parent?.executionId;
 
   const info = (this[kReferenceInfo] = this._getReferenceInfo(executeMessage));
 
@@ -145,7 +144,7 @@ ErrorEventDefinition.prototype._onThrowApiMessage = function onThrowApiMessage(r
   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);
 };
 

package/src/eventDefinitions/EscalationEventDefinition.js

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

package/src/eventDefinitions/LinkEventDefinition.js

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

package/src/eventDefinitions/MessageEventDefinition.js

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

package/src/eventDefinitions/SignalEventDefinition.js

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

package/src/eventDefinitions/TimerEventDefinition.js

@@ -29,8 +29,7 @@ export default function TimerEventDefinition(activity, eventDefinition) {
 Object.defineProperties(TimerEventDefinition.prototype, {
   executionId: {
     get() {
-      const content = this[kTimerContent];
-      return content && content.executionId;
+      return this[kTimerContent]?.executionId;
     },
   },
   stopped: {
@@ -265,7 +264,7 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
     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;
   }
 

package/src/events/BoundaryEvent.js

@@ -29,8 +29,7 @@ export function BoundaryEventBehaviour(activity) {
 Object.defineProperties(BoundaryEventBehaviour.prototype, {
   executionId: {
     get() {
-      const message = this[kExecuteMessage];
-      return message && message.content.executionId;
+      return this[kExecuteMessage]?.content.executionId;
     },
   },
   cancelActivity: {
@@ -113,7 +112,7 @@ BoundaryEventBehaviour.prototype._onCompleted = function onCompleted(_, { conten
   this[kCompleteContent] = content;
 
   const { inbound, executionId } = this[kExecuteMessage].content;
-  const attachedToContent = inbound && inbound[0];
+  const attachedToContent = inbound?.[0];
   const attachedTo = this.attachedTo;
 
   this.activity.logger.debug(

package/src/events/StartEvent.js

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

package/src/flows/Association.js

@@ -39,7 +39,7 @@ 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;
 
@@ -48,7 +48,7 @@ Association.prototype.take = function 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;
 

package/src/flows/SequenceFlow.js

@@ -47,8 +47,8 @@ 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;
@@ -59,7 +59,7 @@ SequenceFlow.prototype.take = function take(content = {}) {
 };
 
 SequenceFlow.prototype.discard = function discard(content = {}) {
-  const { sequenceId = getUniqueId(this.id) } = content;
+  const sequenceId = content?.sequenceId ?? getUniqueId(this.id);
   const discardSequence = (content.discardSequence = (content.discardSequence || []).slice());
   if (discardSequence.indexOf(this.targetId) > -1) {
     ++this[kCounters].looped;

package/src/io/EnvironmentDataObject.js

@@ -10,7 +10,7 @@ export default function EnvironmentDataObject(dataObjectDef, { environment }) {
 
 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/src/io/EnvironmentDataStore.js

@@ -10,7 +10,7 @@ export default function EnvironmentDataStore(dataStoreDef, { environment }) {
 
 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/src/io/EnvironmentDataStoreReference.js

@@ -10,7 +10,7 @@ export default function EnvironmentDataStoreReference(dataObjectDef, { environme
 
 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/src/io/InputOutputSpecification.js

@@ -15,10 +15,10 @@ export default 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), { noAck: true });

package/src/io/Properties.js

@@ -8,18 +8,18 @@ export default function Properties(activity, propertiesDef, context) {
   this.broker = activity.broker;
 
   const props = (this[kProperties] = {
-    properties: [],
-    dataInputObjects: [],
-    dataOutputObjects: [],
+    properties: new Set(),
+    dataInputObjects: new Set(),
+    dataOutputObjects: new Set(),
   });
 
   for (const { id, ...def } of propertiesDef.values) {
     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 = getPropertyValue(def, 'behaviour.dataInput.association.source.dataObject.id');
     const outputDataObjectId = getPropertyValue(def, 'behaviour.dataOutput.association.target.dataObject.id');
@@ -28,28 +28,28 @@ export default function Properties(activity, propertiesDef, context) {
 
     if (inputDataObjectId) {
       const reference = context.getDataObjectById(inputDataObjectId);
-      props.dataInputObjects.push({ id, reference });
+      props.dataInputObjects.add({ id, reference });
       source.input = {
         reference,
       };
     }
     if (outputDataObjectId) {
       const reference = context.getDataObjectById(outputDataObjectId);
-      props.dataOutputObjects.push({ id, reference: reference });
+      props.dataOutputObjects.add({ id, reference: reference });
       source.output = {
         reference,
       };
     }
     if (inputDataStoreId) {
       const reference = context.getDataStoreById(inputDataStoreId);
-      props.dataInputObjects.push({ id, reference });
+      props.dataInputObjects.add({ id, reference });
       source.input = {
         reference,
       };
     }
     if (outputDataStoreId) {
       const reference = context.getDataStoreById(outputDataStoreId);
-      props.dataOutputObjects.push({ id, reference });
+      props.dataOutputObjects.add({ id, reference });
       source.output = {
         reference,
       };
@@ -89,7 +89,7 @@ Properties.prototype._formatOnEnter = function formatOnEnter(message) {
 
   const dataInputObjects = this[kProperties].dataInputObjects;
   const broker = this.broker;
-  if (!dataInputObjects.length) {
+  if (!dataInputObjects.size) {
     return broker.getQueue('format-run-q').queueMessage(
       { routingKey: startRoutingKey },
       {
@@ -107,7 +107,7 @@ Properties.prototype._formatOnEnter = function formatOnEnter(message) {
     },
   );
 
-  return read(broker, dataInputObjects, (_, responses) => {
+  return read(broker, [...dataInputObjects], (_, responses) => {
     broker.publish('format', endRoutingKey, {
       properties: this._getProperties(message, responses),
     });
@@ -122,7 +122,7 @@ Properties.prototype._formatOnComplete = function formatOnComplete(message) {
 
   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) {
     },
   );
 
-  return write(broker, dataOutputObjects, outputProperties, (_, responses) => {
+  return write(broker, [...dataOutputObjects], outputProperties, (_, responses) => {
     broker.publish('format', endRoutingKey, {
       properties: this._getProperties(message, responses),
     });
@@ -187,7 +187,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/src/process/Process.js

@@ -68,8 +68,7 @@ Object.defineProperties(Process.prototype, {
   },
   lanes: {
     get() {
-      const lanes = this[kLanes];
-      return lanes && lanes.slice();
+      return this[kLanes]?.slice();
     },
   },
   extensions: {
@@ -106,8 +105,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';
     },
   },
 });
@@ -160,7 +158,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(),
   };
 };
 
@@ -372,11 +370,11 @@ 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 &&

package/src/process/ProcessExecution.js

@@ -34,8 +34,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: {},
   };
@@ -126,7 +126,7 @@ ProcessExecution.prototype.resume = function resume() {
 
   const { startActivities, detachedActivities, postponed } = this[kElements];
 
-  if (startActivities.length > 1) {
+  if (startActivities.size > 1) {
     for (const a of startActivities) a.shake();
   }
 
@@ -185,7 +185,7 @@ ProcessExecution.prototype.getState = function getState() {
     }, []),
     ...(flows.length && { 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) }),
   };
@@ -370,7 +370,7 @@ ProcessExecution.prototype._start = function start() {
   this.broker.publish(this._exchangeName, 'execute.start', cloneContent(executeContent));
 
   const { startActivities, postponed, detachedActivities } = this[kElements];
-  if (startActivities.length > 1) {
+  if (startActivities.size > 1) {
     for (const a of startActivities) a.shake();
   }
 
@@ -430,8 +430,8 @@ ProcessExecution.prototype._activate = function activate() {
     });
   }
 
-  startActivities.splice(0);
-  triggeredByEvent.splice(0);
+  startActivities.clear();
+  triggeredByEvent.clear();
 
   for (const activity of children) {
     if (activity.placeholder) continue;
@@ -441,8 +441,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;
@@ -483,14 +483,14 @@ ProcessExecution.prototype._onDelegateEvent = function onDelegateEvent(message)
   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, referenceType: eventType }).length) {
+    if (activity.getStartActivities({ referenceId: content.message?.id, referenceType: eventType }).length) {
       delegate = false;
       activity.run(content.message);
     }
@@ -607,7 +607,7 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
     case 'activity.error': {
       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;
         }
@@ -693,7 +693,7 @@ ProcessExecution.prototype._onChildCompleted = function onChildCompleted(message
     );
   }
 
-  if (isEnd && startActivities.length) {
+  if (isEnd && startActivities.size) {
     const startSequences = this[kElements].startSequences;
     for (const msg of postponed) {
       const postponedId = msg.content.id;

package/src/tasks/ServiceTask.js

@@ -73,7 +73,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`);
     }
   }