bpmn-elements 17.2.2 → 17.3.0

package/dist/activity/Activity.js

@@ -86,7 +86,7 @@ function Activity(Behaviour, activityDef, context) {
   }
   const outboundSequenceFlows = context.getOutboundSequenceFlows(id);
   const isParallelJoin = activityDef.isParallelGateway && inboundSequenceFlows.length > 1;
-  const flows = this[kFlows] = {
+  this[kFlows] = {
     inboundSequenceFlows,
     inboundAssociations,
     inboundTriggers,
@@ -100,8 +100,8 @@ function Activity(Behaviour, activityDef, context) {
     })
   };
   this[kFlags] = {
-    isEnd: flows.outboundSequenceFlows.length === 0,
-    isStart: flows.inboundSequenceFlows.length === 0 && !attachedTo && !behaviour.triggeredByEvent && !isForCompensation,
+    isEnd: !outboundSequenceFlows.length,
+    isStart: !inboundTriggers.length && !behaviour.triggeredByEvent,
     isSubProcess: activityDef.isSubProcess,
     isMultiInstance: !!behaviour.loopCharacteristics,
     isForCompensation,
@@ -245,8 +245,7 @@ Object.defineProperties(Activity.prototype, {
 Activity.prototype.activate = function activate() {
   if (this[kActivated]) return;
   this[kActivated] = true;
-  this.addInboundListeners();
-  return this._consumeInbound();
+  return this.addInboundListeners() && this._consumeInbound();
 };
 Activity.prototype.deactivate = function deactivate() {
   this[kActivated] = false;
@@ -349,26 +348,30 @@ Activity.prototype.discard = function discard(discardContent) {
   this._consumeRunQ();
 };
 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) {
-      trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, {
-        noAck: true,
-        consumerTag: triggerConsumerTag
-      });
-    } 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
-      });
+  const triggers = this[kFlows].inboundTriggers;
+  if (triggers.length) {
+    const onInboundEvent = this._onInboundEvent.bind(this);
+    const triggerConsumerTag = `_inbound-${this.id}`;
+    for (const trigger of triggers) {
+      if (trigger.isSequenceFlow) {
+        trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, {
+          noAck: true,
+          consumerTag: triggerConsumerTag
+        });
+      } 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
+        });
+      }
     }
   }
