bpmn-elements 13.1.1 → 13.2.0

package/src/activity/ActivityExecution.js

@@ -1,5 +1,5 @@
-import {ActivityApi} from '../Api.js';
-import {cloneContent, cloneMessage} from '../messageHelper.js';
+import { ActivityApi } from '../Api.js';
+import { cloneContent, cloneMessage } from '../messageHelper.js';
 
 const kCompleted = Symbol.for('completed');
 const kExecuteQ = Symbol.for('executeQ');
@@ -16,7 +16,7 @@ function ActivityExecution(activity, context) {
   this.broker = activity.broker;
   this[kPostponed] = [];
   this[kCompleted] = false;
-  this[kExecuteQ] = this.broker.assertQueue('execute-q', {durable: true, autoDelete: false});
+  this[kExecuteQ] = this.broker.assertQueue('execute-q', { durable: true, autoDelete: false });
 
   this[kMessageHandlers] = {
     onParentApiMessage: this._onParentApiMessage.bind(this),
@@ -36,11 +36,11 @@ ActivityExecution.prototype.execute = function execute(executeMessage) {
   if (!executionId) throw new Error('Execution requires execution id');
 
   this.executionId = executionId;
-  const initMessage = this[kExecuteMessage] = cloneMessage(executeMessage, {
+  const initMessage = (this[kExecuteMessage] = cloneMessage(executeMessage, {
     executionId,
     state: 'start',
     isRootScope: true,
-  });
+  }));
 
   if (executeMessage.fields.redelivered) {
     this[kPostponed].splice(0);
@@ -49,7 +49,7 @@ ActivityExecution.prototype.execute = function execute(executeMessage) {
     if (!this.source) this.source = new this.activity.Behaviour(this.activity, this.context);
 
     this.activate();
-    return this.broker.publish('execution', 'execute.resume.execution', cloneContent(initMessage.content), {persistent: false});
+    return this.broker.publish('execution', 'execute.resume.execution', cloneContent(initMessage.content), { persistent: false });
   }
 
   this._debug('execute');
@@ -63,9 +63,9 @@ ActivityExecution.prototype.activate = function activate() {
 
   const broker = this.broker;
   const batchSize = this.activity.environment.settings.batchSize || 50;
-  broker.bindQueue('execute-q', 'execution', 'execute.#', {priority: 100});
+  broker.bindQueue('execute-q', 'execution', 'execute.#', { priority: 100 });
 
-  const {onExecuteMessage, onParentApiMessage} = this[kMessageHandlers];
+  const { onExecuteMessage, onParentApiMessage } = this[kMessageHandlers];
   this[kExecuteQ].assertConsumer(onExecuteMessage, {
     exclusive: true,
     prefetch: batchSize * 2,
@@ -131,11 +131,11 @@ ActivityExecution.prototype.getPostponed = function getPostponed() {
 };
 
 ActivityExecution.prototype.getState = function getState() {
-  const result = {completed: this[kCompleted]};
+  const result = { completed: this[kCompleted] };
   const source = this.source;
 
   if (!source || !source.getState) return result;
-  return {...result, ...source.getState()};
+  return { ...result, ...source.getState() };
 };
 
 ActivityExecution.prototype.recover = function recover(state) {
@@ -144,7 +144,7 @@ ActivityExecution.prototype.recover = function recover(state) {
   if (!state) return this;
   if ('completed' in state) this[kCompleted] = state.completed;
 
-  const source = this.source = new this.activity.Behaviour(this.activity, this.context);
+  const source = (this.source = new this.activity.Behaviour(this.activity, this.context));
   if (source.recover) {
     source.recover(state);
   }
@@ -162,12 +162,12 @@ ActivityExecution.prototype._sourceExecute = function sourceExecute(executeMessa
   try {
     return this.source.execute(executeMessage);
   } catch (error) {
-    return this.broker.publish('execution', 'execute.error', cloneContent(executeMessage.content, {error}));
+    return this.broker.publish('execution', 'execute.error', cloneContent(executeMessage.content, { error }));
   }
 };
 
 ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routingKey, message) {
-  const {fields, content, properties} = message;
+  const { fields, content, properties } = message;
   const isRedelivered = fields.redelivered;
 
   if (isRedelivered && properties.persistent === false) return message.ack();
@@ -200,7 +200,7 @@ ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routin
         message.ack();
         break;
       }
-      this.broker.publish('execution', 'execution.outbound.take', cloneContent(content), {type: 'outbound'});
+      this.broker.publish('execution', 'execution.outbound.take', cloneContent(content), { type: 'outbound' });
       break;
     }
     default: {
@@ -213,7 +213,7 @@ ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routin
 };
 
 ActivityExecution.prototype._onStateChangeMessage = function onStateChangeMessage(message) {
-  const {ignoreIfExecuting, executionId} = message.content;
+  const { ignoreIfExecuting, executionId } = message.content;
   const postponed = this[kPostponed];
   const idx = postponed.findIndex((msg) => msg.content.executionId === executionId);
   let previousMsg;
@@ -238,7 +238,7 @@ ActivityExecution.prototype._onExecutionCompleted = function onExecutionComplete
   if (!postponedMsg) return;
   const postponed = this[kPostponed];
 
-  const {executionId, keep, isRootScope} = message.content;
+  const { executionId, keep, isRootScope } = message.content;
   if (!isRootScope) {
     this._debug('completed sub execution');
     if (!keep) message.ack();
@@ -259,12 +259,12 @@ ActivityExecution.prototype._onExecutionCompleted = function onExecutionComplete
   postponed.splice(0);
   for (const api of subApis) api.discard();
 
-  this._publishExecutionCompleted('completed', {...postponedMsg.content, ...message.content}, message.properties.correlationId);
+  this._publishExecutionCompleted('completed', { ...postponedMsg.content, ...message.content }, message.properties.correlationId);
 };
 
 ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarded(discardType, message) {
   const postponedMsg = this._ackPostponed(message);
-  const {isRootScope, error} = message.content;
+  const { isRootScope, error } = message.content;
   if (!isRootScope && !postponedMsg) return;
 
   const postponed = this[kPostponed];
@@ -272,7 +272,7 @@ ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarde
   if (!error && !isRootScope) {
     message.ack();
     if (postponed.length === 1 && postponed[0].content.isRootScope) {
-      return this.broker.publish('execution', 'execute.discard', postponed[0].content, {correlationId});
+      return this.broker.publish('execution', 'execute.discard', postponed[0].content, { correlationId });
     }
     return;
   }
@@ -288,20 +288,29 @@ ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarde
   this._publishExecutionCompleted(discardType, cloneContent(message.content), correlationId);
 };
 
-ActivityExecution.prototype._publishExecutionCompleted = function publishExecutionCompleted(completionType, completeContent, correlationId) {
+ActivityExecution.prototype._publishExecutionCompleted = function publishExecutionCompleted(
+  completionType,
+  completeContent,
+  correlationId,
+) {
   this[kCompleted] = true;
 
-  this.broker.publish('execution', `execution.${completionType}`, {
-    ...completeContent,
-    state: completionType,
-  }, {type: completionType, correlationId});
+  this.broker.publish(
+    'execution',
+    `execution.${completionType}`,
+    {
+      ...completeContent,
+      state: completionType,
+    },
+    { type: completionType, correlationId },
+  );
 };
 
 ActivityExecution.prototype._ackPostponed = function ackPostponed(completeMessage) {
-  const {executionId: eid} = completeMessage.content;
+  const { executionId: eid } = completeMessage.content;
 
   const postponed = this[kPostponed];
-  const idx = postponed.findIndex(({content: c}) => c.executionId === eid);
+  const idx = postponed.findIndex(({ content: c }) => c.executionId === eid);
   if (idx === -1) return;
   const [msg] = postponed.splice(idx, 1);
   msg.ack();
@@ -311,9 +320,9 @@ ActivityExecution.prototype._ackPostponed = function ackPostponed(completeMessag
 ActivityExecution.prototype._onParentApiMessage = function onParentApiMessage(routingKey, message) {
   switch (message.properties.type) {
     case 'error':
-      return this[kExecuteQ].queueMessage({routingKey: 'execute.error'}, {error: message.content.error});
+      return this[kExecuteQ].queueMessage({ routingKey: 'execute.error' }, { error: message.content.error });
     case 'discard':
-      return this[kExecuteQ].queueMessage({routingKey: 'execute.discard'}, cloneContent(this[kExecuteMessage].content));
+      return this[kExecuteQ].queueMessage({ routingKey: 'execute.discard' }, cloneContent(this[kExecuteMessage].content));
     case 'stop': {
       return this._onStop(message);
     }
@@ -340,7 +349,7 @@ ActivityExecution.prototype._debug = function debug(logMessage, executionId) {
 
 function getExecuteMessage(message) {
   const result = cloneMessage(message, {
-    ...(message.fields.redelivered && {isRecovered: true}),
+    ...(message.fields.redelivered && { isRecovered: true }),
     ignoreIfExecuting: undefined,
   });
   return result;

package/src/activity/Dummy.js

@@ -1,12 +1,12 @@
-import {cloneParent} from '../messageHelper.js';
+import { cloneParent } from '../messageHelper.js';
 
 export default function DummyActivity(activityDef) {
-  const {id, type = 'dummy', name, parent, behaviour} = activityDef;
+  const { id, type = 'dummy', name, parent, behaviour } = activityDef;
   return {
     id,
     type,
     name,
-    behaviour: {...behaviour},
+    behaviour: { ...behaviour },
     parent: cloneParent(parent),
     placeholder: true,
   };

package/src/activity/Escalation.js

@@ -1,7 +1,7 @@
 export default function Escalation(signalDef, context) {
-  const {id, type, name, parent: originalParent} = signalDef;
-  const {environment} = context;
-  const parent = {...originalParent};
+  const { id, type, name, parent: originalParent } = signalDef;
+  const { environment } = context;
+  const parent = { ...originalParent };
 
   return {
     id,
@@ -17,7 +17,7 @@ export default function Escalation(signalDef, context) {
       type,
       messageType: 'escalation',
       name: name && environment.resolveExpression(name, executionMessage),
-      parent: {...parent},
+      parent: { ...parent },
     };
   }
 }

package/src/activity/ExecutionScope.js

@@ -1,10 +1,10 @@
-import {cloneMessage} from '../messageHelper.js';
-import {ActivityError, BpmnError} from '../error/Errors.js';
+import { cloneMessage } from '../messageHelper.js';
+import { ActivityError, BpmnError } from '../error/Errors.js';
 
 export default function ExecutionScope(activity, initMessage) {
-  const {id, type, environment, logger} = activity;
+  const { id, type, environment, logger } = activity;
 
-  const {fields, content, properties} = cloneMessage(initMessage);
+  const { fields, content, properties } = cloneMessage(initMessage);
 
   const scope = {
     id,

package/src/activity/Message.js

@@ -1,7 +1,7 @@
 export default function Message(messageDef, context) {
-  const {id, type, name, parent: originalParent} = messageDef;
-  const {environment} = context;
-  const parent = {...originalParent};
+  const { id, type, name, parent: originalParent } = messageDef;
+  const { environment } = context;
+  const parent = { ...originalParent };
 
   return {
     id,
@@ -16,8 +16,8 @@ export default function Message(messageDef, context) {
       id,
       type,
       messageType: 'message',
-      ...(name && {name: environment.resolveExpression(name, executionMessage)}),
-      parent: {...parent},
+      ...(name && { name: environment.resolveExpression(name, executionMessage) }),
+      parent: { ...parent },
     };
   }
 }

package/src/activity/Signal.js

@@ -1,7 +1,7 @@
 export default function Signal(signalDef, context) {
-  const {id, type = 'Signal', name, parent: originalParent} = signalDef;
-  const {environment} = context;
-  const parent = {...originalParent};
+  const { id, type = 'Signal', name, parent: originalParent } = signalDef;
+  const { environment } = context;
+  const parent = { ...originalParent };
 
   return {
     id,
@@ -16,8 +16,8 @@ export default function Signal(signalDef, context) {
       id,
       type,
       messageType: 'signal',
-      ...(name && {name: environment.resolveExpression(name, executionMessage)}),
-      parent: {...parent},
+      ...(name && { name: environment.resolveExpression(name, executionMessage) }),
+      parent: { ...parent },
     };
   }
 }

package/src/definition/Definition.js

@@ -1,9 +1,9 @@
 import DefinitionExecution from './DefinitionExecution.js';
-import {DefinitionApi} from '../Api.js';
-import {DefinitionBroker} from '../EventBroker.js';
-import {getUniqueId, getOptionsAndCallback} from '../shared.js';
-import {makeErrorFromMessage} from '../error/Errors.js';
-import {cloneMessage, cloneContent} from '../messageHelper.js';
+import { DefinitionApi } from '../Api.js';
+import { DefinitionBroker } from '../EventBroker.js';
+import { getUniqueId, getOptionsAndCallback } from '../shared.js';
+import { makeErrorFromMessage } from '../error/Errors.js';
+import { cloneMessage, cloneContent } from '../messageHelper.js';
 
 const kConsuming = Symbol.for('consuming');
 const kCounters = Symbol.for('counters');
@@ -20,7 +20,7 @@ export function Definition(context, options) {
   if (!(this instanceof Definition)) return new Definition(context, options);
   if (!context) throw new Error('No context');
 
-  const {id, name, type = 'definition'} = context;
+  const { id, name, type = 'definition' } = context;
 
   this.id = id;
   this.type = type;
@@ -51,7 +51,7 @@ export function Definition(context, options) {
     onExecutionMessage: this._onExecutionMessage.bind(this),
   };
 
-  const {broker, on, once, waitFor, emit, emitFatal} = DefinitionBroker(this, onBrokerReturn);
+  const { broker, on, once, waitFor, emit, emitFatal } = DefinitionBroker(this, onBrokerReturn);
   this.broker = broker;
 
   this.on = on;
@@ -66,7 +66,7 @@ export function Definition(context, options) {
 Object.defineProperties(Definition.prototype, {
   counters: {
     get() {
-      return {...this[kCounters]};
+      return { ...this[kCounters] };
     },
   },
   execution: {
@@ -97,7 +97,7 @@ Object.defineProperties(Definition.prototype, {
   },
   activityStatus: {
     get() {
-      return this[kExec].execution && this[kExec].execution.activityStatus || 'idle';
+      return (this[kExec].execution && this[kExec].execution.activityStatus) || 'idle';
     },
   },
 });
@@ -116,7 +116,7 @@ Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
 
   const exec = this[kExec];
   exec.executionId = getUniqueId(this.id);
-  const content = this._createMessage({...runOptions});
+  const content = this._createMessage({ ...runOptions });
 
   const broker = this.broker;
   broker.publish('run', 'run.enter', content);
@@ -147,7 +147,7 @@ Definition.prototype.resume = function resume(callback) {
   this.logger.debug(`<${this.executionId} (${this.id})> resume`);
 
   const content = this._createMessage();
-  this.broker.publish('run', 'run.resume', content, {persistent: false});
+  this.broker.publish('run', 'run.resume', content, { persistent: false });
   this._activateRunConsumers();
   return this;
 };
@@ -173,7 +173,7 @@ Definition.prototype.recover = function recover(state) {
   const exec = this[kExec];
   exec.executionId = state.executionId;
   if (state.counters) {
-    this[kCounters] = {...this[kCounters], ...state.counters};
+    this[kCounters] = { ...this[kCounters], ...state.counters };
   }
 
   this.environment.recover(state.environment);
@@ -199,7 +199,7 @@ Definition.prototype.shake = function shake(startId) {
   } else bps = this.getProcesses();
 
   bps.forEach((bp) => {
-    result = {...result, ...this._shakeProcess(bp, startId)};
+    result = { ...result, ...this._shakeProcess(bp, startId) };
   });
 
   return result;
@@ -208,13 +208,17 @@ Definition.prototype.shake = function shake(startId) {
 Definition.prototype._shakeProcess = function shakeProcess(shakeBp, startId) {
   let shovel;
   if (!shakeBp.isRunning) {
-    shovel = shakeBp.broker.createShovel('shaker', {
-      exchange: 'event',
-      pattern: '*.shake#',
-    }, {
-      broker: this.broker,
-      exchange: 'event',
-    });
+    shovel = shakeBp.broker.createShovel(
+      'shaker',
+      {
+        exchange: 'event',
+        pattern: '*.shake#',
+      },
+      {
+        broker: this.broker,
+        exchange: 'event',
+      },
+    );
   }
 
   const shakeResult = shakeBp.shake(startId);
@@ -273,24 +277,24 @@ Definition.prototype.getApi = function getApi(message) {
 };
 
 Definition.prototype.signal = function signal(message) {
-  return this.getApi().signal(message, {delegate: true});
+  return this.getApi().signal(message, { delegate: true });
 };
 
 Definition.prototype.cancelActivity = function cancelActivity(message) {
-  return this.getApi().cancel(message, {delegate: true});
+  return this.getApi().cancel(message, { delegate: true });
 };
 
 Definition.prototype.sendMessage = function sendMessage(message) {
-  const messageContent = {message};
+  const messageContent = { message };
   let messageType = 'message';
   const reference = message && message.id && this.getElementById(message.id);
   if (reference && reference.resolve) {
-    const resolvedReference = reference.resolve(this._createMessage({message}));
+    const resolvedReference = reference.resolve(this._createMessage({ message }));
     messageType = resolvedReference.messageType || messageType;
-    messageContent.message = {...message, ...resolvedReference};
+    messageContent.message = { ...message, ...resolvedReference };
   }
 
-  return this.getApi().sendApiMessage(messageType, messageContent, {delegate: true});
+  return this.getApi().sendApiMessage(messageType, messageContent, { delegate: true });
 };
 
 Definition.prototype.stop = function stop() {
@@ -301,7 +305,7 @@ Definition.prototype.stop = function stop() {
 Definition.prototype._activateRunConsumers = function activateRunConsumers() {
   this[kConsuming] = true;
   const broker = this.broker;
-  const {onApiMessage, onRunMessage} = this[kMessageHandlers];
+  const { onApiMessage, onRunMessage } = this[kMessageHandlers];
   broker.subscribeTmp('api', `definition.*.${this.executionId}`, onApiMessage, {
     noAck: true,
     consumerTag: '_definition-api',
@@ -331,7 +335,7 @@ Definition.prototype._createMessage = function createMessage(override) {
 };
 
 Definition.prototype._onRunMessage = function onRunMessage(routingKey, message) {
-  const {content, fields} = message;
+  const { content, fields } = message;
   if (routingKey === 'run.resume') {
     return this._onResumeMessage(message);
   }
@@ -388,10 +392,14 @@ Definition.prototype._onRunMessage = function onRunMessage(routingKey, message)
       break;
     }
     case 'run.error': {
-      this._publishEvent('error', {
-        ...content,
-        error: fields.redelivered ? makeErrorFromMessage(message) : content.error,
-      }, {mandatory: true});
+      this._publishEvent(
+        'error',
+        {
+          ...content,
+          error: fields.redelivered ? makeErrorFromMessage(message) : content.error,
+        },
+        { mandatory: true },
+      );
       break;
     }
     case 'run.discarded': {
@@ -438,7 +446,7 @@ Definition.prototype._onResumeMessage = function onResumeMessage(message) {
 };
 
 Definition.prototype._onExecutionMessage = function onExecutionMessage(routingKey, message) {
-  const {content, properties} = message;
+  const { content, properties } = message;
   const messageType = properties.type;
 
   message.ack();
@@ -508,9 +516,9 @@ function addConsumerCallbacks(definition, callback) {
   const broker = definition.broker;
   clearConsumers();
 
-  broker.subscribeOnce('event', 'definition.stop', cbLeave, {consumerTag: '_definition-callback-stop'});
-  broker.subscribeOnce('event', 'definition.leave', cbLeave, {consumerTag: '_definition-callback-leave'});
-  broker.subscribeOnce('event', 'definition.error', cbError, {consumerTag: '_definition-callback-error'});
+  broker.subscribeOnce('event', 'definition.stop', cbLeave, { consumerTag: '_definition-callback-stop' });
+  broker.subscribeOnce('event', 'definition.leave', cbLeave, { consumerTag: '_definition-callback-leave' });
+  broker.subscribeOnce('event', 'definition.error', cbError, { consumerTag: '_definition-callback-error' });
 
   function cbLeave(_, message) {
     clearConsumers();