bpmn-elements 18.0.3 → 18.0.4

package/dist/process/ProcessExecution.js

@@ -116,6 +116,16 @@ ProcessExecution.prototype.execute = function execute(executeMessage) {
   });
   this[_constants.K_STOPPED] = false;
   this.environment.assignVariables(executeMessage);
+
+  // Seed input from the execute content (sub process) or a single inbound trigger (call activity forwarding its formatted input).
+  const content = executeMessage.content;
+  const inbound = content.inbound;
+  const input = content.input ?? (inbound?.length === 1 && inbound[0].input);
+  if (input) {
+    this.environment.assignVariables({
+      input
+    });
+  }
   this[K_ACTIVITY_Q] = this.broker.assertQueue(`execute-${executionId}-q`, {
     durable: true,
     autoDelete: false

package/dist/tasks/CallActivity.js

@@ -73,10 +73,25 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
     noAck: true,
     consumerTag: `_api-delegated-cancel-${executionId}`
   });
-  broker.publish('event', 'activity.call', (0, _messageHelper.cloneContent)(executeContent, {
+  const callContent = {
     state: 'wait',
     calledElement
-  }), {
+  };
+
+  // Forward the multi-instance loop context as input to the called process; any current content input takes precedence.
+  if (executeContent.isMultiInstance) {
+    const input = {
+      isSequential: executeContent.isSequential,
+      index: executeContent.index,
+      cardinality: executeContent.loopCardinality
+    };
+    const elementVariable = loopCharacteristics?.elementVariable;
+    if (elementVariable && elementVariable in executeContent) {
+      input[elementVariable] = executeContent[elementVariable];
+    }
+    callContent.input = Object.assign(input, executeContent.input);
+  }
+  broker.publish('event', 'activity.call', (0, _messageHelper.cloneContent)(executeContent, callContent), {
     type: 'call'
   });
 };

package/dist/tasks/SubProcess.js

@@ -96,8 +96,29 @@ SubProcessBehaviour.prototype.execute = function execute(executeMessage) {
   if (loopCharacteristics && isRootScope) {
     return loopCharacteristics.execute(executeMessage);
   }
-  const processExecution = this._upsertExecution(executeMessage);
-  return processExecution.execute(executeMessage);
+
+  // Forward the multi-instance loop context as input to the sub process execution; any current content input takes precedence.
+  let message = executeMessage;
+  const content = executeMessage.content;
+  if (content.isMultiInstance) {
+    const input = {
+      isSequential: content.isSequential,
+      index: content.index,
+      cardinality: content.loopCardinality
+    };
+    const elementVariable = loopCharacteristics?.elementVariable;
+    if (elementVariable && elementVariable in content) {
+      input[elementVariable] = content[elementVariable];
+    }
+    message = (0, _messageHelper.cloneMessage)(executeMessage, {
+      input: {
+        ...input,
+        ...content.input
+      }
+    });
+  }
+  const processExecution = this._upsertExecution(message);
+  return processExecution.execute(message);
 };
 SubProcessBehaviour.prototype.getState = function getState() {
   const states = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "18.0.3",
+  "version": "18.0.4",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",

package/src/process/ProcessExecution.js

@@ -112,6 +112,15 @@ ProcessExecution.prototype.execute = function execute(executeMessage) {
   this[K_STOPPED] = false;
 
   this.environment.assignVariables(executeMessage);
+
+  // Seed input from the execute content (sub process) or a single inbound trigger (call activity forwarding its formatted input).
+  const content = executeMessage.content;
+  const inbound = content.inbound;
+  const input = content.input ?? (inbound?.length === 1 && inbound[0].input);
+  if (input) {
+    this.environment.assignVariables({ input });
+  }
+
   this[K_ACTIVITY_Q] = this.broker.assertQueue(`execute-${executionId}-q`, { durable: true, autoDelete: false });
 
   if (executeMessage.fields.redelivered) {

package/src/tasks/CallActivity.js

@@ -80,17 +80,28 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
     consumerTag: `_api-delegated-cancel-${executionId}`,
   });
 
-  broker.publish(
-    'event',
-    'activity.call',
-    cloneContent(executeContent, {
-      state: 'wait',
-      calledElement,
-    }),
-    {
-      type: 'call',
+  const callContent = {
+    state: 'wait',
+    calledElement,
+  };
+
+  // Forward the multi-instance loop context as input to the called process; any current content input takes precedence.
+  if (executeContent.isMultiInstance) {
+    const input = {
+      isSequential: executeContent.isSequential,
+      index: executeContent.index,
+      cardinality: executeContent.loopCardinality,
+    };
+    const elementVariable = loopCharacteristics?.elementVariable;
+    if (elementVariable && elementVariable in executeContent) {
+      input[elementVariable] = executeContent[elementVariable];
     }
-  );
+    callContent.input = Object.assign(input, executeContent.input);
+  }
+
+  broker.publish('event', 'activity.call', cloneContent(executeContent, callContent), {
+    type: 'call',
+  });
 };
 
 CallActivityBehaviour.prototype._onDelegatedApiMessage = function onDelegatedApiMessage(

package/src/tasks/SubProcess.js

@@ -1,6 +1,6 @@
 import { Activity } from '../activity/Activity.js';
 import { ProcessExecution } from '../process/ProcessExecution.js';
-import { cloneContent } from '../messageHelper.js';
+import { cloneContent, cloneMessage } from '../messageHelper.js';
 
 const K_EXECUTIONS = Symbol.for('executions');
 const K_ON_EXECUTION_COMPLETED = Symbol.for('execution completed handler');
@@ -81,8 +81,24 @@ SubProcessBehaviour.prototype.execute = function execute(executeMessage) {
     return loopCharacteristics.execute(executeMessage);
   }
 
-  const processExecution = this._upsertExecution(executeMessage);
-  return processExecution.execute(executeMessage);
+  // Forward the multi-instance loop context as input to the sub process execution; any current content input takes precedence.
+  let message = executeMessage;
+  const content = executeMessage.content;
+  if (content.isMultiInstance) {
+    const input = {
+      isSequential: content.isSequential,
+      index: content.index,
+      cardinality: content.loopCardinality,
+    };
+    const elementVariable = loopCharacteristics?.elementVariable;
+    if (elementVariable && elementVariable in content) {
+      input[elementVariable] = content[elementVariable];
+    }
+    message = cloneMessage(executeMessage, { input: { ...input, ...content.input } });
+  }
+
+  const processExecution = this._upsertExecution(message);
+  return processExecution.execute(message);
 };
 
 SubProcessBehaviour.prototype.getState = function getState() {