bpmn-elements 16.2.1 → 17.0.0

package/src/definition/DefinitionExecution.js

@@ -439,7 +439,7 @@ DefinitionExecution.prototype._onProcessMessage = function onProcessMessage(rout
             executionId: calledFrom.executionId,
             error: content.error,
           },
-          { mandatory: true, type: 'error' },
+          { mandatory: true, type: 'error' }
         );
       } else {
         for (const bp of new Set(this[kProcesses].running)) {
@@ -502,7 +502,7 @@ DefinitionExecution.prototype._onStopped = function onStopped(message) {
     cloneContent(this[kExecuteMessage].content, {
       ...message.content,
     }),
-    { type: 'stopped', persistent: false },
+    { type: 'stopped', persistent: false }
   );
 };
 
@@ -563,7 +563,7 @@ DefinitionExecution.prototype._onMessageOutbound = function onMessageOutbound(ro
 
   this._debug(
     `conveying message from <${source.processId}.${source.id}> to`,
-    target.id ? `<${target.processId}.${target.id}>` : `<${target.processId}>`,
+    target.id ? `<${target.processId}.${target.id}>` : `<${target.processId}>`
   );
 
   const targetProcesses = this.getProcessesById(target.processId);
@@ -654,7 +654,7 @@ DefinitionExecution.prototype._onDelegateMessage = function onDelegateMessage(ro
   const message = reference?.resolve(executeMessage);
 
   this._debug(
-    `<${reference ? `${messageType} ${delegateMessage.id}>` : `anonymous ${messageType}`} event received from <${content.parent.id}.${content.id}>. Delegating.`,
+    `<${reference ? `${messageType} ${delegateMessage.id}>` : `anonymous ${messageType}`} event received from <${content.parent.id}.${content.id}>. Delegating.`
   );
 
   this.getApi().sendApiMessage(
@@ -669,7 +669,7 @@ DefinitionExecution.prototype._onDelegateMessage = function onDelegateMessage(ro
       message,
       originalMessage: content.message,
     },
-    { delegate: true, type: messageType },
+    { delegate: true, type: messageType }
   );
 
   this.broker.publish(
@@ -678,7 +678,7 @@ DefinitionExecution.prototype._onDelegateMessage = function onDelegateMessage(ro
     this._createMessage({
       message: message && cloneContent(message),
     }),
-    { type: messageType },
+    { type: messageType }
   );
 };
 
@@ -706,7 +706,7 @@ DefinitionExecution.prototype._complete = function complete(completionType, cont
       ...content,
       state: completionType,
     },
-    { type: completionType, mandatory: completionType === 'error', ...options },
+    { type: completionType, mandatory: completionType === 'error', ...options }
   );
 };
 

package/src/error/Errors.js

@@ -1,6 +1,6 @@
 import { cloneMessage } from '../messageHelper.js';
 
-class ActivityError extends Error {
+export class ActivityError extends Error {
   constructor(description, sourceMessage, inner) {
     super(description);
     this.type = 'ActivityError';
@@ -15,14 +15,14 @@ class ActivityError extends Error {
   }
 }
 
-class RunError extends ActivityError {
+export class RunError extends ActivityError {
   constructor(...args) {
     super(...args);
     this.type = 'RunError';
   }
 }
 
-class BpmnError extends Error {
+export class BpmnError extends Error {
   constructor(description, behaviour, sourceMessage, inner) {
     super(description);
     this.type = 'BpmnError';
@@ -35,9 +35,7 @@ class BpmnError extends Error {
   }
 }
 
-export { ActivityError, BpmnError, RunError, makeErrorFromMessage };
-
-function makeErrorFromMessage(errorMessage) {
+export function makeErrorFromMessage(errorMessage) {
   const { content } = errorMessage;
 
   if (isKnownError(content)) return content;
@@ -52,13 +50,13 @@ function makeErrorFromMessage(errorMessage) {
       return new ActivityError(
         error.message || error.description,
         error.source,
-        error.inner ? error.inner : { code: error.code, name: error.name },
+        error.inner ? error.inner : { code: error.code, name: error.name }
       );
     case 'RunError':
       return new RunError(
         error.message || error.description,
         error.source,
-        error.inner ? error.inner : { code: error.code, name: error.name },
+        error.inner ? error.inner : { code: error.code, name: error.name }
       );
     case 'BpmnError':
       return new BpmnError(error.message || error.description, error, error.source);

package/src/eventDefinitions/CancelEventDefinition.js

@@ -56,7 +56,7 @@ CancelEventDefinition.prototype.executeCatch = function executeCatch(executeMess
       pattern: 'activity.execution.cancel',
       exchange: 'execution',
       expectRoutingKey,
-    }),
+    })
   );
 
   const waitContent = cloneContent(executeContent, {

package/src/eventDefinitions/CompensateEventDefinition.js

@@ -79,7 +79,7 @@ CompensateEventDefinition.prototype.executeCatch = function executeCatch(execute
       sourceExchange: 'execution',
       bindExchange: 'compensate',
       expect: 'compensate',
-    }),
+    })
   );
 };
 

package/src/eventDefinitions/ConditionalEventDefinition.js

@@ -95,7 +95,7 @@ ConditionalEventDefinition.prototype.evaluateCallback = function evaluateCallbac
     return broker.publish(
       'execution',
       'execute.error',
-      cloneContent(executeContent, { error: new ActivityError(err.message, executeMessage, err) }, { mandatory: true }),
+      cloneContent(executeContent, { error: new ActivityError(err.message, executeMessage, err) }, { mandatory: true })
     );
   }
 
@@ -106,7 +106,7 @@ ConditionalEventDefinition.prototype.evaluateCallback = function evaluateCallbac
     'activity.condition',
     cloneContent(this[kExecuteMessage].content, {
       conditionResult: result,
-    }),
+    })
   );
 
   if (!result) return;

