bpmn-elements 8.1.0 → 8.2.1

package/src/io/InputOutputSpecification.js

@@ -15,8 +15,14 @@ export default function IoSpecification(activity, ioSpecificationDef, 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});
 };
 
@@ -117,7 +123,6 @@ proto._onFormatComplete = function formatOnComplete(message) {
     };
     result.sources.push(source);
 
-
     const dataObjectId = getPropertyValue(ioSource, 'behaviour.association.target.dataObject.id');
     if (!dataObjectId) return result;
     const dataObject = context.getDataObjectById(dataObjectId);
@@ -143,8 +148,10 @@ proto._onFormatComplete = function formatOnComplete(message) {
   broker.publish('format', `${startRoutingKey}.begin`, {
     endRoutingKey,
     ioSpecification: {
-      dataInputs: sources.map((input) => {
-        return {...input};
+      ...(messageInputs && {
+        dataInputs: messageInputs.map((input) => {
+          return {...input};
+        }),
       }),
       dataOutputs: this._getDataOutputs(dataOutputs),
     },
@@ -155,8 +162,12 @@ proto._onFormatComplete = function formatOnComplete(message) {
 
     broker.publish('format', endRoutingKey, {
       ioSpecification: {
-        dataInputs: sources,
-        dataOutputs: this._getDataOutputs(dataOutputs),
+        ...(messageInputs && {
+          dataInputs: messageInputs.map((input) => {
+            return {...input};
+          }),
+        }),
+        dataOutputs: sources,
       },
     });
   });

package/src/io/Properties.js

@@ -13,7 +13,6 @@ export default function Properties(activity, propertiesDef, context) {
     dataOutputObjects: [],
   };
 
-
   for (const {id, ...def} of propertiesDef.values) {
     const source = {
       id,
@@ -62,6 +61,9 @@ const proto = Properties.prototype;
 
 proto.activate = function activate(message) {
   if (this[kConsuming]) return;
+  if (message.fields.redelivered && message.fields.routingKey === 'run.start') {
+    this._onActivityEvent('activity.enter', message);
+  }
 
   if (message.fields.redelivered && message.content.properties) {
     this._onActivityEvent('activity.extension.resume', message);
@@ -75,16 +77,12 @@ proto.deactivate = function deactivate() {
 };
 
 proto._onActivityEvent = function onActivityEvent(routingKey, message) {
-  if (routingKey === 'activity.enter') {
-    return this._formatOnEnter(message);
-  }
-
-  if (routingKey === 'activity.extension.resume') {
-    return this._formatOnEnter(message);
-  }
-
-  if (routingKey === 'activity.execution.completed') {
-    return this._formatOnComplete(message);
+  switch (routingKey) {
+    case 'activity.enter':
+    case 'activity.extension.resume':
+      return this._formatOnEnter(message);
+    case 'activity.execution.completed':
+      return this._formatOnComplete(message);
   }
 };
 

package/src/process/ProcessExecution.js

@@ -260,7 +260,6 @@ proto.discard = function discard() {
   }, {type: 'discard'});
 };
 
-
 proto.getState = function getState() {
   const {children, flows, outboundMessageFlows, associations} = this[kElements];
   return {
@@ -533,6 +532,8 @@ proto._onChildMessage = function onChildMessage(routingKey, message) {
         return msg.content.source && msg.content.source.executionId === content.executionId;
       });
       if (eventCaughtBy) {
+        this[kActivityQ].queueMessage({routingKey: 'activity.caught'}, cloneContent(content), message.properties);
+        message.ack();
         return this._debug('error was caught');
       }
       return this._complete('error', {error: content.error});

package/src/tasks/ServiceTask.js

@@ -46,9 +46,7 @@ proto.execute = function execute(executeMessage) {
 
 proto.getService = function getService(message) {
   let Service = this.activity.behaviour.Service;
-  if (!Service) {
-    Service = this.environment.settings.enableDummyService ? DummyService : null;
-  }
+  if (!Service && this.environment.settings.enableDummyService) Service = DummyService;
   return Service && new Service(this.activity, cloneMessage(message));
 };
 

package/src/tasks/StandardLoopCharacteristics.js

@@ -5,4 +5,3 @@ export default function StandardLoopCharacteristics(activity, loopCharacteristic
   behaviour = {...behaviour, isSequential: true};
   return new LoopCharacteristics(activity, {...loopCharacteristics, behaviour});
 }
-