bpmn-elements 7.0.0 → 8.0.0

package/CHANGELOG.md

@@ -1,6 +1,19 @@
 Changelog
 =========
 
+# 8.0.0
+
+## Breaking
+
+- all processes will invoked with a cloned context and environment
+- a cloned environment will no longer forward output
+- remove output prop from process state. Not sure why it was there in the first place?
+- remove mysterious options symbol from Environment
+
+## Fix
+
+- fix double completion if resumed on error
+
 # 7.0.0
 
 Support Call activity

package/dist/src/Context.js

@@ -45,7 +45,9 @@ function ContextInstance(definitionContext, environment) {
   };
 }
 
-ContextInstance.prototype.getActivityById = function getActivityById(activityId) {
+const proto = ContextInstance.prototype;
+
+proto.getActivityById = function getActivityById(activityId) {
   const activityInstance = this.refs.activityRefs[activityId];
   if (activityInstance) return activityInstance;
   const activity = this.definitionContext.getActivityById(activityId);
@@ -53,14 +55,14 @@ ContextInstance.prototype.getActivityById = function getActivityById(activityId)
   return this.upsertActivity(activity);
 };
 
-ContextInstance.prototype.upsertActivity = function upsertActivity(activityDef) {
+proto.upsertActivity = function upsertActivity(activityDef) {
   let activityInstance = this.refs.activityRefs[activityDef.id];
   if (activityInstance) return activityInstance;
   activityInstance = this.refs.activityRefs[activityDef.id] = new activityDef.Behaviour(activityDef, this);
   return activityInstance;
 };
 
-ContextInstance.prototype.getSequenceFlowById = function getSequenceFlowById(sequenceFlowId) {
+proto.getSequenceFlowById = function getSequenceFlowById(sequenceFlowId) {
   const flowInstance = this.refs.sequenceFlowRefs[sequenceFlowId];
   if (flowInstance) return flowInstance;
   const flowDef = this.definitionContext.getSequenceFlowById(sequenceFlowId);
@@ -68,31 +70,31 @@ ContextInstance.prototype.getSequenceFlowById = function getSequenceFlowById(seq
   return this.upsertSequenceFlow(flowDef);
 };
 
-ContextInstance.prototype.getInboundSequenceFlows = function getInboundSequenceFlows(activityId) {
+proto.getInboundSequenceFlows = function getInboundSequenceFlows(activityId) {
   return (this.definitionContext.getInboundSequenceFlows(activityId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
 
-ContextInstance.prototype.getOutboundSequenceFlows = function getOutboundSequenceFlows(activityId) {
+proto.getOutboundSequenceFlows = function getOutboundSequenceFlows(activityId) {
   return (this.definitionContext.getOutboundSequenceFlows(activityId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
 
-ContextInstance.prototype.getInboundAssociations = function getInboundAssociations(activityId) {
+proto.getInboundAssociations = function getInboundAssociations(activityId) {
   return (this.definitionContext.getInboundAssociations(activityId) || []).map(association => this.upsertAssociation(association));
 };
 
-ContextInstance.prototype.getOutboundAssociations = function getOutboundAssociations(activityId) {
+proto.getOutboundAssociations = function getOutboundAssociations(activityId) {
   return (this.definitionContext.getOutboundAssociations(activityId) || []).map(association => this.upsertAssociation(association));
 };
 
-ContextInstance.prototype.getActivities = function getActivities(scopeId) {
+proto.getActivities = function getActivities(scopeId) {
   return (this.definitionContext.getActivities(scopeId) || []).map(activityDef => this.upsertActivity(activityDef));
 };
 
-ContextInstance.prototype.getSequenceFlows = function getSequenceFlows(scopeId) {
+proto.getSequenceFlows = function getSequenceFlows(scopeId) {
   return (this.definitionContext.getSequenceFlows(scopeId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
 
-ContextInstance.prototype.upsertSequenceFlow = function upsertSequenceFlow(flowDefinition) {
+proto.upsertSequenceFlow = function upsertSequenceFlow(flowDefinition) {
   const refs = this.refs.sequenceFlowRefs;
   let flowInstance = refs[flowDefinition.id];
   if (flowInstance) return flowInstance;
@@ -101,11 +103,11 @@ ContextInstance.prototype.upsertSequenceFlow = function upsertSequenceFlow(flowD
   return flowInstance;
 };
 
-ContextInstance.prototype.getAssociations = function getAssociations(scopeId) {
+proto.getAssociations = function getAssociations(scopeId) {
   return (this.definitionContext.getAssociations(scopeId) || []).map(association => this.upsertAssociation(association));
 };
 
-ContextInstance.prototype.upsertAssociation = function upsertAssociation(associationDefinition) {
+proto.upsertAssociation = function upsertAssociation(associationDefinition) {
   const refs = this.refs.associationRefs;
   let instance = refs[associationDefinition.id];
   if (instance) return instance;
@@ -113,44 +115,42 @@ ContextInstance.prototype.upsertAssociation = function upsertAssociation(associa
   return instance;
 };
 
-ContextInstance.prototype.clone = function clone(newEnvironment) {
+proto.clone = function clone(newEnvironment) {
   return new ContextInstance(this.definitionContext, newEnvironment || this.environment);
 };
 
-ContextInstance.prototype.getProcessById = function getProcessById(processId) {
+proto.getProcessById = function getProcessById(processId) {
   const refs = this.refs.processRefs;
-  let processInstance = this.refs.processRefs[processId];
-  if (processInstance) return processInstance;
+  let bp = this.refs.processRefs[processId];
+  if (bp) return bp;
   const processDefinition = this.definitionContext.getProcessById(processId);
   if (!processDefinition) return null;
-  processInstance = refs[processId] = new processDefinition.Behaviour(processDefinition, this);
-  this.refs.processes.push(processInstance);
-  return processInstance;
+  const bpContext = this.clone(this.environment.clone());
+  bp = refs[processId] = new processDefinition.Behaviour(processDefinition, bpContext);
+  this.refs.processes.push(bp);
+  return bp;
 };
 
-ContextInstance.prototype.getNewProcessById = function getNewProcessById(processId, processOptions) {
+proto.getNewProcessById = function getNewProcessById(processId) {
   if (!this.getProcessById(processId)) return null;
-  const processDefinition = this.definitionContext.getProcessById(processId);
-  const processInstance = new processDefinition.Behaviour(processDefinition, this.clone(this.environment.clone({
-    output: {},
-    ...processOptions
-  })));
-  return processInstance;
+  const bpDef = this.definitionContext.getProcessById(processId);
+  const bp = new bpDef.Behaviour(bpDef, this.clone(this.environment.clone()));
+  return bp;
 };
 
-ContextInstance.prototype.getProcesses = function getProcesses() {
+proto.getProcesses = function getProcesses() {
   return this.definitionContext.getProcesses().map(({
     id: processId
   }) => this.getProcessById(processId));
 };
 
-ContextInstance.prototype.getExecutableProcesses = function getExecutableProcesses() {
+proto.getExecutableProcesses = function getExecutableProcesses() {
   return this.definitionContext.getExecutableProcesses().map(({
     id: processId
   }) => this.getProcessById(processId));
 };
 
-ContextInstance.prototype.getMessageFlows = function getMessageFlows(sourceId) {
+proto.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)));
@@ -159,7 +159,7 @@ ContextInstance.prototype.getMessageFlows = function getMessageFlows(sourceId) {
   return this.refs.messageFlows.filter(flow => flow.source.processId === sourceId);
 };
 
-ContextInstance.prototype.getDataObjectById = function getDataObjectById(referenceId) {
+proto.getDataObjectById = function getDataObjectById(referenceId) {
   let dataObject;
   if (dataObject = this.refs.dataObjectRefs[referenceId]) return dataObject;
   const dataObjectDef = this.definitionContext.getDataObjectById(referenceId);
@@ -168,7 +168,7 @@ ContextInstance.prototype.getDataObjectById = function getDataObjectById(referen
   return dataObject;
 };
 
-ContextInstance.prototype.getDataStoreById = function getDataStoreById(referenceId) {
+proto.getDataStoreById = function getDataStoreById(referenceId) {
   let dataStore;
   if (dataStore = this.refs.dataStoreRefs[referenceId]) return dataStore;
   const dataStoreDef = this.definitionContext.getDataStoreById(referenceId) || this.definitionContext.getDataStoreReferenceById(referenceId);
@@ -177,22 +177,32 @@ ContextInstance.prototype.getDataStoreById = function getDataStoreById(reference
   return dataStore;
 };
 
-ContextInstance.prototype.getStartActivities = function getStartActivities(filterOptions, scopeId) {
+proto.getStartActivities = function getStartActivities(filterOptions, scopeId) {
   const {
     referenceId,
     referenceType = 'unknown'
   } = filterOptions || {};
-  return this.getActivities().filter(activity => {
-    if (!activity.isStart) return false;
-    if (scopeId && activity.parent.id !== scopeId) return false;
-    if (!filterOptions) return true;
-    if (!activity.behaviour.eventDefinitions && !activity.behaviour.eventDefinitions) return false;
-    return activity.eventDefinitions.some(ed => {
+  const result = [];
+
+  for (const activity of this.getActivities()) {
+    if (!activity.isStart) continue;
+    if (scopeId && activity.parent.id !== scopeId) continue;
+
+    if (!filterOptions) {
+      result.push(activity);
+      continue;
+    }
+
+    if (!activity.behaviour.eventDefinitions && !activity.behaviour.eventDefinitions) continue;
+    const ref = activity.eventDefinitions.some(ed => {
       return ed.reference && ed.reference.id === referenceId && ed.reference.referenceType === referenceType;
     });
-  });
+    if (ref) result.push(activity);
+  }
+
+  return result;
 };
 
-ContextInstance.prototype.loadExtensions = function loadExtensions(activity) {
+proto.loadExtensions = function loadExtensions(activity) {
   return this.extensionsMapper.get(activity);
 };

package/dist/src/Environment.js

@@ -13,23 +13,22 @@ var _Timers = require("./Timers");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const optionsSymbol = Symbol.for('options');
-const variablesSymbol = Symbol.for('variables');
-const defaultOptions = ['extensions', 'output', 'services', 'scripts', 'settings', 'variables', 'Logger'];
+const kServices = Symbol.for('services');
+const kVariables = Symbol.for('variables');
+const defaultOptions = ['expressions', 'extensions', 'Logger', 'output', 'scripts', 'services', 'settings', 'timers', 'variables'];
 
 function Environment(options = {}) {
-  this[optionsSymbol] = options;
   this.options = validateOptions(options);
   this.expressions = options.expressions || (0, _Expressions.default)();
   this.extensions = options.extensions;
   this.output = options.output || {};
   this.scripts = options.scripts || (0, _Scripts.Scripts)();
-  this.services = options.services || {};
+  this.timers = options.timers || (0, _Timers.Timers)();
   this.settings = { ...options.settings
   };
-  this.timers = options.timers || (0, _Timers.Timers)();
   this.Logger = options.Logger || DummyLogger;
-  this[variablesSymbol] = options.variables || {};
+  this[kServices] = options.services || {};
+  this[kVariables] = options.variables || {};
 }
 
 const proto = Environment.prototype;
@@ -37,7 +36,25 @@ Object.defineProperty(proto, 'variables', {
   enumerable: true,
 
   get() {
-    return this[variablesSymbol];
+    return this[kVariables];
+  }
+
+});
+Object.defineProperty(proto, 'services', {
+  enumerable: true,
+
+  get() {
+    return this[kServices];
+  },
+
+  set(value) {
+    const services = this[kServices];
+
+    for (const name in services) {
+      if (!(name in value)) delete services[name];
+    }
+
+    Object.assign(services, value);
   }
 
 });
@@ -46,7 +63,7 @@ proto.getState = function getState() {
   return {
     settings: { ...this.settings
     },
-    variables: { ...this.variables
+    variables: { ...this[kVariables]
     },
     output: { ...this.output
     }
@@ -55,22 +72,18 @@ proto.getState = function getState() {
 
 proto.recover = function recover(state) {
   if (!state) return this;
-  const recoverOptions = validateOptions(state);
-  Object.assign(this[optionsSymbol], recoverOptions);
   if (state.settings) Object.assign(this.settings, state.settings);
-  if (state.variables) Object.assign(this[variablesSymbol], state.variables);
+  if (state.variables) Object.assign(this[kVariables], state.variables);
   if (state.output) Object.assign(this.output, state.output);
   return this;
 };
 
 proto.clone = function clone(overrideOptions = {}) {
-  const services = this.services;
+  const services = this[kServices];
   const newOptions = {
     settings: { ...this.settings
     },
-    variables: { ...this.variables
-    },
-    output: { ...this.output
+    variables: { ...this[kVariables]
     },
     Logger: this.Logger,
     extensions: this.extensions,
@@ -89,11 +102,18 @@ proto.clone = function clone(overrideOptions = {}) {
 
 proto.assignVariables = function assignVariables(newVars) {
   if (!newVars || typeof newVars !== 'object') return;
-  this[variablesSymbol] = { ...this.variables,
+  this[kVariables] = { ...this.variables,
     ...newVars
   };
 };
 
+proto.assignSettings = function assignVariables(newSettings) {
+  if (!newSettings || typeof newSettings !== 'object') return;
+  this.settings = { ...this.settings,
+    ...newSettings
+  };
+};
+
 proto.getScript = function getScript(...args) {
   return this.scripts.getScript(...args);
 };
@@ -103,7 +123,7 @@ proto.registerScript = function registerScript(...args) {
 };
 
 proto.getServiceByName = function getServiceByName(serviceName) {
-  return this.services[serviceName];
+  return this[kServices][serviceName];
 };
 
 proto.resolveExpression = function resolveExpression(expression, message = {}, expressionFnContext) {
@@ -115,7 +135,7 @@ proto.resolveExpression = function resolveExpression(expression, message = {}, e
 };
 
 proto.addService = function addService(name, fn) {
-  this.services[name] = fn;
+  this[kServices][name] = fn;
 };
 
 function validateOptions(input) {

package/dist/src/MessageFormatter.js

@@ -13,8 +13,8 @@ var _Errors = require("./error/Errors");
 
 var _smqp = require("smqp");
 
-const onMessageSymbol = Symbol.for('onMessage');
-const executionSymbol = Symbol.for('execution');
+const kOnMessage = Symbol.for('onMessage');
+const kExecution = Symbol.for('execution');
 
 function Formatter(element, formatQ) {
   const {
@@ -27,7 +27,7 @@ function Formatter(element, formatQ) {
   this.logger = logger;
   this.formatQ = formatQ;
   this.pendingFormats = [];
-  this[onMessageSymbol] = this._onMessage.bind(this);
+  this[kOnMessage] = this._onMessage.bind(this);
 }
 
 Formatter.prototype.format = function format(message, callback) {
@@ -40,7 +40,7 @@ Formatter.prototype.format = function format(message, callback) {
     correlationId,
     persistent: false
   });
-  this[executionSymbol] = {
+  this[kExecution] = {
     correlationId,
     formatKey: message.fields.routingKey,
     runMessage: (0, _messageHelper.cloneMessage)(message),
@@ -49,7 +49,7 @@ Formatter.prototype.format = function format(message, callback) {
     formatted: false,
     executeMessage: null
   };
-  formatQ.consume(this[onMessageSymbol], {
+  formatQ.consume(this[kOnMessage], {
     consumerTag,
     prefetch: 100
   });
@@ -61,7 +61,7 @@ Formatter.prototype._onMessage = function onMessage(routingKey, message) {
     correlationId,
     pending,
     executeMessage
-  } = this[executionSymbol];
+  } = this[kExecution];
   const asyncFormatting = pending.length;
 
   switch (routingKey) {
@@ -73,7 +73,7 @@ Formatter.prototype._onMessage = function onMessage(routingKey, message) {
         return this._complete(message);
       }
 
-      this[executionSymbol].executeMessage = message;
+      this[kExecution].executeMessage = message;
       break;
 
     default:
@@ -119,8 +119,8 @@ Formatter.prototype._complete = function complete(message, isError) {
     callback,
     formatted,
     executeMessage
-  } = this[executionSymbol];
-  this[executionSymbol] = null;
+  } = this[kExecution];
+  this[kExecution] = null;
   if (executeMessage) executeMessage.ack();
   this.broker.cancel(message.fields.consumerTag);
 
@@ -137,7 +137,7 @@ Formatter.prototype._complete = function complete(message, isError) {
 };
 
 Formatter.prototype._decorate = function decorate(withContent) {
-  const content = this[executionSymbol].runMessage.content;
+  const content = this[kExecution].runMessage.content;
 
   for (const key in withContent) {
     switch (key) {
@@ -157,7 +157,7 @@ Formatter.prototype._decorate = function decorate(withContent) {
       default:
         {
           content[key] = withContent[key];
-          this[executionSymbol].formatted = true;
+          this[kExecution].formatted = true;
         }
     }
   }