bpmn-elements 14.1.0 → 15.0.1

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,9 +8,9 @@ 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');
+const kOnExecutionCompleted = Symbol.for('execution completed handler');
 function SubProcess(activityDef, context) {
   const triggeredByEvent = activityDef.behaviour && activityDef.behaviour.triggeredByEvent;
   const subProcess = new _Activity.default(SubProcessBehaviour, {
@@ -54,20 +54,18 @@ function SubProcessBehaviour(activity, context) {
   this.environment = activity.environment;
   this.broker = activity.broker;
   this.executionId = undefined;
-  this[kExecutions] = [];
-  this[kMessageHandlers] = {
-    onExecutionCompleted: this._onExecutionCompleted.bind(this)
-  };
+  this[kExecutions] = new Set();
+  this[kOnExecutionCompleted] = this._onExecutionCompleted.bind(this);
 }
 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 +85,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,12 +136,12 @@ 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;
 };
 SubProcessBehaviour.prototype._addListeners = function addListeners(executionId) {
-  this.broker.subscribeTmp('subprocess-execution', `execution.#.${executionId}`, this[kMessageHandlers].onExecutionCompleted, {
+  this.broker.subscribeTmp('subprocess-execution', `execution.#.${executionId}`, this[kOnExecutionCompleted], {
     noAck: true,
     consumerTag: `_sub-process-execution-${executionId}`
   });
@@ -180,10 +176,8 @@ 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);
+    this[kExecutions].delete(execution);
   }
   this.broker.publish('execution', completeRoutingKey, (0, _messageHelper.cloneContent)(content));
 };
@@ -194,10 +188,13 @@ SubProcessBehaviour.prototype.getApi = function getApi(apiMessage) {
   if (execution = this._getExecutionById(content.parent.executionId)) {
     return execution.getApi(apiMessage);
   }
+  if (!content.parent.path) return;
   for (const pp of content.parent.path) {
     if (execution = this._getExecutionById(pp.executionId)) return execution.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.1.0",
+  "version": "15.0.1",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -72,7 +72,7 @@
     "@bonniernews/hot-bev": "^0.4.0",
     "@types/node": "^16.18.95",
     "bpmn-moddle": "^9.0.1",
-    "c8": "^9.1.0",
+    "c8": "^10.1.1",
     "camunda-bpmn-moddle": "^7.0.1",
     "chai": "^5.1.0",
     "chronokinesis": "^6.0.0",
@@ -85,10 +85,10 @@
     "moddle-context-serializer": "^4.1.2",
     "nock": "^13.5.3",
     "prettier": "^3.2.5",
-    "texample": "^0.0.2"
+    "texample": "^0.0.5"
   },
   "dependencies": {
     "@0dep/piso": "^0.1.3",
-    "smqp": "^8.2.4"
+    "smqp": "^9.0.2"
   }
 }

package/src/Context.js

@@ -20,17 +20,15 @@ function ContextInstance(definitionContext, environment, owner) {
   this.definitionContext = definitionContext;
   this.environment = environment;
   this.extensionsMapper = new ExtensionsMapper(this);
-  this.refs = {
-    activityRefs: {},
-    associationRefs: [],
-    dataObjectRefs: {},
-    dataStoreRefs: {},
-    messageFlows: [],
-    processes: [],
-    processRefs: {},
-    sequenceFlowRefs: {},
-    sequenceFlows: [],
-  };
+  this.refs = new Map([
+    ['activityRefs', new Map()],
+    ['sequenceFlowRefs', new Map()],
+    ['processRefs', new Map()],
+    ['messageFlows', new Set()],
+    ['associationRefs', new Map()],
+    ['dataObjectRefs', new Map()],
+    ['dataStoreRefs', new Map()],
+  ]);
   this[kOwner] = owner;
 }
 
@@ -41,7 +39,7 @@ Object.defineProperty(ContextInstance.prototype, 'owner', {
 });
 
 ContextInstance.prototype.getActivityById = function getActivityById(activityId) {
-  const activityInstance = this.refs.activityRefs[activityId];
+  const activityInstance = this.refs.get('activityRefs').get(activityId);
   if (activityInstance) return activityInstance;
   const activity = this.definitionContext.getActivityById(activityId);
   if (!activity) return null;
@@ -49,16 +47,17 @@ ContextInstance.prototype.getActivityById = function getActivityById(activityId)
 };
 
 ContextInstance.prototype.upsertActivity = function upsertActivity(activityDef) {
-  let activityInstance = this.refs.activityRefs[activityDef.id];
+  let activityInstance = this.refs.get('activityRefs').get(activityDef.id);
   if (activityInstance) return activityInstance;
 
-  activityInstance = this.refs.activityRefs[activityDef.id] = new activityDef.Behaviour(activityDef, this);
+  activityInstance = new activityDef.Behaviour(activityDef, this);
+  this.refs.get('activityRefs').set(activityDef.id, activityInstance);
 
   return activityInstance;
 };
 
 ContextInstance.prototype.getSequenceFlowById = function getSequenceFlowById(sequenceFlowId) {
-  const flowInstance = this.refs.sequenceFlowRefs[sequenceFlowId];
+  const flowInstance = this.refs.get('sequenceFlowRefs').get(sequenceFlowId);
   if (flowInstance) return flowInstance;
 
   const flowDef = this.definitionContext.getSequenceFlowById(sequenceFlowId);
@@ -91,12 +90,12 @@ ContextInstance.prototype.getSequenceFlows = function getSequenceFlows(scopeId)
 };
 
 ContextInstance.prototype.upsertSequenceFlow = function upsertSequenceFlow(flowDefinition) {
-  const refs = this.refs.sequenceFlowRefs;
-  let flowInstance = refs[flowDefinition.id];
+  const sequenceFlowRefs = this.refs.get('sequenceFlowRefs');
+  let flowInstance = sequenceFlowRefs.get(flowDefinition.id);
   if (flowInstance) return flowInstance;
 
-  flowInstance = refs[flowDefinition.id] = new flowDefinition.Behaviour(flowDefinition, this);
-  this.refs.sequenceFlows.push(flowInstance);
+  flowInstance = new flowDefinition.Behaviour(flowDefinition, this);
+  sequenceFlowRefs.set(flowDefinition.id, flowInstance);
 
   return flowInstance;
 };
@@ -106,11 +105,13 @@ ContextInstance.prototype.getAssociations = function getAssociations(scopeId) {
 };
 
 ContextInstance.prototype.upsertAssociation = function upsertAssociation(associationDefinition) {
-  const refs = this.refs.associationRefs;
-  let instance = refs[associationDefinition.id];
+  const associationRefs = this.refs.get('associationRefs');
+  let instance = associationRefs.get(associationDefinition.id);
   if (instance) return instance;
 
-  instance = refs[associationDefinition.id] = new associationDefinition.Behaviour(associationDefinition, this);
+  instance = new associationDefinition.Behaviour(associationDefinition, this);
+
+  associationRefs.set(associationDefinition.id, instance);
 
   return instance;
 };
@@ -120,19 +121,18 @@ ContextInstance.prototype.clone = function clone(newEnvironment, newOwner) {
 };
 
 ContextInstance.prototype.getProcessById = function getProcessById(processId) {
-  const refs = this.refs.processRefs;
-  let bp = this.refs.processRefs[processId];
+  const processRefs = this.refs.get('processRefs');
+  let bp = processRefs.get(processId);
   if (bp) return bp;
 
   const processDefinition = this.definitionContext.getProcessById(processId);
   if (!processDefinition) return null;
 
   const bpContext = this.clone(this.environment.clone());
-  bp = refs[processId] = new processDefinition.Behaviour(processDefinition, bpContext);
+  bp = new processDefinition.Behaviour(processDefinition, bpContext);
+  processRefs.set(processId, bp);
   bpContext[kOwner] = bp;
 
-  this.refs.processes.push(bp);
-
   return bp;
 };
 
@@ -156,35 +156,51 @@ ContextInstance.prototype.getExecutableProcesses = function getExecutableProcess
 };
 
 ContextInstance.prototype.getMessageFlows = function getMessageFlows(sourceId) {
-  if (!this.refs.messageFlows.length) {
-    const flows = this.definitionContext.getMessageFlows() || [];
-    this.refs.messageFlows.push(...flows.map((flow) => new flow.Behaviour(flow, this)));
+  const messageFlowRefs = this.refs.get('messageFlows');
+
+  const result = [];
+  if (!messageFlowRefs.size) {
+    const msgFlows = this.definitionContext.getMessageFlows() || [];
+    for (const msgFlow of msgFlows) {
+      const flow = new msgFlow.Behaviour(msgFlow, this);
+      messageFlowRefs.add(flow);
+
+      if (flow.source.processId === sourceId) result.push(flow);
+    }
+  } else {
+    for (const flow of messageFlowRefs) {
+      if (flow.source.processId === sourceId) result.push(flow);
+    }
   }
 
-  return this.refs.messageFlows.filter((flow) => flow.source.processId === sourceId);
+  return result;
 };
 
 ContextInstance.prototype.getDataObjectById = function getDataObjectById(referenceId) {
+  const dataObjectRefs = this.refs.get('dataObjectRefs');
   let dataObject;
-  if ((dataObject = this.refs.dataObjectRefs[referenceId])) return dataObject;
+  if ((dataObject = dataObjectRefs.get(referenceId))) return dataObject;
 
   const dataObjectDef = this.definitionContext.getDataObjectById(referenceId);
   if (!dataObjectDef) return;
 
-  dataObject = this.refs.dataObjectRefs[dataObjectDef.id] = new dataObjectDef.Behaviour(dataObjectDef, this);
+  dataObject = new dataObjectDef.Behaviour(dataObjectDef, this);
+  dataObjectRefs.set(dataObjectDef.id, dataObject);
 
   return dataObject;
 };
 
 ContextInstance.prototype.getDataStoreById = function getDataStoreById(referenceId) {
+  const dataStoreRefs = this.refs.get('dataStoreRefs');
   let dataStore;
-  if ((dataStore = this.refs.dataStoreRefs[referenceId])) return dataStore;
+  if ((dataStore = dataStoreRefs.get(referenceId))) return dataStore;
 
   const dataStoreDef =
     this.definitionContext.getDataStoreById(referenceId) || this.definitionContext.getDataStoreReferenceById(referenceId);
   if (!dataStoreDef) return;
 
-  dataStore = this.refs.dataStoreRefs[dataStoreDef.id] = new dataStoreDef.Behaviour(dataStoreDef, this);
+  dataStore = new dataStoreDef.Behaviour(dataStoreDef, this);
+  dataStoreRefs.set(dataStoreDef.id, dataStore);
 
   return dataStore;
 };

package/src/Environment.js

@@ -1,11 +1,11 @@
 import Expressions from './Expressions.js';
-import { Scripts as IScripts } from './Scripts.js';
+import { Scripts } from './Scripts.js';
 import { Timers } from './Timers.js';
 
 const kServices = Symbol.for('services');
 const kVariables = Symbol.for('variables');
 
-const defaultOptions = ['expressions', 'extensions', 'Logger', 'output', 'scripts', 'services', 'settings', 'timers', 'variables'];
+const defaultOptions = new Set(['expressions', 'extensions', 'Logger', 'output', 'scripts', 'services', 'settings', 'timers', 'variables']);
 
 export default function Environment(options = {}) {
   this.options = validateOptions(options);
@@ -13,7 +13,7 @@ export default function Environment(options = {}) {
   this.expressions = options.expressions || Expressions();
   this.extensions = options.extensions;
   this.output = options.output || {};
-  this.scripts = options.scripts || IScripts();
+  this.scripts = options.scripts || new Scripts();
   this.timers = options.timers || new Timers();
   this.settings = { ...options.settings };
   this.Logger = options.Logger || DummyLogger;
@@ -125,7 +125,7 @@ Environment.prototype.addService = function addService(name, fn) {
 function validateOptions(input) {
   const options = {};
   for (const key in input) {
-    if (defaultOptions.indexOf(key) === -1) {
+    if (!defaultOptions.has(key)) {
       options[key] = input[key];
     }
   }

package/src/MessageFormatter.js

@@ -14,9 +14,6 @@ function Formatter(element, formatQ) {
   this.broker = broker;
   this.logger = logger;
   this.formatQ = formatQ;
-
-  this.pendingFormats = [];
-
   this[kOnMessage] = this._onMessage.bind(this);
 }
 

package/src/Scripts.js

@@ -1,9 +1,4 @@
-export function Scripts() {
-  return {
-    getScript,
-    register,
-  };
+export function Scripts() {}
 
-  function getScript(/*scriptType, activity*/) {}
-  function register(/*activity*/) {}
-}
+Scripts.prototype.getScript = function getScript(/*scriptType, activity*/) {};
+Scripts.prototype.register = function register(/*activity*/) {};

package/src/Timers.js

@@ -10,14 +10,14 @@ export function Timers(options) {
     clearTimeout,
     ...options,
   };
-  this[kExecuting] = [];
+  this[kExecuting] = new Set();
   this.setTimeout = this.setTimeout.bind(this);
   this.clearTimeout = this.clearTimeout.bind(this);
 }
 
 Object.defineProperty(Timers.prototype, 'executing', {
   get() {
-    return this[kExecuting].slice();
+    return [...this[kExecuting]];
   },
 });
 
@@ -30,10 +30,7 @@ Timers.prototype.setTimeout = function wrappedSetTimeout(callback, delay, ...arg
 };
 
 Timers.prototype.clearTimeout = function wrappedClearTimeout(ref) {
-  const executing = this[kExecuting];
-  const idx = executing.indexOf(ref);
-  if (idx > -1) {
-    executing.splice(idx, 1);
+  if (this[kExecuting].delete(ref)) {
     ref.timerRef = this.options.clearTimeout(ref.timerRef);
     return;
   }
@@ -43,15 +40,14 @@ Timers.prototype.clearTimeout = function wrappedClearTimeout(ref) {
 Timers.prototype._setTimeout = function setTimeout(owner, callback, delay, ...args) {
   const executing = this[kExecuting];
   const ref = this._getReference(owner, callback, delay, args);
-  executing.push(ref);
+  executing.add(ref);
   if (delay < MAX_DELAY) {
     ref.timerRef = this.options.setTimeout(onTimeout, ref.delay, ...ref.args);
   }
   return ref;
 
   function onTimeout(...rargs) {
-    const idx = executing.indexOf(ref);
-    if (idx > -1) executing.splice(idx, 1);
+    executing.delete(ref);
     return callback(...rargs);
   }
 };

package/src/Tracker.js

@@ -1,14 +1,14 @@
 export function ActivityTracker(parentId) {
   this.id = parentId;
-  this.status = { wait: [], execute: [], timer: [] };
+  this.status = { wait: new Set(), execute: new Set(), timer: new Set() };
 }
 
 Object.defineProperty(ActivityTracker.prototype, 'activityStatus', {
   get() {
     const status = this.status;
-    if (status.execute.length) return 'executing';
-    if (status.timer.length) return 'timer';
-    return status.wait.length ? 'wait' : 'idle';
+    if (status.execute.size) return 'executing';
+    if (status.timer.size) return 'timer';
+    return status.wait.size ? 'wait' : 'idle';
   },
 });
 
@@ -46,29 +46,25 @@ ActivityTracker.prototype.track = function track(routingKey, message) {
 
 ActivityTracker.prototype._executing = function executing(id) {
   const { wait, execute } = this.status;
-  if (execute.indexOf(id) === -1) execute.push(id);
-  let idx;
-  if ((idx = wait.indexOf(id)) !== -1) wait.splice(idx, 1);
+  wait.delete(id);
+  execute.add(id);
 };
 
 ActivityTracker.prototype._waiting = function waiting(id) {
   const { wait, execute } = this.status;
-  if (wait.indexOf(id) === -1) wait.push(id);
-  let idx;
-  if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
+  execute.delete(id);
+  wait.add(id);
 };
 
 ActivityTracker.prototype._timer = function timerFn(id) {
   const { timer, execute } = this.status;
-  if (timer.indexOf(id) === -1) timer.push(id);
-  let idx;
-  if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
+  execute.delete(id);
+  timer.add(id);
 };
 
 ActivityTracker.prototype._leave = function leave(id) {
   const { wait, execute, timer } = this.status;
-  let idx;
-  if ((idx = wait.indexOf(id)) !== -1) wait.splice(idx, 1);
-  if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
-  if ((idx = timer.indexOf(id)) !== -1) timer.splice(idx, 1);
+  execute.delete(id);
+  timer.delete(id);
+  wait.delete(id);
 };