bpmn-elements 8.2.4 → 9.1.0

package/dist/{src/activity → activity}/ActivityExecution.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _Api = require("../Api");
-var _messageHelper = require("../messageHelper");
+var _Api = require("../Api.js");
+var _messageHelper = require("../messageHelper.js");
 const kCompleted = Symbol.for('completed');
 const kExecuteQ = Symbol.for('executeQ');
 const kExecuteMessage = Symbol.for('executeMessage');
@@ -29,14 +29,13 @@ function ActivityExecution(activity, context) {
     onExecuteMessage: this._onExecuteMessage.bind(this)
   };
 }
-const proto = ActivityExecution.prototype;
-Object.defineProperty(proto, 'completed', {
+Object.defineProperty(ActivityExecution.prototype, 'completed', {
   enumerable: true,
   get() {
     return this[kCompleted];
   }
 });
-proto.execute = function execute(executeMessage) {
+ActivityExecution.prototype.execute = function execute(executeMessage) {
   if (!executeMessage) throw new Error('Execution requires message');
   const executionId = executeMessage.content && executeMessage.content.executionId;
   if (!executionId) throw new Error('Execution requires execution id');
@@ -60,7 +59,7 @@ proto.execute = function execute(executeMessage) {
   this.source = new this.activity.Behaviour(this.activity, this.context);
   this.broker.publish('execution', 'execute.start', (0, _messageHelper.cloneContent)(initMessage.content));
 };
-proto.activate = function activate() {
+ActivityExecution.prototype.activate = function activate() {
   if (this[kCompleted]) return;
   const broker = this.broker;
   const batchSize = this.activity.environment.settings.batchSize || 50;
@@ -84,19 +83,19 @@ proto.activate = function activate() {
     priority: 200
   });
 };
-proto.deactivate = function deactivate() {
+ActivityExecution.prototype.deactivate = function deactivate() {
   const broker = this.broker;
   broker.cancel('_activity-api-execution');
   broker.cancel('_activity-execute');
   broker.unbindQueue('execute-q', 'execution', 'execute.#');
 };
-proto.discard = function discard() {
+ActivityExecution.prototype.discard = function discard() {
   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) {
+ActivityExecution.prototype.getApi = function getApi(apiMessage) {
   const self = this;
   if (!apiMessage) apiMessage = this[kExecuteMessage];
   if (self.source.getApi) {
@@ -113,17 +112,17 @@ proto.getApi = function getApi(apiMessage) {
   };
   return api;
 };
-proto.passthrough = function passthrough(executeMessage) {
+ActivityExecution.prototype.passthrough = function passthrough(executeMessage) {
   if (!this.source) return this.execute(executeMessage);
   return this._sourceExecute(executeMessage);
 };
-proto.getPostponed = function getPostponed() {
+ActivityExecution.prototype.getPostponed = function getPostponed() {
   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;
 };
-proto.getState = function getState() {
+ActivityExecution.prototype.getState = function getState() {
   const result = {
     completed: this[kCompleted]
   };
@@ -134,7 +133,7 @@ proto.getState = function getState() {
     ...source.getState()
   };
 };
-proto.recover = function recover(state) {
+ActivityExecution.prototype.recover = function recover(state) {
   this[kPostponed].splice(0);
   if (!state) return this;
   if ('completed' in state) this[kCompleted] = state.completed;
@@ -144,12 +143,12 @@ proto.recover = function recover(state) {
   }
   return this;
 };
-proto.stop = function stop() {
+ActivityExecution.prototype.stop = function stop() {
   const executeMessage = this[kExecuteMessage];
   if (!executeMessage) return;
   this.getApi(executeMessage).stop();
 };
-proto._sourceExecute = function sourceExecute(executeMessage) {
+ActivityExecution.prototype._sourceExecute = function sourceExecute(executeMessage) {
   try {
     return this.source.execute(executeMessage);
   } catch (error) {
@@ -158,7 +157,7 @@ proto._sourceExecute = function sourceExecute(executeMessage) {
     }));
   }
 };
-proto._onExecuteMessage = function onExecuteMessage(routingKey, message) {
+ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routingKey, message) {
   const {
     fields,
     content,
@@ -172,10 +171,12 @@ proto._onExecuteMessage = function onExecuteMessage(routingKey, message) {
         if (!this[kPostponed].length) return this.broker.publish('execution', 'execute.start', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content));
         break;
       }
+    case 'execute.cancel':
+      return this._onExecutionDiscarded('cancel', message);
     case 'execute.error':
+      return this._onExecutionDiscarded('error', message);
     case 'execute.discard':
-      return this._onExecutionDiscarded(message);
-    case 'execute.cancel':
+      return this._onExecutionDiscarded('discard', message);
     case 'execute.completed':
       {
         if (isRedelivered) {
@@ -209,7 +210,7 @@ proto._onExecuteMessage = function onExecuteMessage(routingKey, message) {
       }
   }
 };
-proto._onStateChangeMessage = function onStateChangeMessage(message) {
+ActivityExecution.prototype._onStateChangeMessage = function onStateChangeMessage(message) {
   const {
     ignoreIfExecuting,
     executionId
@@ -229,7 +230,7 @@ proto._onStateChangeMessage = function onStateChangeMessage(message) {
   postponed.push(message);
   return true;
 };
-proto._onExecutionCompleted = function onExecutionCompleted(message) {
+ActivityExecution.prototype._onExecutionCompleted = function onExecutionCompleted(message) {
   const postponedMsg = this._ackPostponed(message);
   if (!postponedMsg) return;
   const postponed = this[kPostponed];
@@ -258,7 +259,7 @@ proto._onExecutionCompleted = function onExecutionCompleted(message) {
     ...message.content
   }, message.properties.correlationId);
 };
-proto._onExecutionDiscarded = function onExecutionDiscarded(message) {
+ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarded(discardType, message) {
   const postponedMsg = this._ackPostponed(message);
   const {
     isRootScope,
@@ -281,14 +282,9 @@ proto._onExecutionDiscarded = function onExecutionDiscarded(message) {
   const subApis = this.getPostponed();
   postponed.splice(0);
   for (const api of subApis) api.discard();
-  if (error) {
-    return this._publishExecutionCompleted('error', (0, _messageHelper.cloneContent)(message.content, {
-      error
-    }), correlationId);
-  }
-  this._publishExecutionCompleted('discard', message.content, correlationId);
+  this._publishExecutionCompleted(discardType, (0, _messageHelper.cloneContent)(message.content), correlationId);
 };
-proto._publishExecutionCompleted = function publishExecutionCompleted(completionType, completeContent, correlationId) {
+ActivityExecution.prototype._publishExecutionCompleted = function publishExecutionCompleted(completionType, completeContent, correlationId) {
   this[kCompleted] = true;
   this.broker.publish('execution', `execution.${completionType}`, {
     ...completeContent,
@@ -298,7 +294,7 @@ proto._publishExecutionCompleted = function publishExecutionCompleted(completion
     correlationId
   });
 };
-proto._ackPostponed = function ackPostponed(completeMessage) {
+ActivityExecution.prototype._ackPostponed = function ackPostponed(completeMessage) {
   const {
     executionId: eid
   } = completeMessage.content;
@@ -311,7 +307,7 @@ proto._ackPostponed = function ackPostponed(completeMessage) {
   msg.ack();
   return msg;
 };
-proto._onParentApiMessage = function onParentApiMessage(routingKey, message) {
+ActivityExecution.prototype._onParentApiMessage = function onParentApiMessage(routingKey, message) {
   switch (message.properties.type) {
     case 'error':
       return this[kExecuteQ].queueMessage({
@@ -329,7 +325,7 @@ proto._onParentApiMessage = function onParentApiMessage(routingKey, message) {
       }
   }
 };
-proto._onStop = function onStop(message) {
+ActivityExecution.prototype._onStop = function onStop(message) {
   const stoppedId = message && message.content && message.content.executionId;
   const running = this.getPostponed();
   for (const api of running) {
@@ -340,7 +336,7 @@ proto._onStop = function onStop(message) {
   this.broker.cancel('_activity-execute');
   this.broker.cancel('_activity-api-execution');
 };
-proto._debug = function debug(logMessage, executionId) {
+ActivityExecution.prototype._debug = function debug(logMessage, executionId) {
   executionId = executionId || this.executionId;
   this.activity.logger.debug(`<${executionId} (${this.id})> ${logMessage}`);
 };

package/dist/{src/activity → activity}/Dummy.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = DummyActivity;
-var _messageHelper = require("../messageHelper");
+var _messageHelper = require("../messageHelper.js");
 function DummyActivity(activityDef) {
   const {
     id,

package/dist/{src/activity → activity}/ExecutionScope.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ExecutionScope;
-var _messageHelper = require("../messageHelper");
-var _Errors = require("../error/Errors");
+var _messageHelper = require("../messageHelper.js");
+var _Errors = require("../error/Errors.js");
 function ExecutionScope(activity, initMessage) {
   const {
     id,

package/dist/{src/definition → definition}/Definition.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Definition = Definition;
 exports.default = void 0;
-var _DefinitionExecution = _interopRequireDefault(require("./DefinitionExecution"));
-var _Api = require("../Api");
-var _EventBroker = require("../EventBroker");
-var _shared = require("../shared");
-var _Errors = require("../error/Errors");
-var _messageHelper = require("../messageHelper");
+var _DefinitionExecution = _interopRequireDefault(require("./DefinitionExecution.js"));
+var _Api = require("../Api.js");
+var _EventBroker = require("../EventBroker.js");
+var _shared = require("../shared.js");
+var _Errors = require("../error/Errors.js");
+var _messageHelper = require("../messageHelper.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const kConsuming = Symbol.for('consuming');
 const kCounters = Symbol.for('counters');
@@ -70,8 +70,7 @@ function Definition(context, options) {
   this.emitFatal = emitFatal;
   this.logger = environment.Logger(type.toLowerCase());
 }
-const proto = Definition.prototype;
-Object.defineProperty(proto, 'counters', {
+Object.defineProperty(Definition.prototype, 'counters', {
   enumerable: true,
   get() {
     return {
@@ -79,38 +78,43 @@ Object.defineProperty(proto, 'counters', {
     };
   }
 });
-Object.defineProperty(proto, 'execution', {
+Object.defineProperty(Definition.prototype, 'execution', {
   enumerable: true,
   get() {
     return this[kExec].execution;
   }
 });
-Object.defineProperty(proto, 'executionId', {
+Object.defineProperty(Definition.prototype, 'executionId', {
   enumerable: true,
   get() {
     return this[kExec].executionId;
   }
 });
-Object.defineProperty(proto, 'isRunning', {
+Object.defineProperty(Definition.prototype, 'isRunning', {
   enumerable: true,
   get() {
     if (!this[kConsuming]) return false;
     return !!this.status;
   }
 });
-Object.defineProperty(proto, 'status', {
+Object.defineProperty(Definition.prototype, 'status', {
   enumerable: true,
   get() {
     return this[kStatus];
   }
 });
-Object.defineProperty(proto, 'stopped', {
+Object.defineProperty(Definition.prototype, 'stopped', {
   enumerable: true,
   get() {
     return this[kStopped];
   }
 });
-proto.run = function run(optionsOrCallback, optionalCallback) {
+Object.defineProperty(Definition.prototype, 'activityStatus', {
+  get() {
+    return this[kExec].execution && this[kExec].execution.activityStatus || 'idle';
+  }
+});
+Definition.prototype.run = function run(optionsOrCallback, optionalCallback) {
   const [runOptions, callback] = (0, _shared.getOptionsAndCallback)(optionsOrCallback, optionalCallback);
   if (this.isRunning) {
     const err = new Error('definition is already running');
@@ -133,7 +137,7 @@ proto.run = function run(optionsOrCallback, optionalCallback) {
   this._activateRunConsumers();
   return this;
 };
-proto.resume = function resume(callback) {
+Definition.prototype.resume = function resume(callback) {
   if (this.isRunning) {
     const err = new Error('cannot resume running definition');
     if (callback) return callback(err);
@@ -152,7 +156,7 @@ proto.resume = function resume(callback) {
   this._activateRunConsumers();
   return this;
 };
-proto.recover = function recover(state) {
+Definition.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error('cannot recover running definition');
   if (!state) return this;
   this[kStopped] = !!state.stopped;
@@ -172,9 +176,8 @@ proto.recover = function recover(state) {
   this.broker.recover(state.broker);
   return this;
 };
-proto.shake = function shake(startId) {
+Definition.prototype.shake = function shake(startId) {
   let result = {};
-  const broker = this.broker;
   let bps;
   if (startId) {
     const startActivity = this.getActivityById(startId);
@@ -183,28 +186,30 @@ proto.shake = function shake(startId) {
     if (!bp) return;
     bps = [bp];
   } else bps = this.getProcesses();
-  bps.forEach(shakeProcess);
-  return result;
-  function shakeProcess(shakeBp) {
-    let shovel;
-    if (!shakeBp.isRunning) {
-      shovel = shakeBp.broker.createShovel('shaker', {
-        exchange: 'event',
-        pattern: '*.shake#'
-      }, {
-        broker,
-        exchange: 'event'
-      });
-    }
-    const shakeResult = shakeBp.shake(startId);
-    if (shovel) shakeBp.broker.closeShovel('shaker');
+  bps.forEach(bp => {
     result = {
       ...result,
-      ...shakeResult
+      ...this._shakeProcess(bp, startId)
     };
+  });
+  return result;
+};
+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'
+    });
   }
+  const shakeResult = shakeBp.shake(startId);
+  if (shovel) shakeBp.broker.closeShovel('shaker');
+  return shakeResult;
 };
-proto.getState = function getState() {
+Definition.prototype.getState = function getState() {
   return this._createMessage({
     status: this.status,
     stopped: this.stopped,
@@ -214,25 +219,25 @@ proto.getState = function getState() {
     broker: this.broker.getState(true)
   });
 };
-proto.getProcesses = function getProcesses() {
+Definition.prototype.getProcesses = function getProcesses() {
   const execution = this.execution;
   if (execution) return execution.getProcesses();
   return this.context.getProcesses();
 };
-proto.getExecutableProcesses = function getExecutableProcesses() {
+Definition.prototype.getExecutableProcesses = function getExecutableProcesses() {
   const execution = this.execution;
   if (execution) return execution.getExecutableProcesses();
   return this.context.getExecutableProcesses();
 };
-proto.getRunningProcesses = function getRunningProcesses() {
+Definition.prototype.getRunningProcesses = function getRunningProcesses() {
   const execution = this.execution;
   if (!execution) return [];
   return execution.getRunningProcesses();
 };
-proto.getProcessById = function getProcessById(processId) {
+Definition.prototype.getProcessById = function getProcessById(processId) {
   return this.getProcesses().find(p => p.id === processId);
 };
-proto.getActivityById = function getActivityById(childId) {
+Definition.prototype.getActivityById = function getActivityById(childId) {
   const bps = this.getProcesses();
   for (const bp of bps) {
     const child = bp.getActivityById(childId);
@@ -240,32 +245,32 @@ proto.getActivityById = function getActivityById(childId) {
   }
   return null;
 };
-proto.getElementById = function getElementById(elementId) {
+Definition.prototype.getElementById = function getElementById(elementId) {
   return this.context.getActivityById(elementId);
 };
-proto.getPostponed = function getPostponed(...args) {
+Definition.prototype.getPostponed = function getPostponed(...args) {
   const execution = this.execution;
   if (!execution) return [];
   return execution.getPostponed(...args);
 };
-proto.getApi = function getApi(message) {
+Definition.prototype.getApi = function getApi(message) {
   const execution = this.execution;
   if (execution) return execution.getApi(message);
   message = message || this[kStateMessage];
   if (!message) throw new Error('Definition is not running');
   return (0, _Api.DefinitionApi)(this.broker, message);
 };
-proto.signal = function signal(message) {
+Definition.prototype.signal = function signal(message) {
   return this.getApi().signal(message, {
     delegate: true
   });
 };
-proto.cancelActivity = function cancelActivity(message) {
+Definition.prototype.cancelActivity = function cancelActivity(message) {
   return this.getApi().cancel(message, {
     delegate: true
   });
 };
-proto.sendMessage = function sendMessage(message) {
+Definition.prototype.sendMessage = function sendMessage(message) {
   const messageContent = {
     message
   };
@@ -285,11 +290,11 @@ proto.sendMessage = function sendMessage(message) {
     delegate: true
   });
 };
-proto.stop = function stop() {
+Definition.prototype.stop = function stop() {
   if (!this.isRunning) return;
   this.getApi().stop();
 };
-proto._activateRunConsumers = function activateRunConsumers() {
+Definition.prototype._activateRunConsumers = function activateRunConsumers() {
   this[kConsuming] = true;
   const broker = this.broker;
   const {
@@ -305,14 +310,14 @@ proto._activateRunConsumers = function activateRunConsumers() {
     consumerTag: '_definition-run'
   });
 };
-proto._deactivateRunConsumers = function deactivateRunConsumers() {
+Definition.prototype._deactivateRunConsumers = function deactivateRunConsumers() {
   const broker = this.broker;
   broker.cancel('_definition-api');
   broker.cancel('_definition-run');
   broker.cancel('_definition-execution');
   this[kConsuming] = false;
 };
-proto._createMessage = function createMessage(override) {
+Definition.prototype._createMessage = function createMessage(override) {
   return {
     id: this.id,
     type: this.type,
@@ -321,7 +326,7 @@ proto._createMessage = function createMessage(override) {
     ...override
   };
 };
-proto._onRunMessage = function onRunMessage(routingKey, message) {
+Definition.prototype._onRunMessage = function onRunMessage(routingKey, message) {
   const {
     content,
     fields
@@ -405,7 +410,7 @@ proto._onRunMessage = function onRunMessage(routingKey, message) {
   }
   message.ack();
 };
-proto._onResumeMessage = function onResumeMessage(message) {
+Definition.prototype._onResumeMessage = function onResumeMessage(message) {
   message.ack();
   const stateMessage = this[kStateMessage];
   switch (stateMessage.fields.routingKey) {
@@ -420,7 +425,7 @@ proto._onResumeMessage = function onResumeMessage(message) {
   this._debug(`resume from ${this.status}`);
   return this.broker.publish('run', stateMessage.fields.routingKey, (0, _messageHelper.cloneContent)(stateMessage.content), stateMessage.properties);
 };
-proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
+Definition.prototype._onExecutionMessage = function onExecutionMessage(routingKey, message) {
   const {
     content,
     properties
@@ -447,7 +452,7 @@ proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
   this[kExecuteMessage] = null;
   executeMessage.ack();
 };
-proto._onApiMessage = function onApiMessage(routingKey, message) {
+Definition.prototype._onApiMessage = function onApiMessage(routingKey, message) {
   if (message.properties.type === 'stop') {
     const execution = this.execution;
     if (!execution || execution.completed) {
@@ -455,32 +460,32 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
     }
   }
 };
-proto._publishEvent = function publishEvent(action, content, msgOpts) {
+Definition.prototype._publishEvent = function publishEvent(action, content, msgOpts) {
   const execution = this.execution;
   this.broker.publish('event', `definition.${action}`, execution ? execution._createMessage(content) : (0, _messageHelper.cloneContent)(content), {
     type: action,
     ...msgOpts
   });
 };
-proto._onStop = function onStop() {
+Definition.prototype._onStop = function onStop() {
   this[kStopped] = true;
   this._deactivateRunConsumers();
   return this._publishEvent('stop', this._createMessage());
 };
-proto._onBrokerReturnFn = function onBrokerReturn(message) {
+Definition.prototype._onBrokerReturnFn = function onBrokerReturn(message) {
   if (message.properties.type === 'error') {
     this._deactivateRunConsumers();
     const err = (0, _Errors.makeErrorFromMessage)(message);
     throw err;
   }
 };
-proto._reset = function reset() {
+Definition.prototype._reset = function reset() {
   this[kExec].executionId = undefined;
   this._deactivateRunConsumers();
   this.broker.purgeQueue('run-q');
   this.broker.purgeQueue('execution-q');
 };
-proto._debug = function debug(msg) {
+Definition.prototype._debug = function debug(msg) {
   this.logger.debug(`<${this.id}> ${msg}`);
 };
 function addConsumerCallbacks(definition, callback) {