+  return triggers.length;
 };
 Activity.prototype.removeInboundListeners = function removeInboundListeners() {
   const triggerConsumerTag = `_inbound-${this.id}`;
@@ -471,16 +474,16 @@ Activity.prototype._shakeOutbound = function shakeOutbound(sourceMessage) {
 };
 Activity.prototype._consumeInbound = function consumeInbound() {
   if (!this[kActivated]) return;
-  if (this.status) return;
+  if (this.status || !this[kFlows].inboundTriggers.length) return;
   const inboundQ = this.broker.getQueue('inbound-q');
   const onInbound = this[kMessageHandlers].onInbound;
   if (this[kFlags].isParallelJoin) {
-    return inboundQ.consume(onInbound, {
+    return inboundQ.assertConsumer(onInbound, {
       consumerTag: '_run-on-inbound',
       prefetch: 1000
     });
   }
-  return inboundQ.consume(onInbound, {
+  return inboundQ.assertConsumer(onInbound, {
     consumerTag: '_run-on-inbound'
   });
 };

package/dist/getPropertyValue.js

@@ -76,7 +76,7 @@ function splitArguments(args, base, fnScope) {
       }
     }
     if (argCompleted) {
-      if (arg.length > 0) {
+      if (arg.length) {
         callArguments.push(getFunctionArgument(base, arg.trim(), fnScope));
       }
       arg = '';

package/dist/process/ProcessExecution.js

@@ -335,7 +335,7 @@ ProcessExecution.prototype.getApi = function getApi(message) {
   return api;
 };
 ProcessExecution.prototype._start = function start() {
-  if (this[kElements].children.length === 0) {
+  if (!this[kElements].children.length) {
     return this._complete('completed');
   }
   this[kStatus] = 'start';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "17.2.2",
+  "version": "17.3.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -103,6 +103,6 @@
   },
   "dependencies": {
     "@0dep/piso": "^3.0.1",
-    "smqp": "^10.0.0"
+    "smqp": "^11.0.1"
   }
 }

package/src/activity/Activity.js

@@ -72,7 +72,7 @@ function Activity(Behaviour, activityDef, context) {
 
   const isParallelJoin = activityDef.isParallelGateway && inboundSequenceFlows.length > 1;
 
-  const flows = (this[kFlows] = {
+  this[kFlows] = {
     inboundSequenceFlows,
     inboundAssociations,
     inboundTriggers,
@@ -82,11 +82,11 @@ function Activity(Behaviour, activityDef, context) {
       inboundJoinFlows: new Set(),
       inboundSourceIds: new Set(inboundSequenceFlows.map(({ sourceId }) => sourceId)),
     }),
-  });
+  };
 
   this[kFlags] = {
-    isEnd: flows.outboundSequenceFlows.length === 0,
-    isStart: flows.inboundSequenceFlows.length === 0 && !attachedTo && !behaviour.triggeredByEvent && !isForCompensation,
+    isEnd: !outboundSequenceFlows.length,
+    isStart: !inboundTriggers.length && !behaviour.triggeredByEvent,
     isSubProcess: activityDef.isSubProcess,
     isMultiInstance: !!behaviour.loopCharacteristics,
     isForCompensation,
@@ -233,8 +233,7 @@ Object.defineProperties(Activity.prototype, {
 Activity.prototype.activate = function activate() {
   if (this[kActivated]) return;
   this[kActivated] = true;
-  this.addInboundListeners();
-  return this._consumeInbound();
+  return this.addInboundListeners() && this._consumeInbound();
 };
 
 Activity.prototype.deactivate = function deactivate() {
@@ -346,17 +345,21 @@ Activity.prototype.discard = function discard(discardContent) {
 };
 
 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) {
-      trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
-    } 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 });
+  const triggers = this[kFlows].inboundTriggers;
+  if (triggers.length) {
+    const onInboundEvent = this._onInboundEvent.bind(this);
+    const triggerConsumerTag = `_inbound-${this.id}`;
+    for (const trigger of triggers) {
+      if (trigger.isSequenceFlow) {
+        trigger.broker.subscribeTmp('event', 'flow.#', onInboundEvent, { noAck: true, consumerTag: triggerConsumerTag });
+      } 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 });
+      }
     }
   }
+  return triggers.length;
 };
 
 Activity.prototype.removeInboundListeners = function removeInboundListeners() {
@@ -466,16 +469,16 @@ Activity.prototype._shakeOutbound = function shakeOutbound(sourceMessage) {
 Activity.prototype._consumeInbound = function consumeInbound() {
   if (!this[kActivated]) return;
 
-  if (this.status) return;
+  if (this.status || !this[kFlows].inboundTriggers.length) return;
 
   const inboundQ = this.broker.getQueue('inbound-q');
   const onInbound = this[kMessageHandlers].onInbound;
 
   if (this[kFlags].isParallelJoin) {
-    return inboundQ.consume(onInbound, { consumerTag: '_run-on-inbound', prefetch: 1000 });
+    return inboundQ.assertConsumer(onInbound, { consumerTag: '_run-on-inbound', prefetch: 1000 });
   }
 
-  return inboundQ.consume(onInbound, { consumerTag: '_run-on-inbound' });
+  return inboundQ.assertConsumer(onInbound, { consumerTag: '_run-on-inbound' });
 };
 
 Activity.prototype._onInbound = function onInbound(routingKey, message) {

package/src/getPropertyValue.js

@@ -86,7 +86,7 @@ function splitArguments(args, base, fnScope) {
     }
 
     if (argCompleted) {
-      if (arg.length > 0) {
+      if (arg.length) {
         callArguments.push(getFunctionArgument(base, arg.trim(), fnScope));
       }
       arg = '';

package/src/process/ProcessExecution.js

@@ -359,7 +359,7 @@ ProcessExecution.prototype.getApi = function getApi(message) {
 };
 
 ProcessExecution.prototype._start = function start() {
-  if (this[kElements].children.length === 0) {
+  if (!this[kElements].children.length) {
     return this._complete('completed');
   }