bpmn-elements 8.1.0 → 8.2.1

package/dist/src/getPropertyValue.js

@@ -10,20 +10,16 @@ const numberConstantPattern = /^\W*-?\d+(.\d+)?\W*$/;
 const negativeIndexPattern = /^-\d+$/;
 var _default = getPropertyValue;
 exports.default = _default;
-
 function getPropertyValue(inputContext, propertyPath, fnScope) {
   if (!inputContext) return;
   let resultValue;
   let next = iterateProps(inputContext, inputContext, propertyPath.trim(), fnScope);
-
   while (next) {
     resultValue = next.getResult();
     next = next();
   }
-
   return resultValue;
 }
-
 function iterateProps(base, iterateContext, iteratePropertyPath, fnScope) {
   let result;
   const rest = iteratePropertyPath.replace(propertyPattern, (match, fnName, args, p, prop) => {
@@ -32,55 +28,44 @@ function iterateProps(base, iterateContext, iteratePropertyPath, fnScope) {
     } else {
       result = getNamedValue(iterateContext, prop);
     }
-
     return '';
   });
   if (rest === iteratePropertyPath) return;
   if (result === undefined || result === null) return;
-
   const iterateNext = () => iterateProps(base, result, rest, fnScope);
-
   iterateNext.getResult = () => {
     if (rest !== '') return;
     return result;
   };
-
   return iterateNext;
 }
-
 function executeFn(fn, args, base, fnScope) {
   if (!fn) return;
   let callArguments = [];
-
   if (args) {
     callArguments = splitArguments(args, base, fnScope);
   } else {
     callArguments.push(base);
   }
-
   if (!fnScope) return fn.apply(null, callArguments);
   return function ScopedIIFE() {
     // eslint-disable-line no-extra-parens
     return fn.apply(this, callArguments);
   }.call(fnScope);
 }
