bpmn-elements 8.1.0 → 8.2.1

package/CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+# 8.2.1
+
+- fix resume on caught activity error throws #31
+
+# 8.2.0
+
+- fix resume when activity has formatting status, extensions were not re-activated
+- fix InputOutputSpecification output now passed as dataOutput instead of dataInput, as it should
+- refactor Extensions loading, bpmn io is now pushed to the end of the extensions list
+
 # 8.1.0
 
 - support non-interrupting BoundaryEvent with ISO8601 repeating interval timeCycle

package/dist/index.js

@@ -333,101 +333,52 @@ Object.defineProperty(exports, "UserTask", {
     return _SignalTask.default;
   }
 });
-
 var _Activity = _interopRequireDefault(require("./src/activity/Activity"));
-
 var _Association = _interopRequireDefault(require("./src/flows/Association"));
-
 var _BoundaryEvent = _interopRequireDefault(require("./src/events/BoundaryEvent"));
-
 var _BpmnError = _interopRequireDefault(require("./src/error/BpmnError"));
-
 var _CallActivity = _interopRequireDefault(require("./src/tasks/CallActivity"));
-
 var _CancelEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/CancelEventDefinition"));
-
 var _CompensateEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/CompensateEventDefinition"));
-
 var _ConditionalEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/ConditionalEventDefinition"));
-
 var _Context = _interopRequireDefault(require("./src/Context"));
-
 var _EnvironmentDataObject = _interopRequireDefault(require("./src/io/EnvironmentDataObject"));
-
 var _EnvironmentDataStore = _interopRequireDefault(require("./src/io/EnvironmentDataStore"));
-
 var _EnvironmentDataStoreReference = _interopRequireDefault(require("./src/io/EnvironmentDataStoreReference"));
-
 var _Definition = _interopRequireDefault(require("./src/definition/Definition"));
-
 var _Dummy = _interopRequireDefault(require("./src/activity/Dummy"));
-
 var _EndEvent = _interopRequireDefault(require("./src/events/EndEvent"));
-
 var _Environment = _interopRequireDefault(require("./src/Environment"));
-
 var _ErrorEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/ErrorEventDefinition"));
-
 var _Escalation = _interopRequireDefault(require("./src/activity/Escalation"));
-
 var _EscalationEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/EscalationEventDefinition"));
-
 var _EventBasedGateway = _interopRequireDefault(require("./src/gateways/EventBasedGateway"));
-
 var _ExclusiveGateway = _interopRequireDefault(require("./src/gateways/ExclusiveGateway"));
-
 var _InclusiveGateway = _interopRequireDefault(require("./src/gateways/InclusiveGateway"));
-
 var _InputOutputSpecification = _interopRequireDefault(require("./src/io/InputOutputSpecification"));
-
 var _IntermediateCatchEvent = _interopRequireDefault(require("./src/events/IntermediateCatchEvent"));
-
 var _IntermediateThrowEvent = _interopRequireDefault(require("./src/events/IntermediateThrowEvent"));
-
 var _LinkEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/LinkEventDefinition"));
-
 var _LoopCharacteristics = _interopRequireDefault(require("./src/tasks/LoopCharacteristics"));
-
 var _Message = _interopRequireDefault(require("./src/activity/Message"));
-
 var _MessageEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/MessageEventDefinition"));
-
 var _MessageFlow = _interopRequireDefault(require("./src/flows/MessageFlow"));
-
 var _ParallelGateway = _interopRequireDefault(require("./src/gateways/ParallelGateway"));
-
 var _Process = _interopRequireDefault(require("./src/process/Process"));
-
 var _Properties = _interopRequireDefault(require("./src/io/Properties"));
-
 var _ReceiveTask = _interopRequireDefault(require("./src/tasks/ReceiveTask"));
-
 var _ScriptTask = _interopRequireDefault(require("./src/tasks/ScriptTask"));
-
 var _SequenceFlow = _interopRequireDefault(require("./src/flows/SequenceFlow"));
