bpmn-elements 14.0.1 → 15.0.0

package/dist/process/ProcessExecution.js

@@ -36,15 +36,15 @@ function ProcessExecution(parentActivity, context) {
   this.environment = context.environment;
   this.context = context;
   this[kElements] = {
+    postponed: new Set(),
     children: context.getActivities(id),
     associations: context.getAssociations(id),
     flows: context.getSequenceFlows(id),
     outboundMessageFlows: context.getMessageFlows(id),
     startActivities: [],
     triggeredByEvent: [],
-    detachedActivities: [],
-    startSequences: {},
-    postponed: []
+    detachedActivities: new Set(),
+    startSequences: {}
   };
   const exchangeName = this._exchangeName = isSubProcess ? 'subprocess-execution' : 'execution';
   broker.assertExchange(exchangeName, 'topic', {
@@ -82,7 +82,7 @@ Object.defineProperties(ProcessExecution.prototype, {
   },
   postponedCount: {
     get() {
-      return this[kElements].postponed.length;
+      return this[kElements].postponed.size;
     }
   },
   isRunning: {
@@ -130,8 +130,8 @@ ProcessExecution.prototype.resume = function resume() {
   if (startActivities.length > 1) {
     for (const a of startActivities) a.shake();
   }
-  postponed.splice(0);
-  detachedActivities.splice(0);
+  postponed.clear();
+  detachedActivities.clear();
   this[kActivityQ].consume(this[kMessageHandlers].onChildMessage, {
     prefetch: 1000,
     consumerTag: `_process-activity-${this.executionId}`
@@ -140,7 +140,7 @@ ProcessExecution.prototype.resume = function resume() {
   const status = this.status;
   if (status === 'init') return this._start();
   const tracker = this[kTracker];
-  for (const msg of postponed.slice()) {
+  for (const msg of new Set(postponed)) {
     const activity = this.getActivityById(msg.content.id);
     if (!activity) continue;
     if (msg.content.placeholder) continue;
@@ -153,7 +153,7 @@ ProcessExecution.prototype.resume = function resume() {
     activity.resume();
   }
   if (this[kCompleted]) return;
-  if (!postponed.length && status === 'executing') return this._complete('completed');
+  if (!postponed.size && status === 'executing') return this._complete('completed');
 };
 ProcessExecution.prototype.getState = function getState() {
   const {
@@ -272,7 +272,7 @@ ProcessExecution.prototype.stop = function stop() {
 };
 ProcessExecution.prototype.getPostponed = function getPostponed(filterFn) {
   const result = [];
-  for (const msg of this[kElements].postponed.slice()) {
+  for (const msg of this[kElements].postponed) {
     const api = this._getChildApi(msg);
     if (!api) continue;
     if (filterFn && !filterFn(api)) continue;
@@ -325,11 +325,12 @@ ProcessExecution.prototype.getApi = function getApi(message) {
   const postponed = this[kElements].postponed;
   const self = this;
   api.getExecuting = function getExecuting() {
-    return postponed.reduce((result, msg) => {
+    const result = [];
+    for (const msg of postponed) {
       const childApi = self._getChildApi(msg);
       if (childApi) result.push(childApi);
-      return result;
-    }, []);
+    }
+    return result;
   };
   return api;
 };
@@ -354,8 +355,8 @@ ProcessExecution.prototype._start = function start() {
   for (const a of startActivities) a.init();
   this[kStatus] = 'executing';
   for (const a of startActivities) a.run();
-  postponed.splice(0);
-  detachedActivities.splice(0);
+  postponed.clear();
+  detachedActivities.clear();
   this[kActivityQ].assertConsumer(this[kMessageHandlers].onChildMessage, {
     prefetch: 1000,
     consumerTag: `_process-activity-${this.executionId}`
@@ -546,9 +547,13 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
       return this._onCancel(message);
     case 'activity.error.caught':
       {
-        const prevMsg = this[kElements].postponed.find(msg => {
-          return msg.content.executionId === content.executionId;
-        });
+        let prevMsg;
+        for (const msg of this[kElements].postponed) {
+          if (msg.content.executionId === content.executionId) {
+            prevMsg = msg;
+            break;
+          }
+        }
         if (!prevMsg) return message.ack();
         break;
       }
@@ -560,7 +565,7 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
   switch (routingKey) {
     case 'activity.detach':
       {
-        this[kElements].detachedActivities.push((0, _messageHelper.cloneMessage)(message));
+        this[kElements].detachedActivities.add((0, _messageHelper.cloneMessage)(message));
         break;
       }
     case 'activity.cancel':
@@ -581,10 +586,13 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
       }
     case 'activity.error':
       {
-        const eventCaughtBy = this[kElements].postponed.find(msg => {
-          if (msg.fields.routingKey !== 'activity.catch') return;
-          return msg.content.source && msg.content.source.executionId === content.executionId;
-        });
+        let eventCaughtBy;
+        for (const msg of this[kElements].postponed) {
+          if (msg.fields.routingKey === 'activity.catch' && msg.content.source && msg.content.source.executionId === content.executionId) {
+            eventCaughtBy = msg;
+            break;
+          }
+        }
         if (eventCaughtBy) {
           this[kActivityQ].queueMessage({
             routingKey: 'activity.error.caught'
@@ -603,23 +611,37 @@ ProcessExecution.prototype._onChildMessage = function onChildMessage(routingKey,
 ProcessExecution.prototype._stateChangeMessage = function stateChangeMessage(message, postponeMessage) {
   const previousMsg = this._popPostponed(message.content);
   if (previousMsg) previousMsg.ack();
-  if (postponeMessage) this[kElements].postponed.push(message);
+  if (postponeMessage) this[kElements].postponed.add(message);
 };
 ProcessExecution.prototype._popPostponed = function popPostponed(byContent) {
   const {
     postponed,
     detachedActivities
   } = this[kElements];
-  const postponedIdx = postponed.findIndex(msg => {
-    if (msg.content.isSequenceFlow || msg.content.isAssociation) return msg.content.sequenceId === byContent.sequenceId;
-    return msg.content.executionId === byContent.executionId;
-  });
   let postponedMsg;
-  if (postponedIdx > -1) {
-    postponedMsg = postponed.splice(postponedIdx, 1)[0];
+  if (byContent.sequenceId) {
+    for (const msg of postponed) {
+      if (!msg.content.isSequenceFlow && !msg.content.isAssociation) continue;
+      if (msg.content.sequenceId === byContent.sequenceId) {
+        postponedMsg = msg;
+        break;
+      }
+    }
+  } else {
+    for (const msg of postponed) {
+      if (msg.content.executionId === byContent.executionId) {
+        postponedMsg = msg;
+        break;
+      }
+    }
+  }
+  if (postponedMsg) postponed.delete(postponedMsg);
+  for (const msg of detachedActivities) {
+    if (msg.content.executionId === byContent.executionId) {
+      detachedActivities.delete(msg);
+      break;
+    }
   }
-  const detachedIdx = detachedActivities.findIndex(msg => msg.content.executionId === byContent.executionId);
-  if (detachedIdx > -1) detachedActivities.splice(detachedIdx, 1);
   return postponedMsg;
 };
 ProcessExecution.prototype._onChildCompleted = function onChildCompleted(message) {
@@ -635,15 +657,15 @@ ProcessExecution.prototype._onChildCompleted = function onChildCompleted(message
     detachedActivities,
     startActivities
   } = this[kElements];
-  const postponedCount = postponed.length;
+  const postponedCount = postponed.size;
   if (!postponedCount) {
     this._debug(`left <${id}> (${type}), pending runs ${postponedCount}`);
     message.ack();
     return this._complete('completed');
   }
   message.ack();
-  this._debug(`left <${id}> (${type}), pending runs ${postponedCount}, ${postponed.map(a => a.content.id).join(',')}`);
-  if (postponedCount && postponedCount === detachedActivities.length) {
+  this._debug(`left <${id}> (${type}), pending activities ${postponedCount}`);
+  if (postponedCount && postponedCount === detachedActivities.size) {
     return this[kActivityQ].queueMessage({
       routingKey: 'execution.discard.detached'
     }, {
@@ -687,8 +709,10 @@ ProcessExecution.prototype._stopExecution = function stopExecution(message) {
 };
 ProcessExecution.prototype._onDiscard = function onDiscard() {
   this._deactivate();
-  const running = this[kElements].postponed.splice(0);
-  this._debug(`discard process execution (discard child executions ${running.length})`);
+  const postponed = this[kElements].postponed;
+  const running = new Set(postponed);
+  postponed.clear();
+  this._debug(`discard process execution (discard child executions ${running.size})`);
   if (this.isSubProcess) {
     this.stop();
   } else {
@@ -700,10 +724,11 @@ ProcessExecution.prototype._onDiscard = function onDiscard() {
   return this._complete('discard');
 };
 ProcessExecution.prototype._onCancel = function onCancel() {
-  const running = this[kElements].postponed.slice(0);
+  const postponed = this[kElements].postponed;
+  const running = new Set(postponed);
   const isTransaction = this.isTransaction;
   if (isTransaction) {
-    this._debug(`cancel transaction execution (cancel child executions ${running.length})`);
+    this._debug(`cancel transaction execution (cancel child executions ${running.size})`);
     this[kStatus] = 'cancel';
     this.broker.publish('event', 'transaction.cancel', (0, _messageHelper.cloneMessage)(this[kExecuteMessage], {
       state: 'cancel'
@@ -716,7 +741,7 @@ ProcessExecution.prototype._onCancel = function onCancel() {
       }
     }
   } else {
-    this._debug(`cancel process execution (cancel child executions ${running.length})`);
+    this._debug(`cancel process execution (cancel child executions ${running.size})`);
     for (const msg of running) {
       this._getChildApi(msg).discard();
     }
@@ -799,7 +824,9 @@ ProcessExecution.prototype._complete = function complete(completionType, content
 ProcessExecution.prototype._terminate = function terminate(message) {
   this[kStatus] = 'terminated';
   this._debug('terminating process execution');
-  const running = this[kElements].postponed.splice(0);
+  const postponed = this[kElements].postponed;
+  const running = new Set(postponed);
+  postponed.clear();
   for (const flow of this.getSequenceFlows()) flow.stop();
   for (const flow of this.getAssociations()) flow.stop();
   for (const msg of running) {

package/dist/tasks/CallActivity.js

@@ -8,7 +8,7 @@ exports.default = CallActivity;
 var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _Errors = require("../error/Errors.js");
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function CallActivity(activityDef, context) {
   return new _Activity.default(CallActivityBehaviour, activityDef, context);
 }

package/dist/tasks/LoopCharacteristics.js

@@ -139,11 +139,11 @@ ParallelLoopCharacteristics.prototype.execute = function execute(executeMessage)
 ParallelLoopCharacteristics.prototype._startBatch = function startBatch() {
   const chr = this.characteristics;
   const cardinality = chr.cardinality;
-  const batch = [];
+  const batch = new Set();
   let startContent = chr.next(this.index);
   do {
     chr.debug(`start parallel iteration index ${this.index}`);
-    batch.push(startContent);
+    batch.add(startContent);
     this.running++;
     this.index++;
     if (this.index >= cardinality || this.running >= chr.batchSize) {

package/dist/tasks/ReceiveTask.js

@@ -7,7 +7,7 @@ exports.ReceiveTaskBehaviour = ReceiveTaskBehaviour;
 exports.default = ReceiveTask;
 var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const kCompleted = Symbol.for('completed');
 const kExecuteMessage = Symbol.for('executeMessage');
 const kReferenceElement = Symbol.for('referenceElement');

package/dist/tasks/ScriptTask.js

@@ -9,7 +9,7 @@ var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _ExecutionScope = _interopRequireDefault(require("../activity/ExecutionScope.js"));
 var _Errors = require("../error/Errors.js");
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ScriptTask(activityDef, context) {
   return new _Activity.default(ScriptTaskBehaviour, activityDef, context);
 }

package/dist/tasks/ServiceImplementation.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = ServiceImplementation;
 var _ExecutionScope = _interopRequireDefault(require("../activity/ExecutionScope.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ServiceImplementation(activity) {
   this.type = `${activity.type}:implementation`;
   this.implementation = activity.behaviour.implementation;

package/dist/tasks/ServiceTask.js

@@ -8,7 +8,7 @@ exports.default = ServiceTask;
 var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _Errors = require("../error/Errors.js");
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ServiceTask(activityDef, context) {
   return new _Activity.default(ServiceTaskBehaviour, activityDef, context);
 }

package/dist/tasks/SignalTask.js

@@ -8,7 +8,7 @@ exports.default = SignalTask;
 var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _Errors = require("../error/Errors.js");
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function SignalTask(activityDef, context) {
   return new _Activity.default(SignalTaskBehaviour, activityDef, context);
 }

package/dist/tasks/StandardLoopCharacteristics.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = StandardLoopCharacteristics;
 var _LoopCharacteristics = _interopRequireDefault(require("./LoopCharacteristics.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function StandardLoopCharacteristics(activity, loopCharacteristics) {
   let {
     behaviour

package/dist/tasks/SubProcess.js

@@ -8,7 +8,7 @@ exports.default = SubProcess;
 var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _ProcessExecution = _interopRequireDefault(require("../process/ProcessExecution.js"));
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const kExecutions = Symbol.for('executions');
 const kMessageHandlers = Symbol.for('messageHandlers');
 function SubProcess(activityDef, context) {
@@ -54,7 +54,7 @@ function SubProcessBehaviour(activity, context) {
   this.environment = activity.environment;
   this.broker = activity.broker;
   this.executionId = undefined;
-  this[kExecutions] = [];
+  this[kExecutions] = new Set();
   this[kMessageHandlers] = {
     onExecutionCompleted: this._onExecutionCompleted.bind(this)
   };
@@ -62,12 +62,12 @@ function SubProcessBehaviour(activity, context) {
 Object.defineProperties(SubProcessBehaviour.prototype, {
   execution: {
     get() {
-      return this[kExecutions][0];
+      return [...this[kExecutions]][0];
     }
   },
   executions: {
     get() {
-      return this[kExecutions].slice();
+      return [...this[kExecutions]];
     }
   }
 });
@@ -87,47 +87,45 @@ SubProcessBehaviour.prototype.execute = function execute(executeMessage) {
   return processExecution.execute(executeMessage);
 };
 SubProcessBehaviour.prototype.getState = function getState() {
+  const states = [];
+  for (const pe of this[kExecutions]) {
+    const state = pe.getState();
+    state.environment = pe.environment.getState();
+    states.push(state);
+  }
   if (this.loopCharacteristics) {
     return {
-      executions: this[kExecutions].map(pe => {
-        const state = pe.getState();
-        state.environment = pe.environment.getState();
-        return state;
-      })
+      executions: states
     };
   }
-  const execution = this.execution;
-  if (execution) {
-    const state = execution.getState();
-    state.environment = execution.environment.getState();
-    return state;
-  }
+  return states[0];
 };
 SubProcessBehaviour.prototype.recover = function recover(state) {
   if (!state) return;
   const executions = this[kExecutions];
   const loopCharacteristics = this.loopCharacteristics;
   if (loopCharacteristics && state.executions) {
-    executions.splice(0);
+    executions.clear();
     for (const se of state.executions) {
       this.recover(se);
     }
     return;
   }
   if (!loopCharacteristics) {
-    executions.splice(0);
+    executions.clear();
   }
   const subEnvironment = this.environment.clone().recover(state.environment);
   const subContext = this.context.clone(subEnvironment, this.activity);
   const execution = new _ProcessExecution.default(this.activity, subContext).recover(state);
-  executions.push(execution);
+  executions.add(execution);
   return execution;
 };
 SubProcessBehaviour.prototype.getPostponed = function getPostponed() {
-  return this[kExecutions].reduce((result, pe) => {
-    result = result.concat(pe.getPostponed());
-    return result;
-  }, []);
+  let postponed = [];
+  for (const pe of this[kExecutions]) {
+    postponed = postponed.concat(pe.getPostponed());
+  }
+  return postponed;
 };
 SubProcessBehaviour.prototype._upsertExecution = function upsertExecution(executeMessage) {
   const content = executeMessage.content;
@@ -140,7 +138,7 @@ SubProcessBehaviour.prototype._upsertExecution = function upsertExecution(execut
   const subEnvironment = this.environment.clone();
   const subContext = this.context.clone(subEnvironment, this.activity);
   execution = new _ProcessExecution.default(this.activity, subContext);
-  this[kExecutions].push(execution);
+  this[kExecutions].add(execution);
   this._addListeners(executionId);
   return execution;
 };
@@ -180,10 +178,9 @@ SubProcessBehaviour.prototype._onExecutionCompleted = function onExecutionComple
 };
 SubProcessBehaviour.prototype._completeExecution = function completeExecution(completeRoutingKey, content) {
   if (this.loopCharacteristics) {
-    const executions = this[kExecutions];
-    const executionIdx = executions.findIndex(pe => pe.executionId === content.executionId);
-    if (executionIdx < 0) return;
-    executions.splice(executionIdx, 1);
+    const execution = this._getExecutionById(content.executionId);
+    if (!execution) return;
+    this[kExecutions].delete(execution);
   }
   this.broker.publish('execution', completeRoutingKey, (0, _messageHelper.cloneContent)(content));
 };
@@ -199,5 +196,7 @@ SubProcessBehaviour.prototype.getApi = function getApi(apiMessage) {
   }
 };
 SubProcessBehaviour.prototype._getExecutionById = function getExecutionById(executionId) {
-  return this[kExecutions].find(pe => pe.executionId === executionId);
+  for (const pe of this[kExecutions]) {
+    if (pe.executionId === executionId) return pe;
+  }
 };

package/dist/tasks/Task.js

@@ -7,7 +7,7 @@ exports.TaskBehaviour = TaskBehaviour;
 exports.default = Task;
 var _Activity = _interopRequireDefault(require("../activity/Activity.js"));
 var _messageHelper = require("../messageHelper.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function Task(activityDef, context) {
   return new _Activity.default(TaskBehaviour, activityDef, context);
 }

package/dist/tasks/Transaction.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Transaction;
 var _SubProcess = _interopRequireDefault(require("./SubProcess.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function Transaction(activityDef, context) {
   const transaction = {
     type: 'transaction',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "14.0.1",
+  "version": "15.0.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,6 +35,7 @@
     "posttest": "npm run lint && npm run dist",
     "lint": "eslint . --cache && prettier . --check --cache",
     "prepack": "npm run dist",
+    "test:md": "texample ./docs/Examples.md,./docs/StartEvent.md,./docs/Extension.md",
     "cov:html": "c8 -r html -r text mocha -R @bonniernews/hot-bev -p -t 3000",
     "test:lcov": "c8 -r lcov mocha && npm run lint",
     "dist": "babel src -d dist/"
@@ -83,10 +84,11 @@
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^4.1.2",
     "nock": "^13.5.3",
-    "prettier": "^3.2.5"
+    "prettier": "^3.2.5",
+    "texample": "^0.0.5"
   },
   "dependencies": {
     "@0dep/piso": "^0.1.3",
-    "smqp": "^8.2.4"
+    "smqp": "^9.0.1"
   }
 }