bpmn-elements 14.0.1 → 15.0.0

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/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/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);
 };

package/src/activity/Activity.js

@@ -347,11 +347,13 @@ Activity.prototype.addInboundListeners = function addInboundListeners() {
   const onInboundEvent = this._onInboundEvent.bind(this);
   const triggerConsumerTag = `_inbound-${this.id}`;
   for (const trigger of this[kFlows].inboundTriggers) {
-    if (trigger.isSequenceFlow)
+    if (trigger.isSequenceFlow) {
       trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
-    else if (this.isForCompensation)
+    } else if (this.isForCompensation) {
       trigger.broker.subscribeTmp('event', 'association.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
-    else trigger.broker.subscribeTmp('event', 'activity.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
+    } else {
+      trigger.broker.subscribeTmp('event', 'activity.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
+    }
   }
 };
 

package/src/activity/ActivityExecution.js

@@ -14,7 +14,7 @@ function ActivityExecution(activity, context) {
   this.context = context;
   this.id = activity.id;
   this.broker = activity.broker;
-  this[kPostponed] = [];
+  this[kPostponed] = new Set();
   this[kCompleted] = false;
   this[kExecuteQ] = this.broker.assertQueue('execute-q', { durable: true, autoDelete: false });
 
@@ -43,7 +43,7 @@ ActivityExecution.prototype.execute = function execute(executeMessage) {
   }));
 
   if (executeMessage.fields.redelivered) {
-    this[kPostponed].splice(0);
+    this[kPostponed].clear();
     this._debug('resume execution');
 
     if (!this.source) this.source = new this.activity.Behaviour(this.activity, this.context);
@@ -108,11 +108,12 @@ ActivityExecution.prototype.getApi = function getApi(apiMessage) {
   const api = ActivityApi(self.broker, apiMessage);
 
   api.getExecuting = function getExecuting() {
-    return self[kPostponed].reduce((result, msg) => {
-      if (msg.content.executionId === apiMessage.content.executionId) return result;
+    const result = [];
+    for (const msg of self[kPostponed]) {
+      if (msg.content.executionId === apiMessage.content.executionId) continue;
       result.push(self.getApi(msg));
-      return result;
-    }, []);
+    }
+    return result;
   };
 
   return api;
@@ -124,7 +125,10 @@ ActivityExecution.prototype.passthrough = function passthrough(executeMessage) {
 };
 
 ActivityExecution.prototype.getPostponed = function getPostponed() {
-  let apis = this[kPostponed].map((msg) => this.getApi(msg));
+  let apis = [];
+  for (const msg of this[kPostponed]) {
+    apis.push(this.getApi(msg));
+  }
   if (!this.activity.isSubProcess || !this.source) return apis;
   apis = apis.concat(this.source.getPostponed());
   return apis;
@@ -139,7 +143,7 @@ ActivityExecution.prototype.getState = function getState() {
 };
 
 ActivityExecution.prototype.recover = function recover(state) {
-  this[kPostponed].splice(0);
+  this[kPostponed].clear();
 
   if (!state) return this;
   if ('completed' in state) this[kCompleted] = state.completed;
@@ -174,7 +178,7 @@ ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routin
 
   switch (routingKey) {
     case 'execute.resume.execution': {
-      if (!this[kPostponed].length) return this.broker.publish('execution', 'execute.start', cloneContent(this[kExecuteMessage].content));
+      if (!this[kPostponed].size) return this.broker.publish('execution', 'execute.start', cloneContent(this[kExecuteMessage].content));
       break;
     }
     case 'execute.cancel':
@@ -215,22 +219,27 @@ ActivityExecution.prototype._onExecuteMessage = function onExecuteMessage(routin
 ActivityExecution.prototype._onStateChangeMessage = function onStateChangeMessage(message) {
   const { ignoreIfExecuting, executionId } = message.content;
   const postponed = this[kPostponed];
-  const idx = postponed.findIndex((msg) => msg.content.executionId === executionId);
+
   let previousMsg;
-  if (idx > -1) {
+  for (const msg of postponed) {
+    if (msg.content.executionId === executionId) previousMsg = msg;
+  }
+
+  if (previousMsg) {
     if (ignoreIfExecuting) {
       message.ack();
       return false;
     }
 
-    previousMsg = postponed.splice(idx, 1, message)[0];
+    postponed.delete(previousMsg);
+    postponed.add(message);
     previousMsg.ack();
 
+    return true;
+  } else {
+    postponed.add(message);
     return true;
   }
-
-  postponed.push(message);
-  return true;
 };
 
 ActivityExecution.prototype._onExecutionCompleted = function onExecutionCompleted(message) {
@@ -242,8 +251,11 @@ ActivityExecution.prototype._onExecutionCompleted = function onExecutionComplete
   if (!isRootScope) {
     this._debug('completed sub execution');
     if (!keep) message.ack();
-    if (postponed.length === 1 && postponed[0].content.isRootScope && !postponed[0].content.preventComplete) {
-      return this.broker.publish('execution', 'execute.completed', cloneContent(postponed[0].content));
+    if (postponed.size === 1) {
+      const onlyMessage = postponed.values().next().value;
+      if (onlyMessage.content.isRootScope && !onlyMessage.content.preventComplete) {
+        return this.broker.publish('execution', 'execute.completed', cloneContent(onlyMessage.content));
+      }
     }
     return;
   }
@@ -256,7 +268,7 @@ ActivityExecution.prototype._onExecutionCompleted = function onExecutionComplete
   this.deactivate();
 
   const subApis = this.getPostponed();
-  postponed.splice(0);
+  postponed.clear();
   for (const api of subApis) api.discard();
 
   this._publishExecutionCompleted('completed', { ...postponedMsg.content, ...message.content }, message.properties.correlationId);
@@ -271,8 +283,11 @@ ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarde
   const correlationId = message.properties.correlationId;
   if (!error && !isRootScope) {
     message.ack();
-    if (postponed.length === 1 && postponed[0].content.isRootScope) {
-      return this.broker.publish('execution', 'execute.discard', postponed[0].content, { correlationId });
+    if (postponed.size === 1) {
+      const onlyMessage = postponed.values().next().value;
+      if (onlyMessage.content.isRootScope) {
+        return this.broker.publish('execution', 'execute.discard', onlyMessage.content, { correlationId });
+      }
     }
     return;
   }
@@ -282,7 +297,7 @@ ActivityExecution.prototype._onExecutionDiscarded = function onExecutionDiscarde
   this.deactivate();
 
   const subApis = this.getPostponed();
-  postponed.splice(0);
+  postponed.clear();
   for (const api of subApis) api.discard();
 
   this._publishExecutionCompleted(discardType, cloneContent(message.content), correlationId);
@@ -310,11 +325,13 @@ ActivityExecution.prototype._ackPostponed = function ackPostponed(completeMessag
   const { executionId: eid } = completeMessage.content;
 
   const postponed = this[kPostponed];
-  const idx = postponed.findIndex(({ content: c }) => c.executionId === eid);
-  if (idx === -1) return;
-  const [msg] = postponed.splice(idx, 1);
-  msg.ack();
-  return msg;
+  for (const msg of postponed) {
+    if (msg.content.executionId === eid) {
+      postponed.delete(msg);
+      msg.ack();
+      return msg;
+    }
+  }
 };
 
 ActivityExecution.prototype._onParentApiMessage = function onParentApiMessage(routingKey, message) {