package/src/eventDefinitions/ErrorEventDefinition.js

@@ -85,7 +85,7 @@ ErrorEventDefinition.prototype.executeCatch = function executeCatch(executeMessa
         exchange: 'execution',
         expectRoutingKey,
         expect: { ...info.message },
-      }),
+      })
     );
 
     if (this[kCompleted]) return this._stop();
@@ -123,7 +123,7 @@ ErrorEventDefinition.prototype.executeThrow = function executeThrow(executeMessa
     'execute.completed',
     cloneContent(executeContent, {
       message: { ...info.message },
-    }),
+    })
   );
 };
 
@@ -178,7 +178,7 @@ ErrorEventDefinition.prototype._catchError = function catchError(routingKey, mes
       output: error,
       cancelActivity: true,
       state: 'catch',
-    }),
+    })
   );
 };
 

package/src/eventDefinitions/LinkEventDefinition.js

@@ -168,7 +168,7 @@ LinkEventDefinition.prototype._onDiscard = function onDiscard(_, message) {
       message: { ...this.reference },
       state: 'discard',
     }),
-    { type: 'link', delegate: true },
+    { type: 'link', delegate: true }
   );
 };
 

package/src/eventDefinitions/MessageEventDefinition.js

@@ -124,7 +124,7 @@ MessageEventDefinition.prototype._onCatchMessage = function onCatchMessage(routi
     {
       correlationId,
       type,
-    },
+    }
   );
 
   this._complete('caught', message.content.message, { correlationId });
@@ -171,7 +171,7 @@ MessageEventDefinition.prototype._complete = function complete(verb, output, opt
       output,
       state: 'catch',
     }),
-    options,
+    options
   );
 };
 

package/src/eventDefinitions/SignalEventDefinition.js

@@ -128,7 +128,7 @@ SignalEventDefinition.prototype._onCatchMessage = function onCatchMessage(routin
     {
       correlationId,
       type,
-    },
+    }
   );
 
   return this._complete(message.content.message, message.properties);
@@ -164,7 +164,7 @@ SignalEventDefinition.prototype._complete = function complete(output, options) {
       output,
       state: 'signal',
     }),
-    options,
+    options
   );
 };
 