-
 var _ServiceImplementation = _interopRequireDefault(require("./src/tasks/ServiceImplementation"));
-
 var _ServiceTask = _interopRequireDefault(require("./src/tasks/ServiceTask"));
-
 var _Signal = _interopRequireDefault(require("./src/activity/Signal"));
-
 var _SignalEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/SignalEventDefinition"));
-
 var _SignalTask = _interopRequireDefault(require("./src/tasks/SignalTask"));
-
 var _StandardLoopCharacteristics = _interopRequireDefault(require("./src/tasks/StandardLoopCharacteristics"));
-
 var _StartEvent = _interopRequireDefault(require("./src/events/StartEvent"));
-
 var _SubProcess = _interopRequireDefault(require("./src/tasks/SubProcess"));
-
 var _Task = _interopRequireDefault(require("./src/tasks/Task"));
-
 var _TerminateEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/TerminateEventDefinition"));
-
 var _TimerEventDefinition = _interopRequireDefault(require("./src/eventDefinitions/TimerEventDefinition"));
-
 var _Transaction = _interopRequireDefault(require("./src/tasks/Transaction"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/src/Api.js

@@ -8,27 +8,20 @@ exports.Api = Api;
 exports.DefinitionApi = DefinitionApi;
 exports.FlowApi = FlowApi;
 exports.ProcessApi = ProcessApi;
-
 var _messageHelper = require("./messageHelper");
-
 var _shared = require("./shared");
-
 function ActivityApi(broker, apiMessage, environment) {
   return new Api('activity', broker, apiMessage, environment);
 }
-
 function DefinitionApi(broker, apiMessage, environment) {
   return new Api('definition', broker, apiMessage, environment);
 }
-
 function ProcessApi(broker, apiMessage, environment) {
   return new Api('process', broker, apiMessage, environment);
 }
-
 function FlowApi(broker, apiMessage, environment) {
   return new Api('flow', broker, apiMessage, environment);
 }
-
 function Api(pfx, broker, sourceMessage, environment) {
   if (!sourceMessage) throw new Error('Api requires message');
   const apiMessage = (0, _messageHelper.cloneMessage)(sourceMessage);
@@ -50,35 +43,28 @@ function Api(pfx, broker, sourceMessage, environment) {
   this.owner = broker.owner;
   this.messagePrefix = pfx;
 }
-
 const proto = Api.prototype;
-
 proto.cancel = function cancel(message, options) {
   this.sendApiMessage('cancel', {
     message
   }, options);
 };
-
 proto.discard = function discard() {
   this.sendApiMessage('discard');
 };
-
 proto.fail = function fail(error) {
   this.sendApiMessage('error', {
     error
   });
 };
-
 proto.signal = function signal(message, options) {
   this.sendApiMessage('signal', {
     message
   }, options);
 };
-
 proto.stop = function stop() {
   this.sendApiMessage('stop');
 };
-
 proto.resolveExpression = function resolveExpression(expression) {
   return this.environment.resolveExpression(expression, {
     fields: this.fields,
@@ -86,25 +72,24 @@ proto.resolveExpression = function resolveExpression(expression) {
     properties: this.messageProperties
   }, this.owner);
 };
-
 proto.sendApiMessage = function sendApiMessage(action, content, options) {
   const correlationId = options && options.correlationId || (0, _shared.getUniqueId)(`${this.id || this.messagePrefix}_signal`);
   let key = `${this.messagePrefix}.${action}`;
   if (this.executionId) key += `.${this.executionId}`;
-  this.broker.publish('api', key, this.createMessage(content), { ...options,
+  this.broker.publish('api', key, this.createMessage(content), {
+    ...options,
     correlationId,
     type: action
   });
 };
-
 proto.getPostponed = function getPostponed(...args) {
   if (this.owner.getPostponed) return this.owner.getPostponed(...args);
   if (this.owner.isSubProcess && this.owner.execution) return this.owner.execution.getPostponed(...args);
   return [];
 };
-
 proto.createMessage = function createMessage(content) {
-  return { ...this.content,
+  return {
+    ...this.content,
     ...content
   };
 };

package/dist/src/Context.js

@@ -4,20 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Context;
-
+var _BpmnIO = _interopRequireDefault(require("./io/BpmnIO"));
 var _Environment = _interopRequireDefault(require("./Environment"));
-
 var _ExtensionsMapper = _interopRequireDefault(require("./ExtensionsMapper"));
-
 var _shared = require("./shared");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function Context(definitionContext, environment) {
   environment = environment ? environment.clone() : new _Environment.default();
   return new ContextInstance(definitionContext, environment);
 }
-
 function ContextInstance(definitionContext, environment) {
   const {
     id = 'Def',
@@ -31,7 +26,7 @@ function ContextInstance(definitionContext, environment) {
   this.sid = sid;
   this.definitionContext = definitionContext;
   this.environment = environment;
-  this.extensionsMapper = (0, _ExtensionsMapper.default)(this);
+  this.extensionsMapper = new _ExtensionsMapper.default(this);
   this.refs = {
     activityRefs: {},
     associationRefs: [],
@@ -44,9 +39,7 @@ function ContextInstance(definitionContext, environment) {
     sequenceFlows: []
   };
 }
-
 const proto = ContextInstance.prototype;
-
 proto.getActivityById = function getActivityById(activityId) {
   const activityInstance = this.refs.activityRefs[activityId];
   if (activityInstance) return activityInstance;
@@ -54,14 +47,12 @@ proto.getActivityById = function getActivityById(activityId) {
   if (!activity) return null;
   return this.upsertActivity(activity);
 };
-
 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;
 };
-
 proto.getSequenceFlowById = function getSequenceFlowById(sequenceFlowId) {
   const flowInstance = this.refs.sequenceFlowRefs[sequenceFlowId];
   if (flowInstance) return flowInstance;
@@ -69,31 +60,24 @@ proto.getSequenceFlowById = function getSequenceFlowById(sequenceFlowId) {
   if (!flowDef) return null;
   return this.upsertSequenceFlow(flowDef);
 };
-
 proto.getInboundSequenceFlows = function getInboundSequenceFlows(activityId) {
   return (this.definitionContext.getInboundSequenceFlows(activityId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
-
 proto.getOutboundSequenceFlows = function getOutboundSequenceFlows(activityId) {
   return (this.definitionContext.getOutboundSequenceFlows(activityId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
-
 proto.getInboundAssociations = function getInboundAssociations(activityId) {
   return (this.definitionContext.getInboundAssociations(activityId) || []).map(association => this.upsertAssociation(association));
 };
-
 proto.getOutboundAssociations = function getOutboundAssociations(activityId) {
   return (this.definitionContext.getOutboundAssociations(activityId) || []).map(association => this.upsertAssociation(association));
 };
-
 proto.getActivities = function getActivities(scopeId) {
   return (this.definitionContext.getActivities(scopeId) || []).map(activityDef => this.upsertActivity(activityDef));
 };
-
 proto.getSequenceFlows = function getSequenceFlows(scopeId) {
   return (this.definitionContext.getSequenceFlows(scopeId) || []).map(flow => this.upsertSequenceFlow(flow));
 };
-
 proto.upsertSequenceFlow = function upsertSequenceFlow(flowDefinition) {
   const refs = this.refs.sequenceFlowRefs;
   let flowInstance = refs[flowDefinition.id];
@@ -102,11 +86,9 @@ proto.upsertSequenceFlow = function upsertSequenceFlow(flowDefinition) {
   this.refs.sequenceFlows.push(flowInstance);
   return flowInstance;
 };
-
 proto.getAssociations = function getAssociations(scopeId) {
   return (this.definitionContext.getAssociations(scopeId) || []).map(association => this.upsertAssociation(association));
 };
-
 proto.upsertAssociation = function upsertAssociation(associationDefinition) {
   const refs = this.refs.associationRefs;
   let instance = refs[associationDefinition.id];
@@ -114,11 +96,9 @@ proto.upsertAssociation = function upsertAssociation(associationDefinition) {
   instance = refs[associationDefinition.id] = new associationDefinition.Behaviour(associationDefinition, this);
   return instance;
 };
-
 proto.clone = function clone(newEnvironment) {
   return new ContextInstance(this.definitionContext, newEnvironment || this.environment);
 };
-
 proto.getProcessById = function getProcessById(processId) {
   const refs = this.refs.processRefs;
   let bp = this.refs.processRefs[processId];
@@ -130,35 +110,29 @@ proto.getProcessById = function getProcessById(processId) {
   this.refs.processes.push(bp);
   return bp;
 };
-
 proto.getNewProcessById = function getNewProcessById(processId) {
   if (!this.getProcessById(processId)) return null;
   const bpDef = this.definitionContext.getProcessById(processId);
   const bp = new bpDef.Behaviour(bpDef, this.clone(this.environment.clone()));
   return bp;
 };
-
 proto.getProcesses = function getProcesses() {
   return this.definitionContext.getProcesses().map(({
     id: processId
   }) => this.getProcessById(processId));
 };
-
 proto.getExecutableProcesses = function getExecutableProcesses() {
   return this.definitionContext.getExecutableProcesses().map(({
     id: processId
   }) => this.getProcessById(processId));
 };
-
 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)));
   }
-
   return this.refs.messageFlows.filter(flow => flow.source.processId === sourceId);
 };
-
 proto.getDataObjectById = function getDataObjectById(referenceId) {
   let dataObject;
   if (dataObject = this.refs.dataObjectRefs[referenceId]) return dataObject;
@@ -167,7 +141,6 @@ proto.getDataObjectById = function getDataObjectById(referenceId) {
   dataObject = this.refs.dataObjectRefs[dataObjectDef.id] = new dataObjectDef.Behaviour(dataObjectDef, this);
   return dataObject;
 };
-
 proto.getDataStoreById = function getDataStoreById(referenceId) {
   let dataStore;
   if (dataStore = this.refs.dataStoreRefs[referenceId]) return dataStore;
@@ -176,33 +149,31 @@ proto.getDataStoreById = function getDataStoreById(referenceId) {
   dataStore = this.refs.dataStoreRefs[dataStoreDef.id] = new dataStoreDef.Behaviour(dataStoreDef, this);
   return dataStore;
 };
-
 proto.getStartActivities = function getStartActivities(filterOptions, scopeId) {
   const {
     referenceId,
     referenceType = 'unknown'
   } = filterOptions || {};
   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;
 };
-
 proto.loadExtensions = function loadExtensions(activity) {
-  return this.extensionsMapper.get(activity);
+  const io = new _BpmnIO.default(activity, this);
+  const extensions = this.extensionsMapper.get(activity);
+  if (io.hasIo) extensions.extensions.push(io);
+  if (!extensions.extensions.length) return;
+  return extensions;
 };

package/dist/src/Environment.js

@@ -4,19 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Environment;
-
 var _Expressions = _interopRequireDefault(require("./Expressions"));
-
 var _Scripts = require("./Scripts");
-
 var _Timers = require("./Timers");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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.options = validateOptions(options);
   this.expressions = options.expressions || (0, _Expressions.default)();
@@ -24,52 +18,46 @@ function Environment(options = {}) {
   this.output = options.output || {};
   this.scripts = options.scripts || (0, _Scripts.Scripts)();
   this.timers = options.timers || (0, _Timers.Timers)();
-  this.settings = { ...options.settings
+  this.settings = {
+    ...options.settings
   };
   this.Logger = options.Logger || DummyLogger;
   this[kServices] = options.services || {};
   this[kVariables] = options.variables || {};
 }
-
 const proto = Environment.prototype;
 Object.defineProperty(proto, 'variables', {
   enumerable: true,
-
   get() {
     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);
   }
-
 });
-
 proto.getState = function getState() {
   return {
-    settings: { ...this.settings
+    settings: {
+      ...this.settings
     },
-    variables: { ...this[kVariables]
+    variables: {
+      ...this[kVariables]
     },
-    output: { ...this.output
+    output: {
+      ...this.output
     }
   };
 };
-
 proto.recover = function recover(state) {
   if (!state) return this;
   if (state.settings) Object.assign(this.settings, state.settings);
@@ -77,13 +65,14 @@ proto.recover = function recover(state) {
   if (state.output) Object.assign(this.output, state.output);
   return this;
 };
-
 proto.clone = function clone(overrideOptions = {}) {
   const services = this[kServices];
   const newOptions = {
-    settings: { ...this.settings
+    settings: {
+      ...this.settings
     },
-    variables: { ...this[kVariables]
+    variables: {
+      ...this[kVariables]
     },
     Logger: this.Logger,
     extensions: this.extensions,
@@ -94,38 +83,35 @@ proto.clone = function clone(overrideOptions = {}) {
     ...overrideOptions,
     services
   };
-  if (overrideOptions.services) newOptions.services = { ...services,
+  if (overrideOptions.services) newOptions.services = {
+    ...services,
     ...overrideOptions.services
   };
   return new this.constructor(newOptions);
 };
-
 proto.assignVariables = function assignVariables(newVars) {
   if (!newVars || typeof newVars !== 'object') return;
-  this[kVariables] = { ...this.variables,
+  this[kVariables] = {
+    ...this.variables,
     ...newVars
   };
 };
-
 proto.assignSettings = function assignVariables(newSettings) {
   if (!newSettings || typeof newSettings !== 'object') return;
-  this.settings = { ...this.settings,
+  this.settings = {
+    ...this.settings,
     ...newSettings
   };
 };
-
 proto.getScript = function getScript(...args) {
   return this.scripts.getScript(...args);
 };
-
 proto.registerScript = function registerScript(...args) {
   return this.scripts.register(...args);
 };
-
 proto.getServiceByName = function getServiceByName(serviceName) {
   return this[kServices][serviceName];
 };
-
 proto.resolveExpression = function resolveExpression(expression, message = {}, expressionFnContext) {
   const from = {
     environment: this,
@@ -133,52 +119,40 @@ proto.resolveExpression = function resolveExpression(expression, message = {}, e
   };
   return this.expressions.resolveExpression(expression, from, expressionFnContext);
 };
-
 proto.addService = function addService(name, fn) {
   this[kServices][name] = fn;
 };
-
 function validateOptions(input) {
   const options = {};
-
   for (const key in input) {
     if (defaultOptions.indexOf(key) === -1) {
       options[key] = input[key];
     }
   }
-
   if (input.timers) {
     if (typeof input.timers.register !== 'function') throw new Error('timers.register is not a function');
     if (typeof input.timers.setTimeout !== 'function') throw new Error('timers.setTimeout is not a function');
     if (typeof input.timers.clearTimeout !== 'function') throw new Error('timers.clearTimeout is not a function');
   }
-
   if (input.scripts) {
     if (typeof input.scripts.register !== 'function') throw new Error('scripts.register is not a function');
     if (typeof input.scripts.getScript !== 'function') throw new Error('scripts.getScript is not a function');
   }
-
   if (input.extensions) {
     if (typeof input.extensions !== 'object') throw new Error('extensions is not an object');
-
     for (const key in input.extensions) {
       if (typeof input.extensions[key] !== 'function') throw new Error(`extensions[${key}] is not a function`);
     }
   }
-
   return options;
 }
-
 function DummyLogger() {
   return {
     debug,
     error,
     warn
   };
-
   function debug() {}
-
   function error() {}
-
   function warn() {}
 }