-
 function splitArguments(args, base, fnScope) {
   let insideString = false;
   let delimiter = '';
   let argCompleted = false;
   let arg = '';
   const callArguments = [];
-
   for (let i = 0; i < args.length; i++) {
     const charPos = args.charAt(i);
-
     if (!insideString) {
       if (charPos === ',') {
         argCompleted = true;
       } else if (charPos !== ' ') {
         arg += charPos;
-
         if (charPos === '\'' || charPos === '"') {
           insideString = true;
           delimiter = charPos;
@@ -88,69 +73,54 @@ function splitArguments(args, base, fnScope) {
       }
     } else {
       arg += charPos;
-
       if (charPos === delimiter) {
         argCompleted = true;
         delimiter = '';
       }
     }
-
     if (argCompleted) {
       if (arg.length > 0) {
         callArguments.push(getFunctionArgument(base, arg.trim(), fnScope));
       }
-
       arg = '';
       insideString = false;
       argCompleted = false;
     }
   }
-
   if (arg.trim() !== '') {
     callArguments.push(getFunctionArgument(base, arg.trim(), fnScope));
   }
-
   return callArguments;
 }
-
 function getFunctionArgument(obj, argument, fnScope) {
   const stringMatch = argument.match(stringConstantPattern);
-
   if (stringMatch) {
     return stringMatch[2];
   } else if (numberConstantPattern.test(argument)) {
     return Number(argument);
   }
-
   switch (argument) {
     case 'true':
       return true;
-
     case 'false':
       return false;
-
     case 'null':
       return null;
-
     default:
       return getPropertyValue(obj, argument, fnScope);
   }
 }
-
 function getNamedValue(obj, property) {
   if (Array.isArray(obj)) {
     return getArrayItem(obj, property);
   }
-
   return obj[property];
 }
-
 function getArrayItem(list, idx) {
   if (negativeIndexPattern.test(idx)) {
     const nidx = Number(idx);
     const aidx = nidx === 0 ? 0 : list.length + nidx;
     return list[aidx];
   }
-
   return list[idx];
 }

package/dist/src/io/BpmnIO.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = BpmnIO;
-
 function BpmnIO(activity, context) {
   this.activity = activity;
   this.context = context;
+  this.type = 'bpmnio';
   const {
     ioSpecification: ioSpecificationDef,
     properties: propertiesDef
@@ -15,17 +15,20 @@ function BpmnIO(activity, context) {
   this.specification = ioSpecificationDef && new ioSpecificationDef.Behaviour(activity, ioSpecificationDef, context);
   this.properties = propertiesDef && new propertiesDef.Behaviour(activity, propertiesDef, context);
 }
-
+Object.defineProperty(BpmnIO.prototype, 'hasIo', {
+  get() {
+    return this.specification || this.properties;
+  }
+});
 BpmnIO.prototype.activate = function activate(message) {
   const properties = this.properties,
-        specification = this.specification;
+    specification = this.specification;
   if (properties) properties.activate(message);
   if (specification) specification.activate(message);
 };
-
 BpmnIO.prototype.deactivate = function deactivate(message) {
   const properties = this.properties,
-        specification = this.specification;
+    specification = this.specification;
   if (properties) properties.deactivate(message);
   if (specification) specification.deactivate(message);
 };

package/dist/src/io/EnvironmentDataObject.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = EnvironmentDataObject;
-
 function EnvironmentDataObject(dataObjectDef, {
   environment
 }) {
@@ -22,26 +21,19 @@ function EnvironmentDataObject(dataObjectDef, {
   this.parent = parent;
   this.environment = environment;
 }
-
 EnvironmentDataObject.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
   const environment = this.environment;
   const value = environment.variables._data && environment.variables._data[this.id];
-
   const content = this._createContent(value);
-
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };
-
 EnvironmentDataObject.prototype.write = function write(broker, exchange, routingKeyPrefix, value, messageProperties) {
   const environment = this.environment;
   environment.variables._data = environment.variables._data || {};
   environment.variables._data[this.id] = value;
-
   const content = this._createContent(value);
-
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };
-
 EnvironmentDataObject.prototype._createContent = function createContent(value) {
   return {
     id: this.id,

package/dist/src/io/EnvironmentDataStore.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = EnvironmentDataStore;
-
 function EnvironmentDataStore(dataStoreDef, {
   environment
 }) {
@@ -22,26 +21,19 @@ function EnvironmentDataStore(dataStoreDef, {
   this.parent = parent;
   this.environment = environment;
 }
-
 EnvironmentDataStore.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
   const environment = this.environment;
   const value = environment.variables._data && environment.variables._data[this.id];
-
   const content = this._createContent(value);
-
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };
-
 EnvironmentDataStore.prototype.write = function write(broker, exchange, routingKeyPrefix, value, messageProperties) {
   const environment = this.environment;
   environment.variables._data = environment.variables._data || {};
   environment.variables._data[this.id] = value;
-
   const content = this._createContent(value);
-
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };
-
 EnvironmentDataStore.prototype._createContent = function createContent(value) {
   return {
     id: this.id,

package/dist/src/io/EnvironmentDataStoreReference.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = EnvironmentDataStoreReference;
-
 function EnvironmentDataStoreReference(dataObjectDef, {
   environment
 }) {
@@ -22,26 +21,19 @@ function EnvironmentDataStoreReference(dataObjectDef, {
   this.parent = parent;
   this.environment = environment;
 }
-
 EnvironmentDataStoreReference.prototype.read = function read(broker, exchange, routingKeyPrefix, messageProperties) {
   const environment = this.environment;
   const value = environment.variables._data && environment.variables._data[this.id];
-
   const content = this._createContent(value);
-
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };
-
 EnvironmentDataStoreReference.prototype.write = function write(broker, exchange, routingKeyPrefix, value, messageProperties) {
   const environment = this.environment;
   environment.variables._data = environment.variables._data || {};
   environment.variables._data[this.id] = value;
-
   const content = this._createContent(value);
-
   return broker.publish(exchange, `${routingKeyPrefix}response`, content, messageProperties);
 };
-
 EnvironmentDataStoreReference.prototype._createContent = function createContent(value) {
   return {
     id: this.id,

package/dist/src/io/InputOutputSpecification.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = IoSpecification;
-
 var _getPropertyValue = _interopRequireDefault(require("../getPropertyValue"));
-
 var _shared = require("../shared");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const kConsuming = Symbol.for('consuming');
-
 function IoSpecification(activity, ioSpecificationDef, context) {
   const {
     id,
@@ -26,35 +21,34 @@ function IoSpecification(activity, ioSpecificationDef, context) {
   this.broker = activity.broker;
   this.context = context;
 }
-
 const proto = IoSpecification.prototype;
-
-proto.activate = function activate() {
+proto.activate = function activate(message) {
   if (this[kConsuming]) return;
+  if (message && message.fields.redelivered && message.fields.routingKey === 'run.start') {
+    this._onFormatEnter();
+  }
+  if (message && message.fields.redelivered && message.fields.routingKey === 'run.end') {
+    this._onFormatComplete(message);
+  }
   this[kConsuming] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {
     noAck: true
   });
 };
-
 proto.deactivate = function deactivate() {
   if (this[kConsuming]) this[kConsuming] = this[kConsuming].cancel();
 };
-
 proto._onActivityEvent = function onActivityEvent(routingKey, message) {
   const {
     dataInputs,
     dataOutputs
   } = this.behaviour;
-
   if ((dataInputs || dataOutputs) && routingKey === 'activity.enter') {
     return this._onFormatEnter();
   }
-
   if (dataOutputs && routingKey === 'activity.execution.completed') {
     this._onFormatComplete(message);
   }
 };
-
 proto._onFormatEnter = function onFormatOnEnter() {
   const safeType = (0, _shared.brokerSafeId)(this.type).toLowerCase();
   const startRoutingKey = `run.onstart.${safeType}`;
@@ -63,7 +57,6 @@ proto._onFormatEnter = function onFormatOnEnter() {
     dataOutputs
   } = this.behaviour;
   const broker = this.broker;
-
   if (!dataInputs) {
     return broker.publish('format', startRoutingKey, {
       ioSpecification: {
@@ -71,7 +64,6 @@ proto._onFormatEnter = function onFormatOnEnter() {
       }
     });
   }
-
   const {
     dataObjects,
     sources
@@ -95,7 +87,6 @@ proto._onFormatEnter = function onFormatOnEnter() {
     dataObjects: [],
     sources: []
   });
-
   if (!dataObjects.length) {
     return broker.publish('format', startRoutingKey, {
       ioSpecification: {
@@ -104,13 +95,13 @@ proto._onFormatEnter = function onFormatOnEnter() {
       }
     });
   }
-
   const endRoutingKey = `run.onstart.${safeType}.end`;
   broker.publish('format', `${startRoutingKey}.begin`, {
     endRoutingKey,
     ioSpecification: {
       dataInputs: sources.map(source => {
-        return { ...source
+        return {
+          ...source
         };
       }),
       dataOutputs: this._getDataOutputs(dataOutputs)
@@ -118,7 +109,6 @@ proto._onFormatEnter = function onFormatOnEnter() {
   });
   return read(broker, dataObjects, (_, responses) => {
     for (const response of responses) sources[response.index].value = response.value;
-
     broker.publish('format', endRoutingKey, {
       ioSpecification: {
         dataInputs: sources,
@@ -127,7 +117,6 @@ proto._onFormatEnter = function onFormatOnEnter() {
     });
   });
 };
-
 proto._onFormatComplete = function formatOnComplete(message) {
   const safeType = (0, _shared.brokerSafeId)(this.type).toLowerCase();
   const messageInputs = (0, _getPropertyValue.default)(message, 'content.ioSpecification.dataInputs');
@@ -164,7 +153,6 @@ proto._onFormatComplete = function formatOnComplete(message) {
     sources: []
   });
   const startRoutingKey = `run.onend.${safeType}`;
-
   if (!dataObjects.length) {
     return broker.publish('format', startRoutingKey, {
       ioSpecification: {
@@ -173,30 +161,36 @@ proto._onFormatComplete = function formatOnComplete(message) {
       }
     });
   }
-
   const endRoutingKey = `run.onend.${safeType}.end`;
   broker.publish('format', `${startRoutingKey}.begin`, {
     endRoutingKey,
     ioSpecification: {
-      dataInputs: sources.map(input => {
-        return { ...input
-        };
+      ...(messageInputs && {
+        dataInputs: messageInputs.map(input => {
+          return {
+            ...input
+          };
+        })
       }),
       dataOutputs: this._getDataOutputs(dataOutputs)
     }
   });
   return write(broker, dataObjects, (_, responses) => {
     for (const response of responses) sources[response.index].value = response.value;
-
     broker.publish('format', endRoutingKey, {
       ioSpecification: {
-        dataInputs: sources,
-        dataOutputs: this._getDataOutputs(dataOutputs)
+        ...(messageInputs && {
+          dataInputs: messageInputs.map(input => {
+            return {
+              ...input
+            };
+          })
+        }),
+        dataOutputs: sources
       }
     });
   });
 };
-
 proto._getDataOutputs = function getDataOutputs(dataOutputs) {
   if (!dataOutputs) return;
   return dataOutputs.map(dataOutput => {
@@ -207,27 +201,25 @@ proto._getDataOutputs = function getDataOutputs(dataOutputs) {
     };
   });
 };
-
 function read(broker, dataObjectRefs, callback) {
   const responses = [];
   let count = 0;
   const dataReadConsumer = broker.subscribeTmp('data', 'data.read.#', onDataObjectResponse, {
     noAck: true
   });
-
   for (const {
     dataObject
   } of dataObjectRefs) {
     dataObject.read(broker, 'data', 'data.read.');
   }
-
   function onDataObjectResponse(routingKey, message) {
     const {
       index
     } = dataObjectRefs.find(({
       dataObject
     }) => dataObject.id === message.content.id);
-    responses.push({ ...message.content,
+    responses.push({
+      ...message.content,
       index
     });
     ++count;
@@ -236,21 +228,18 @@ function read(broker, dataObjectRefs, callback) {
     return callback(null, responses);
   }
 }
-
 function write(broker, dataObjectRefs, callback) {
   const responses = [];
   let count = 0;
   broker.subscribeTmp('data', 'data.write.#', onDataObjectResponse, {
     noAck: true
   });
-
   for (const {
     dataObject,
     value
   } of dataObjectRefs) {
     dataObject.write(broker, 'data', 'data.write.', value);
   }
-
   function onDataObjectResponse(routingKey, message) {
     const idx = dataObjectRefs.findIndex(({
       dataObject