package/src/eventDefinitions/TimerEventDefinition.js

@@ -153,7 +153,7 @@ TimerEventDefinition.prototype._onDelegatedApiMessage = function onDelegatedApiM
         ...content.message,
       },
     }),
-    { correlationId, type },
+    { correlationId, type }
   );
 
   return this._onApiMessage(routingKey, message);
@@ -170,7 +170,7 @@ TimerEventDefinition.prototype._onApiMessage = function onApiMessage(routingKey,
           state: 'cancel',
           ...(message.content.message && { message: message.content.message }),
         },
-        { correlationId },
+        { correlationId }
       );
     }
     case 'stop': {

package/src/events/BoundaryEvent.js

@@ -105,7 +105,7 @@ BoundaryEventBehaviour.prototype._onCompleted = function onCompleted(_, { conten
     return this.broker.publish(
       'execution',
       'execute.completed',
-      cloneContent(content, { isDefinitionScope: false, cancelActivity: false }),
+      cloneContent(content, { isDefinitionScope: false, cancelActivity: false })
     );
   }
 
@@ -116,7 +116,7 @@ BoundaryEventBehaviour.prototype._onCompleted = function onCompleted(_, { conten
   const attachedTo = this.attachedTo;
 
   this.activity.logger.debug(
-    `<${executionId} (${this.id})> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`,
+    `<${executionId} (${this.id})> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`
   );
 
   if (content.isRecovered && !attachedTo.isRunning) {
@@ -128,7 +128,7 @@ BoundaryEventBehaviour.prototype._onCompleted = function onCompleted(_, { conten
       () => {
         attachedTo.getApi({ content: attachedToContent }).discard();
       },
-      { consumerTag: attachedExecuteTag },
+      { consumerTag: attachedExecuteTag }
     );
   } else {
     attachedTo.getApi({ content: attachedToContent }).discard();
@@ -165,7 +165,7 @@ BoundaryEventBehaviour.prototype._onExpectMessage = function onExpectMessage(_,
       noAck: true,
       consumerTag: errorConsumerTag,
       priority: 400,
-    },
+    }
   );
 };
 
@@ -195,7 +195,7 @@ BoundaryEventBehaviour.prototype._onDetachMessage = function onDetachMessage(_,
     },
     {
       cloneMessage,
-    },
+    }
   );
 
   const detachContent = cloneContent(content, {
@@ -215,7 +215,7 @@ BoundaryEventBehaviour.prototype._onDetachMessage = function onDetachMessage(_,
     },
     {
       consumerTag: `_execution-completed-${executionId}`,
-    },
+    }
   );
 };
 

package/src/events/IntermediateCatchEvent.js

@@ -43,7 +43,7 @@ IntermediateCatchEventBehaviour.prototype._onApiMessage = function onApiMessage(
         'execute.completed',
         cloneContent(executeMessage.content, {
           output: message.content.message,
-        }),
+        })
       );
     }
     case 'discard': {

package/src/events/StartEvent.js

@@ -64,7 +64,7 @@ StartEventBehaviour.prototype._onApiMessage = function onApiMessage(routingKey,
           output: message.content.message,
           state: 'signal',
         }),
-        { correlationId },
+        { correlationId }
       );
     }
     case 'discard': {
@@ -97,7 +97,7 @@ StartEventBehaviour.prototype._onDelegatedApiMessage = function onDelegatedApiMe
     {
       correlationId,
       type,
-    },
+    }
   );
 
   return this._onApiMessage(routingKey, message);

package/src/flows/MessageFlow.js

@@ -80,7 +80,7 @@ MessageFlow.prototype._onSourceEnd = function onSourceEnd({ content }) {
   const source = this.source;
   const target = this.target;
   this.logger.debug(
-    `<${this.id}> sending message from <${source.processId}.${source.id}> to <${target.id ? `${target.processId}.${target.id}` : target.processId}>`,
+    `<${this.id}> sending message from <${source.processId}.${source.id}> to <${target.id ? `${target.processId}.${target.id}` : target.processId}>`
   );
   this.broker.publish('event', 'message.outbound', this._createMessageContent(content.message));
 };

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

