bpmn-elements 16.2.0 → 16.2.2

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

@@ -1,13 +1,12 @@
 import { cloneMessage } from '../messageHelper.js';
 
-class ActivityError extends Error {
+export class ActivityError extends Error {
   constructor(description, sourceMessage, inner) {
     super(description);
     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;
@@ -16,38 +15,33 @@ class ActivityError extends Error {
   }
 }
 
-class RunError extends ActivityError {
+export class RunError extends ActivityError {
   constructor(...args) {
     super(...args);
     this.type = 'RunError';
   }
 }
 
-class BpmnError extends Error {
-  constructor(description, behaviour = {}, sourceMessage, inner) {
-    const { errorCode } = behaviour;
-
+export class BpmnError extends Error {
+  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;
   }
 }
 
-export { ActivityError, BpmnError, RunError, makeErrorFromMessage };
-
-function makeErrorFromMessage(errorMessage) {
+export function makeErrorFromMessage(errorMessage) {
   const { content } = 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);
   }
 };

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/getPropertyValue.js

@@ -3,9 +3,7 @@ const stringConstantPattern = /^(['"])(.*)\1$/;
 const numberConstantPattern = /^\W*-?\d+(.\d+)?\W*$/;
 const negativeIndexPattern = /^-\d+$/;
 
-export default getPropertyValue;
-
-function getPropertyValue(inputContext, propertyPath, fnScope) {
+export default function getPropertyValue(inputContext, propertyPath, fnScope) {
   if (!inputContext) return;
 
   let resultValue;

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/messageHelper.js

@@ -1,6 +1,4 @@
-export { cloneContent, cloneMessage, cloneParent, shiftParent, unshiftParent, pushParent };
-
-function cloneContent(content, extend) {
+export function cloneContent(content, extend) {
   const { discardSequence, inbound, outbound, parent, sequence } = content;
 
   const clone = {
@@ -27,7 +25,7 @@ function cloneContent(content, extend) {
   return clone;
 }
 
-function cloneMessage(message, overrideContent) {
+export function cloneMessage(message, overrideContent) {
   return {
     fields: { ...message.fields },
     content: cloneContent(message.content, overrideContent),
@@ -35,7 +33,7 @@ function cloneMessage(message, overrideContent) {
   };
 }
 
-function cloneParent(parent) {
+export function cloneParent(parent) {
   const { path } = parent;
   const clone = { ...parent };
   if (!path) return clone;
@@ -47,7 +45,7 @@ function cloneParent(parent) {
   return clone;
 }
 
-function unshiftParent(parent, adoptingParent) {
+export function unshiftParent(parent, adoptingParent) {
   const { id, type, executionId } = adoptingParent;
   if (!parent) {
     return {
@@ -69,7 +67,7 @@ function unshiftParent(parent, adoptingParent) {
   return clone;
 }
 
-function shiftParent(parent) {
+export function shiftParent(parent) {
   if (!parent) return;
   if (!parent.path || !parent.path.length) return;
 
@@ -82,7 +80,7 @@ function shiftParent(parent) {
   return clone;
 }
 
-function pushParent(parent, ancestor) {
+export function pushParent(parent, ancestor) {
   const { id, type, executionId } = ancestor;
   if (!parent) return { id, type, executionId };
 

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 &&