bpmn-elements 7.0.0 → 8.1.0

package/dist/src/activity/ActivityExecution.js

@@ -9,11 +9,11 @@ var _Api = require("../Api");
 
 var _messageHelper = require("../messageHelper");
 
-const completedSymbol = Symbol.for('completed');
-const executeQSymbol = Symbol.for('executeQ');
-const executeMessageSymbol = Symbol.for('executeMessage');
-const messageHandlersSymbol = Symbol.for('messageHandlers');
-const postponedSymbol = Symbol.for('postponed');
+const kCompleted = Symbol.for('completed');
+const kExecuteQ = Symbol.for('executeQ');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kMessageHandlers = Symbol.for('messageHandlers');
+const kPostponed = Symbol.for('postponed');
 var _default = ActivityExecution;
 exports.default = _default;
 
@@ -22,13 +22,13 @@ function ActivityExecution(activity, context) {
   this.context = context;
   this.id = activity.id;
   this.broker = activity.broker;
-  this[postponedSymbol] = [];
-  this[completedSymbol] = false;
-  this[executeQSymbol] = this.broker.assertQueue('execute-q', {
+  this[kPostponed] = [];
+  this[kCompleted] = false;
+  this[kExecuteQ] = this.broker.assertQueue('execute-q', {
     durable: true,
     autoDelete: false
   });
-  this[messageHandlersSymbol] = {
+  this[kMessageHandlers] = {
     onParentApiMessage: this._onParentApiMessage.bind(this),
     onExecuteMessage: this._onExecuteMessage.bind(this)
   };
@@ -39,7 +39,7 @@ Object.defineProperty(proto, 'completed', {
   enumerable: true,
 
   get() {
-    return this[completedSymbol];
+    return this[kCompleted];
   }
 
 });
@@ -49,14 +49,14 @@ proto.execute = function execute(executeMessage) {
   const executionId = executeMessage.content && executeMessage.content.executionId;
   if (!executionId) throw new Error('Execution requires execution id');
   this.executionId = executionId;
-  const initMessage = this[executeMessageSymbol] = (0, _messageHelper.cloneMessage)(executeMessage, {
+  const initMessage = this[kExecuteMessage] = (0, _messageHelper.cloneMessage)(executeMessage, {
     executionId,
     state: 'start',
     isRootScope: true
   });
 
   if (executeMessage.fields.redelivered) {
-    this[postponedSymbol].splice(0);
+    this[kPostponed].splice(0);
 
     this._debug('resume execution');
 
@@ -75,7 +75,7 @@ proto.execute = function execute(executeMessage) {
 };
 
 proto.activate = function activate() {
-  if (this[completedSymbol]) return;
+  if (this[kCompleted]) return;
   const broker = this.broker;
   const batchSize = this.activity.environment.settings.batchSize || 50;
   broker.bindQueue('execute-q', 'execution', 'execute.#', {
@@ -84,14 +84,14 @@ proto.activate = function activate() {
   const {
     onExecuteMessage,
     onParentApiMessage
-  } = this[messageHandlersSymbol];
-  this[executeQSymbol].assertConsumer(onExecuteMessage, {
+  } = this[kMessageHandlers];
+  this[kExecuteQ].assertConsumer(onExecuteMessage, {
     exclusive: true,
     prefetch: batchSize * 2,
     priority: 100,
     consumerTag: '_activity-execute'
   });
-  if (this[completedSymbol]) return this.deactivate();
+  if (this[kCompleted]) return this.deactivate();
   broker.subscribeTmp('api', `activity.*.${this.executionId}`, onParentApiMessage, {
     noAck: true,
     consumerTag: '_activity-api-execution',
@@ -107,15 +107,15 @@ proto.deactivate = function deactivate() {
 };
 
 proto.discard = function discard() {
-  if (this[completedSymbol]) return;
-  const initMessage = this[executeMessageSymbol];
+  if (this[kCompleted]) return;
+  const initMessage = this[kExecuteMessage];
   if (!initMessage) return this.activity.logger.warn(`<${this.id}> is not executing`);
   this.getApi(initMessage).discard();
 };
 
 proto.getApi = function getApi(apiMessage) {
   const self = this;
-  if (!apiMessage) apiMessage = this[executeMessageSymbol];
+  if (!apiMessage) apiMessage = this[kExecuteMessage];
 
   if (self.source.getApi) {
     const sourceApi = self.source.getApi(apiMessage);
@@ -125,7 +125,7 @@ proto.getApi = function getApi(apiMessage) {
   const api = (0, _Api.ActivityApi)(self.broker, apiMessage);
 
   api.getExecuting = function getExecuting() {
-    return self[postponedSymbol].reduce((result, msg) => {
+    return self[kPostponed].reduce((result, msg) => {
       if (msg.content.executionId === apiMessage.content.executionId) return result;
       result.push(self.getApi(msg));
       return result;
@@ -141,7 +141,7 @@ proto.passthrough = function passthrough(executeMessage) {
 };
 
 proto.getPostponed = function getPostponed() {
-  let apis = this[postponedSymbol].map(msg => this.getApi(msg));
+  let apis = this[kPostponed].map(msg => this.getApi(msg));
   if (!this.activity.isSubProcess || !this.source) return apis;
   apis = apis.concat(this.source.getPostponed());
   return apis;
@@ -149,7 +149,7 @@ proto.getPostponed = function getPostponed() {
 
 proto.getState = function getState() {
   const result = {
-    completed: this[completedSymbol]
+    completed: this[kCompleted]
   };
   const source = this.source;
   if (!source || !source.getState) return result;
@@ -159,9 +159,9 @@ proto.getState = function getState() {
 };
 
 proto.recover = function recover(state) {
-  this[postponedSymbol].splice(0);
+  this[kPostponed].splice(0);
   if (!state) return this;
-  if ('completed' in state) this[completedSymbol] = state.completed;
+  if ('completed' in state) this[kCompleted] = state.completed;
   const source = this.source = new this.activity.Behaviour(this.activity, this.context);
 
   if (source.recover) {
@@ -172,7 +172,7 @@ proto.recover = function recover(state) {
 };
 
 proto.stop = function stop() {
-  const executeMessage = this[executeMessageSymbol];
+  const executeMessage = this[kExecuteMessage];
   if (!executeMessage) return;
   this.getApi(executeMessage).stop();
 };
@@ -199,7 +199,7 @@ proto._onExecuteMessage = function onExecuteMessage(routingKey, message) {
   switch (routingKey) {
     case 'execute.resume.execution':
       {
-        if (!this[postponedSymbol].length) return this.broker.publish('execution', 'execute.start', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content));
+        if (!this[kPostponed].length) return this.broker.publish('execution', 'execute.start', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content));
         break;
       }
 
@@ -253,7 +253,7 @@ proto._onStateChangeMessage = function onStateChangeMessage(message) {
     ignoreIfExecuting,
     executionId
   } = message.content;
-  const postponed = this[postponedSymbol];
+  const postponed = this[kPostponed];
   const idx = postponed.findIndex(msg => msg.content.executionId === executionId);
   let previousMsg;
 
@@ -276,7 +276,7 @@ proto._onExecutionCompleted = function onExecutionCompleted(message) {
   const postponedMsg = this._ackPostponed(message);
 
   if (!postponedMsg) return;
-  const postponed = this[postponedSymbol];
+  const postponed = this[kPostponed];
   const {
     executionId,
     keep,
@@ -297,7 +297,7 @@ proto._onExecutionCompleted = function onExecutionCompleted(message) {
 
   this._debug('completed execution', executionId);
 
-  this[completedSymbol] = true;
+  this[kCompleted] = true;
   message.ack(true);
   this.deactivate();
   const subApis = this.getPostponed();
@@ -318,7 +318,7 @@ proto._onExecutionDiscarded = function onExecutionDiscarded(message) {
     error
   } = message.content;
   if (!isRootScope && !postponedMsg) return;
-  const postponed = this[postponedSymbol];
+  const postponed = this[kPostponed];
   const correlationId = message.properties.correlationId;
 
   if (!error && !isRootScope) {
@@ -350,7 +350,7 @@ proto._onExecutionDiscarded = function onExecutionDiscarded(message) {
 };
 
 proto._publishExecutionCompleted = function publishExecutionCompleted(completionType, completeContent, correlationId) {
-  this[completedSymbol] = true;
+  this[kCompleted] = true;
   this.broker.publish('execution', `execution.${completionType}`, { ...completeContent,
     state: completionType
   }, {
@@ -363,7 +363,7 @@ proto._ackPostponed = function ackPostponed(completeMessage) {
   const {
     executionId: eid
   } = completeMessage.content;
-  const postponed = this[postponedSymbol];
+  const postponed = this[kPostponed];
   const idx = postponed.findIndex(({
     content: c
   }) => c.executionId === eid);
@@ -376,16 +376,16 @@ proto._ackPostponed = function ackPostponed(completeMessage) {
 proto._onParentApiMessage = function onParentApiMessage(routingKey, message) {
   switch (message.properties.type) {
     case 'error':
-      return this[executeQSymbol].queueMessage({
+      return this[kExecuteQ].queueMessage({
         routingKey: 'execute.error'
       }, {
         error: message.content.error
       });
 
     case 'discard':
-      return this[executeQSymbol].queueMessage({
+      return this[kExecuteQ].queueMessage({
         routingKey: 'execute.discard'
-      }, (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content));
+      }, (0, _messageHelper.cloneContent)(this[kExecuteMessage].content));
 
     case 'stop':
       {
@@ -414,9 +414,9 @@ proto._debug = function debug(logMessage, executionId) {
 };
 
 function getExecuteMessage(message) {
-  const result = (0, _messageHelper.cloneMessage)(message, { ...(message.fields.redelivered ? {
+  const result = (0, _messageHelper.cloneMessage)(message, { ...(message.fields.redelivered && {
       isRecovered: true
-    } : undefined),
+    }),
     ignoreIfExecuting: undefined
   });
   return result;

package/dist/src/activity/Message.js

@@ -30,9 +30,9 @@ function Message(messageDef, context) {
       id,
       type,
       messageType: 'message',
-      ...(name ? {
+      ...(name && {
         name: environment.resolveExpression(name, executionMessage)
-      } : undefined),
+      }),
       parent: { ...parent
       }
     };

package/dist/src/activity/Signal.js

@@ -30,9 +30,9 @@ function Signal(signalDef, context) {
       id,
       type,
       messageType: 'signal',
-      ...(name ? {
+      ...(name && {
         name: environment.resolveExpression(name, executionMessage)
-      } : undefined),
+      }),
       parent: { ...parent
       }
     };

package/dist/src/definition/Definition.js

@@ -20,14 +20,14 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const consumingSymbol = Symbol.for('consuming');
-const countersSymbol = Symbol.for('counters');
-const execSymbol = Symbol.for('exec');
-const executeMessageSymbol = Symbol.for('executeMessage');
-const messageHandlersSymbol = Symbol.for('messageHandlers');
-const stateMessageSymbol = Symbol.for('stateMessage');
-const statusSymbol = Symbol.for('status');
-const stoppedSymbol = Symbol.for('stopped');
+const kConsuming = Symbol.for('consuming');
+const kCounters = Symbol.for('counters');
+const kExec = Symbol.for('execution');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kMessageHandlers = Symbol.for('messageHandlers');
+const kStateMessage = Symbol.for('stateMessage');
+const kStatus = Symbol.for('status');
+const kStopped = Symbol.for('stopped');
 var _default = Definition;
 exports.default = _default;
 
@@ -52,16 +52,16 @@ function Definition(context, options) {
     this.context = context;
   }
 
-  this[countersSymbol] = {
+  this[kCounters] = {
     completed: 0,
     discarded: 0
   };
-  this[stoppedSymbol] = false;
-  this[execSymbol] = {};
+  this[kStopped] = false;
+  this[kExec] = {};
 
   const onBrokerReturn = this._onBrokerReturnFn.bind(this);
 
-  this[messageHandlersSymbol] = {
+  this[kMessageHandlers] = {
     onBrokerReturn,
     onApiMessage: this._onApiMessage.bind(this),
     onRunMessage: this._onRunMessage.bind(this),
@@ -89,7 +89,7 @@ Object.defineProperty(proto, 'counters', {
   enumerable: true,
 
   get() {
-    return { ...this[countersSymbol]
+    return { ...this[kCounters]
     };
   }
 
@@ -98,7 +98,7 @@ Object.defineProperty(proto, 'execution', {
   enumerable: true,
 
   get() {
-    return this[execSymbol].execution;
+    return this[kExec].execution;
   }
 
 });
@@ -106,7 +106,7 @@ Object.defineProperty(proto, 'executionId', {
   enumerable: true,
 
   get() {
-    return this[execSymbol].executionId;
+    return this[kExec].executionId;
   }
 
 });
@@ -114,7 +114,7 @@ Object.defineProperty(proto, 'isRunning', {
   enumerable: true,
 
   get() {
-    if (!this[consumingSymbol]) return false;
+    if (!this[kConsuming]) return false;
     return !!this.status;
   }
 
@@ -123,7 +123,7 @@ Object.defineProperty(proto, 'status', {
   enumerable: true,
 
   get() {
-    return this[statusSymbol];
+    return this[kStatus];
   }
 
 });
@@ -131,7 +131,7 @@ Object.defineProperty(proto, 'stopped', {
   enumerable: true,
 
   get() {
-    return this[stoppedSymbol];
+    return this[kStopped];
   }
 
 });
@@ -149,7 +149,7 @@ proto.run = function run(optionsOrCallback, optionalCallback) {
     addConsumerCallbacks(this, callback);
   }
 
-  const exec = this[execSymbol];
+  const exec = this[kExec];
   exec.executionId = (0, _shared.getUniqueId)(this.id);
 
   const content = this._createMessage({ ...runOptions
@@ -173,7 +173,7 @@ proto.resume = function resume(callback) {
     throw err;
   }
 
-  this[stoppedSymbol] = false;
+  this[kStopped] = false;
   if (!this.status) return this;
 
   if (callback) {
@@ -196,13 +196,13 @@ proto.resume = function resume(callback) {
 proto.recover = function recover(state) {
   if (this.isRunning) throw new Error('cannot recover running definition');
   if (!state) return this;
-  this[stoppedSymbol] = !!state.stopped;
-  this[statusSymbol] = state.status;
-  const exec = this[execSymbol];
+  this[kStopped] = !!state.stopped;
+  this[kStatus] = state.status;
+  const exec = this[kExec];
   exec.executionId = state.executionId;
 
   if (state.counters) {
-    this[countersSymbol] = { ...this[countersSymbol],
+    this[kCounters] = { ...this[kCounters],
       ...state.counters
     };
   }
@@ -288,10 +288,10 @@ proto.getProcessById = function getProcessById(processId) {
 };
 
 proto.getActivityById = function getActivityById(childId) {
-  const siblings = this.getProcesses();
+  const bps = this.getProcesses();
 
-  for (const sibling of siblings) {
-    const child = sibling.getActivityById(childId);
+  for (const bp of bps) {
+    const child = bp.getActivityById(childId);
     if (child) return child;
   }
 
@@ -311,7 +311,7 @@ proto.getPostponed = function getPostponed(...args) {
 proto.getApi = function getApi(message) {
   const execution = this.execution;
   if (execution) return execution.getApi(message);
-  message = message || this[stateMessageSymbol];
+  message = message || this[kStateMessage];
   if (!message) throw new Error('Definition is not running');
   return (0, _Api.DefinitionApi)(this.broker, message);
 };
@@ -356,12 +356,12 @@ proto.stop = function stop() {
 };
 
 proto._activateRunConsumers = function activateRunConsumers() {
-  this[consumingSymbol] = true;
+  this[kConsuming] = true;
   const broker = this.broker;
   const {
     onApiMessage,
     onRunMessage
-  } = this[messageHandlersSymbol];
+  } = this[kMessageHandlers];
   broker.subscribeTmp('api', `definition.*.${this.executionId}`, onApiMessage, {
     noAck: true,
     consumerTag: '_definition-api'
@@ -377,7 +377,7 @@ proto._deactivateRunConsumers = function deactivateRunConsumers() {
   broker.cancel('_definition-api');
   broker.cancel('_definition-run');
   broker.cancel('_definition-execution');
-  this[consumingSymbol] = false;
+  this[kConsuming] = false;
 };
 
 proto._createMessage = function createMessage(override) {
@@ -400,14 +400,14 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
     return this._onResumeMessage(message);
   }
 
-  const exec = this[execSymbol];
-  this[stateMessageSymbol] = message;
+  const exec = this[kExec];
+  this[kStateMessage] = message;
 
   switch (routingKey) {
     case 'run.enter':
       {
         this.logger.debug(`<${this.executionId} (${this.id})> enter`);
-        this[statusSymbol] = 'entered';
+        this[kStatus] = 'entered';
         if (fields.redelivered) break;
         exec.execution = undefined;
 
@@ -419,7 +419,7 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
     case 'run.start':
       {
         this.logger.debug(`<${this.executionId} (${this.id})> start`);
-        this[statusSymbol] = 'start';
+        this[kStatus] = 'start';
 
         this._publishEvent('start', content);
 
@@ -428,15 +428,15 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
 
     case 'run.execute':
       {
-        this[statusSymbol] = 'executing';
+        this[kStatus] = 'executing';
         const executeMessage = (0, _messageHelper.cloneMessage)(message);
 
         if (fields.redelivered && !exec.execution) {
           executeMessage.fields.redelivered = undefined;
         }
 
-        this[executeMessageSymbol] = message;
-        this.broker.getQueue('execution-q').assertConsumer(this[messageHandlersSymbol].onExecutionMessage, {
+        this[kExecuteMessage] = message;
+        this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {
           exclusive: true,
           consumerTag: '_definition-execution'
         });
@@ -451,10 +451,10 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
 
     case 'run.end':
       {
-        if (this.status === 'end') break;
-        this[countersSymbol].completed++;
+        if (this[kStatus] === 'end') break;
+        this[kCounters].completed++;
         this.logger.debug(`<${this.executionId} (${this.id})> completed`);
-        this[statusSymbol] = 'end';
+        this[kStatus] = 'end';
         this.broker.publish('run', 'run.leave', content);
 
         this._publishEvent('end', content);
@@ -475,9 +475,9 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
 
     case 'run.discarded':
       {
-        if (this.status === 'discarded') break;
-        this[countersSymbol].discarded++;
-        this[statusSymbol] = 'discarded';
+        if (this[kStatus] === 'discarded') break;
+        this[kCounters].discarded++;
+        this[kStatus] = 'discarded';
         this.broker.publish('run', 'run.leave', content);
         break;
       }
@@ -485,7 +485,7 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
     case 'run.leave':
       {
         message.ack();
-        this[statusSymbol] = undefined;
+        this[kStatus] = undefined;
 
         this._deactivateRunConsumers();
 
@@ -500,7 +500,7 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
 
 proto._onResumeMessage = function onResumeMessage(message) {
   message.ack();
-  const stateMessage = this[stateMessageSymbol];
+  const stateMessage = this[kStateMessage];
 
   switch (stateMessage.fields.routingKey) {
     case 'run.discarded':
@@ -546,8 +546,8 @@ proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
       }
   }
 
-  const executeMessage = this[executeMessageSymbol];
-  this[executeMessageSymbol] = null;
+  const executeMessage = this[kExecuteMessage];
+  this[kExecuteMessage] = null;
   executeMessage.ack();
 };
 
@@ -570,7 +570,7 @@ proto._publishEvent = function publishEvent(action, content, msgOpts) {
 };
 
 proto._onStop = function onStop() {
-  this[stoppedSymbol] = true;
+  this[kStopped] = true;
 
   this._deactivateRunConsumers();
 
@@ -587,7 +587,7 @@ proto._onBrokerReturnFn = function onBrokerReturn(message) {
 };
 
 proto._reset = function reset() {
-  this[execSymbol].executionId = undefined;
+  this[kExec].executionId = undefined;
 
   this._deactivateRunConsumers();