@@ -71,7 +71,7 @@ IoSpecification.prototype._onFormatEnter = function onFormatOnEnter() {
     {
       dataObjects: [],
       sources: [],
-    },
+    }
   );
 
   if (!dataObjects.length) {
@@ -135,7 +135,7 @@ IoSpecification.prototype._onFormatComplete = function formatOnComplete(message)
     {
       dataObjects: [],
       sources: [],
-    },
+    }
   );
 
   const startRoutingKey = `run.onend.${safeType}`;

package/src/io/Properties.js

@@ -94,7 +94,7 @@ Properties.prototype._formatOnEnter = function formatOnEnter(message) {
       { routingKey: startRoutingKey },
       {
         properties: this._getProperties(message),
-      },
+      }
     );
   }
 
@@ -104,7 +104,7 @@ Properties.prototype._formatOnEnter = function formatOnEnter(message) {
     {
       endRoutingKey,
       properties: this._getProperties(message),
-    },
+    }
   );
 
   return read(broker, [...dataInputObjects], (_, responses) => {
@@ -127,7 +127,7 @@ Properties.prototype._formatOnComplete = function formatOnComplete(message) {
       { routingKey: startRoutingKey },
       {
         properties: outputProperties,
-      },
+      }
     );
   }
 
@@ -137,7 +137,7 @@ Properties.prototype._formatOnComplete = function formatOnComplete(message) {
     {
       endRoutingKey,
       properties: outputProperties,
-    },
+    }
   );
 
   return write(broker, [...dataOutputObjects], outputProperties, (_, responses) => {

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

@@ -274,7 +274,7 @@ Process.prototype._onRunMessage = function onRunMessage(routingKey, message) {
         'error',
         cloneContent(content, {
           error: fields.redelivered ? makeErrorFromMessage(message) : content.error,
-        }),
+        })
       );
       break;
     }

package/src/process/ProcessExecution.js

@@ -266,7 +266,7 @@ ProcessExecution.prototype.shake = function shake(fromId) {
         }
       }
     },
-    { noAck: true, consumerTag: `_shaker-${this.executionId}` },
+    { noAck: true, consumerTag: `_shaker-${this.executionId}` }
   );
 
   for (const a of toShake) a.shake();
@@ -301,7 +301,7 @@ ProcessExecution.prototype.discard = function discard() {
       type: this.type,
       executionId: this.executionId,
     },
-    { type: 'discard' },
+    { type: 'discard' }
   );
 };
 
@@ -313,7 +313,7 @@ ProcessExecution.prototype.cancel = function discard() {
       type: this.type,
       executionId: this.executionId,
     },
-    { type: 'cancel' },
+    { type: 'cancel' }
   );
 };
 
@@ -689,7 +689,7 @@ ProcessExecution.prototype._onChildCompleted = function onChildCompleted(message
         type: this.type,
         executionId: this.executionId,
       },
-      { type: 'cancel' },
+      { type: 'cancel' }
     );
   }
 
@@ -722,7 +722,7 @@ ProcessExecution.prototype._stopExecution = function stopExecution(message) {
       ...this[kExecuteMessage].content,
       ...(message && message.content),
     },
-    { type: 'stopped', persistent: false },
+    { type: 'stopped', persistent: false }
   );
 };
 
@@ -760,7 +760,7 @@ ProcessExecution.prototype._onCancel = function onCancel() {
       'transaction.cancel',
       cloneMessage(this[kExecuteMessage], {
         state: 'cancel',
-      }),
+      })
     );
 
     for (const msg of running) {
@@ -817,7 +817,7 @@ ProcessExecution.prototype._delegateApiMessage = function delegateApiMessage(rou
         this._debug(`delegated api message was consumed by ${msg.content ? msg.content.executionId : 'unknown'}`);
       }
     },
-    { consumerTag: `_ct-delegate-${correlationId}`, noAck: true },
+    { consumerTag: `_ct-delegate-${correlationId}`, noAck: true }
   );
 
   for (const child of this[kElements].children) {
@@ -858,7 +858,7 @@ ProcessExecution.prototype._complete = function complete(completionType, content
       ...content,
       state: completionType,
     }),
-    { type: completionType, mandatory: completionType === 'error' },
+    { type: completionType, mandatory: completionType === 'error' }
   );
 };
 

package/src/tasks/CallActivity.js

@@ -8,7 +8,6 @@ export default function CallActivity(activityDef, context) {
 
 export function CallActivityBehaviour(activity) {
   const { id, type, behaviour = {} } = activity;
-
   this.id = id;
   this.type = type;
   this.calledElement = behaviour.calledElement;
@@ -40,8 +39,8 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
         },
         {
           mandatory: true,
-        },
-      ),
+        }
+      )
     );
   }
 
@@ -56,11 +55,15 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
       noAck: true,
       consumerTag: `_api-${executionId}`,
       priority: 300,
-    },
+    }
   );
   broker.subscribeTmp('api', '#.signal.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
     noAck: true,
-    consumerTag: `_api-delegated-${executionId}`,
+    consumerTag: `_api-delegated-signal-${executionId}`,
+  });
+  broker.subscribeTmp('api', '#.cancel.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
+    noAck: true,
+    consumerTag: `_api-delegated-cancel-${executionId}`,
   });
 
   broker.publish(
@@ -72,7 +75,7 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
     }),
     {
       type: 'call',
-    },
+    }
   );
 };
 
@@ -80,7 +83,7 @@ CallActivityBehaviour.prototype._onDelegatedApiMessage = function onDelegatedApi
   calledElement,
   executeMessage,
   routingKey,
-  message,
+  message
 ) {
   if (!message.properties.delegate) return;
   const { content: delegateContent } = message;
@@ -103,7 +106,7 @@ CallActivityBehaviour.prototype._onDelegatedApiMessage = function onDelegatedApi
     {
       correlationId,
       type: messageType,
-    },
+    }
   );
 
   return this._onApiMessage(calledElement, executeMessage, routingKey, message);
@@ -126,7 +129,7 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
         }),
         {
           type: 'cancel',
-        },
+        }
       );
     }
     case 'signal':
@@ -140,7 +143,7 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
         }),
         {
           correlationId,
-        },
+        }
       );
     case 'error':
       this._stop(executeContent.executionId);
@@ -155,8 +158,8 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
           {
             mandatory: true,
             correlationId,
-          },
-        ),
+          }
+        )
       );
     case 'discard':
       return this.broker.publish(
@@ -168,7 +171,7 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
         }),
         {
           type: 'discard',
-        },
+        }
       );
   }
 };
@@ -176,5 +179,6 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
 CallActivityBehaviour.prototype._stop = function stop(executionId) {
   const broker = this.broker;
   broker.cancel(`_api-${executionId}`);
-  broker.cancel(`_api-delegated-${executionId}`);
+  broker.cancel(`_api-delegated-signal-${executionId}`);
+  broker.cancel(`_api-delegated-cancel-${executionId}`);
 };

package/src/tasks/LoopCharacteristics.js

@@ -326,7 +326,7 @@ Characteristics.prototype.subscribe = function subscribe(onIterationCompleteMess
     `activity.*.${this.parentExecutionId}`,
     this.onApiMessage,
     { noAck: true, consumerTag: '_api-multi-instance-tag' },
-    { priority: 400 },
+    { priority: 400 }
   );
   this.broker.subscribeTmp('execution', 'execute.*', onComplete, {
     noAck: true,

package/src/tasks/ReceiveTask.js

@@ -163,7 +163,7 @@ ReceiveTaskExecution.prototype._setupMessageHandling = function setupMessageHand
     },
     {
       noAck: true,
-    },
+    }
   );
   broker.subscribeTmp('api', `activity.stop.${executionId}`, this._onStopApiMessage.bind(this), {
     noAck: true,
@@ -180,7 +180,7 @@ ReceiveTaskExecution.prototype._setupMessageHandling = function setupMessageHand
     },
     {
       noAck: true,
-    },
+    }
   );
 };