bpmn-elements 8.0.1 → 8.2.0

package/dist/src/events/BoundaryEvent.js

@@ -66,14 +66,6 @@ proto.execute = function execute(executeMessage) {
   if (isRootScope) {
     this[kExecuteMessage] = executeMessage;
     const broker = this.broker;
-
-    if (eventDefinitionExecution && !this.environment.settings.strict) {
-      broker.subscribeTmp('execution', 'execute.expect', this._onExpectMessage.bind(this), {
-        noAck: true,
-        consumerTag: '_expect-tag'
-      });
-    }
-
     const consumerTag = `_bound-listener-${executionId}`;
     this.attachedTo.broker.subscribeTmp('event', 'activity.leave', this._onAttachedLeave.bind(this), {
       noAck: true,
@@ -81,14 +73,23 @@ proto.execute = function execute(executeMessage) {
       priority: 300
     });
     this[kAttachedTags].push(consumerTag);
-    broker.subscribeOnce('execution', 'execute.detach', this._onDetachMessage.bind(this), {
-      consumerTag: '_detach-tag'
-    });
     broker.subscribeOnce('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
       consumerTag: `_api-${executionId}`
     });
-    broker.subscribeOnce('execution', 'execute.bound.completed', this._onCompleted.bind(this), {
-      consumerTag: `_execution-completed-${executionId}`
+    const execQ = broker.assertQueue(`_bound-execution-${executionId}`, {
+      durable: false,
+      autoDelete: true
+    });
+    broker.bindQueue(execQ.name, 'execution', 'execute.detach');
+    broker.bindQueue(execQ.name, 'execution', 'execute.bound.completed');
+    broker.bindQueue(execQ.name, 'execution', 'execute.repeat');
+
+    if (eventDefinitionExecution && !this.environment.settings.strict) {
+      broker.bindQueue(execQ.name, 'execution', 'execute.expect');
+    }
+
+    execQ.consume(this._onExecutionMessage.bind(this), {
+      consumerTag: '_execution-tag'
     });
   }
 
@@ -97,19 +98,37 @@ proto.execute = function execute(executeMessage) {
   }
 };
 
+proto._onExecutionMessage = function onExecutionMessage(routingKey, message) {
+  message.ack();
+
+  switch (routingKey) {
+    case 'execute.detach':
+      return this._onDetachMessage(routingKey, message);
+
+    case 'execute.bound.completed':
+      return this._onCompleted(routingKey, message);
+
+    case 'execute.repeat':
+      return this._onRepeatMessage(routingKey, message);
+
+    case 'execute.expect':
+      return this._onExpectMessage(routingKey, message);
+  }
+};
+
 proto._onCompleted = function onCompleted(_, {
   content
 }) {
   if (!this.cancelActivity && !content.cancelActivity) {
     this._stop();
 
-    return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content));
+    return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content, {
+      cancelActivity: false
+    }));
   }
 
   this[kCompleteContent] = content;
-  const {
-    inbound
-  } = this[kExecuteMessage].content;
+  const inbound = this[kExecuteMessage].content.inbound;
   const attachedToContent = inbound && inbound[0];
   const attachedTo = this.attachedTo;
   this.activity.logger.debug(`<${this.executionId} (${this.id})> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`);
@@ -199,6 +218,17 @@ proto._onApiMessage = function onApiMessage(_, message) {
   }
 };
 
+proto._onRepeatMessage = function onRepeatMessage(_, message) {
+  if (this.cancelActivity) return;
+  const executeMessage = this[kExecuteMessage];
+  const repeat = message.content.repeat;
+  this.broker.getQueue('inbound-q').queueMessage({
+    routingKey: 'activity.restart'
+  }, (0, _messageHelper.cloneContent)(executeMessage.content.inbound[0], {
+    repeat
+  }));
+};
+
 proto._stop = function stop(detach) {
   const attachedTo = this.attachedTo,
         broker = this.broker,
@@ -208,8 +238,7 @@ proto._stop = function stop(detach) {
 
   for (const shovelName of this[kShovels].splice(0)) attachedTo.broker.closeShovel(shovelName);
 
-  broker.cancel('_expect-tag');
-  broker.cancel('_detach-tag');
+  broker.cancel('_execution-tag');
   broker.cancel(`_execution-completed-${executionId}`);
   if (detach) return;
   broker.cancel(`_api-${executionId}`);

package/dist/src/io/BpmnIO.js

@@ -8,6 +8,7 @@ exports.default = BpmnIO;
 function BpmnIO(activity, context) {
   this.activity = activity;
   this.context = context;
+  this.type = 'bpmnio';
   const {
     ioSpecification: ioSpecificationDef,
     properties: propertiesDef
@@ -16,6 +17,13 @@ function BpmnIO(activity, 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;

package/dist/src/io/InputOutputSpecification.js

@@ -29,8 +29,17 @@ 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
   });
@@ -177,10 +186,11 @@ proto._onFormatComplete = function formatOnComplete(message) {
   const endRoutingKey = `run.onend.${safeType}.end`;
   broker.publish('format', `${startRoutingKey}.begin`, {
     endRoutingKey,
-    ioSpecification: {
-      dataInputs: sources.map(input => {
-        return { ...input
-        };
+    ioSpecification: { ...(messageInputs && {
+        dataInputs: messageInputs.map(input => {
+          return { ...input
+          };
+        })
       }),
       dataOutputs: this._getDataOutputs(dataOutputs)
     }
@@ -189,9 +199,13 @@ proto._onFormatComplete = function formatOnComplete(message) {
     for (const response of responses) sources[response.index].value = response.value;
 
     broker.publish('format', endRoutingKey, {
-      ioSpecification: {
-        dataInputs: sources,
-        dataOutputs: this._getDataOutputs(dataOutputs)
+      ioSpecification: { ...(messageInputs && {
+          dataInputs: messageInputs.map(input => {
+            return { ...input
+            };
+          })
+        }),
+        dataOutputs: sources
       }
     });
   });

package/dist/src/io/Properties.js

@@ -87,6 +87,10 @@ 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);
   }
@@ -101,16 +105,13 @@ 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);
-  }
+  switch (routingKey) {
+    case 'activity.enter':
+    case 'activity.extension.resume':
+      return this._formatOnEnter(message);
 
-  if (routingKey === 'activity.execution.completed') {
-    return this._formatOnComplete(message);
+    case 'activity.execution.completed':
+      return this._formatOnComplete(message);
   }
 };
 

package/dist/src/tasks/ServiceTask.js

@@ -70,11 +70,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, (0, _messageHelper.cloneMessage)(message));
 };
 

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "bpmn-elements",
-  "version": "8.0.1",
+  "version": "8.2.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "main": "dist/index.js",
   "module": "index.js",
+  "sideEffects": false,
   "scripts": {
     "test": "mocha -R dot",
     "posttest": "npm run dist && eslint . --cache",
@@ -11,9 +12,7 @@
     "cov:html": "nyc mocha -R dot && nyc report --reporter=html",
     "test:lcov": "nyc mocha -R dot && nyc report --reporter lcov && npm run posttest",
     "dist": "babel index.js -d dist && babel src -d dist/src",
-    "predist": "node -e \"fs.rmdirSync('./dist/src', {recursive: true});\"",
-    "test-md": "node scripts/test-markdown ./API.md && node scripts/test-markdown ./docs/Examples.md",
-    "toc": "node scripts/generate-api-toc ./API.md,./docs/Examples.md,./docs/Form.md"
+    "predist": "node -e \"fs.rmdirSync('./dist/src', {recursive: true});\""
   },
   "repository": {
     "type": "git",
@@ -47,10 +46,10 @@
   ],
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.5",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/register": "^7.17.7",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.19.3",
+    "@babel/preset-env": "^7.19.3",
+    "@babel/register": "^7.18.6",
     "bpmn-moddle": "^7.1.2",
     "camunda-bpmn-moddle": "^6.1.2",
     "chai": "^4.3.6",
@@ -61,7 +60,7 @@
     "mocha": "^9.2.2",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^2.1.0",
-    "nock": "^13.2.6",
+    "nock": "^13.2.8",
     "nyc": "^15.1.0"
   },
   "dependencies": {

package/src/Context.js

@@ -1,3 +1,4 @@
+import BpmnIO from './io/BpmnIO';
 import Environment from './Environment';
 import ExtensionsMapper from './ExtensionsMapper';
 import {getUniqueId} from './shared';
@@ -16,7 +17,7 @@ function ContextInstance(definitionContext, environment) {
   this.sid = sid;
   this.definitionContext = definitionContext;
   this.environment = environment;
-  this.extensionsMapper = ExtensionsMapper(this);
+  this.extensionsMapper = new ExtensionsMapper(this);
   this.refs = {
     activityRefs: {},
     associationRefs: [],
@@ -196,6 +197,10 @@ proto.getStartActivities = function getStartActivities(filterOptions, scopeId) {
 };
 
 proto.loadExtensions = function loadExtensions(activity) {
-  return this.extensionsMapper.get(activity);
+  const io = new BpmnIO(activity, this);
+  const extensions = this.extensionsMapper.get(activity);
+  if (io.hasIo) extensions.extensions.push(io);
+  if (!extensions.extensions.length) return;
+  return extensions;
 };
 

package/src/ExtensionsMapper.js

@@ -1,42 +1,42 @@
-export default function ExtensionsMapper(context) {
-  const {extensions: envExtensions} = context.environment;
-  const extensions = getExtensions();
+const kActivated = Symbol.for('activated');
 
-  return {
-    get,
-  };
+export default function ExtensionsMapper(context) {
+  this.context = context;
+}
 
-  function get(activity) {
-    const activityExtensions = extensions.reduce(applyExtension, []);
-    return {
-      activate,
-      deactivate,
-    };
+ExtensionsMapper.prototype.get = function get(activity) {
+  return new Extensions(activity, this.context, this._getExtensions());
+};
 
-    function applyExtension(result, Extension) {
-      const extension = Extension(activity, context);
-      if (extension) result.push(extension);
-      return result;
-    }
+ExtensionsMapper.prototype._getExtensions = function getExtensions() {
+  let extensions;
+  if (!(extensions = this.context.environment.extensions)) return [];
+  return Object.values(extensions);
+};
 
-    function activate(message) {
-      for (const extension of activityExtensions) extension.activate(message);
-    }
-    function deactivate(message) {
-      for (const extension of activityExtensions) extension.deactivate(message);
-    }
+function Extensions(activity, context, extensions) {
+  const result = this.extensions = [];
+  for (const Extension of extensions) {
+    const extension = Extension(activity, context);
+    if (extension) result.push(extension);
   }
+  this[kActivated] = false;
+}
 
-  function getExtensions() {
-    const result = [];
-    if (!envExtensions) return result;
+Object.defineProperty(Extensions.prototype, 'count', {
+  get() {
+    return this.extensions.length;
+  },
+});
 
-    for (const key in envExtensions) {
-      const extension = envExtensions[key];
-      if (extension) {
-        result.push(extension);
-      }
-    }
-    return result;
-  }
-}
+Extensions.prototype.activate = function activate(message) {
+  if (this[kActivated]) return;
+  this[kActivated] = true;
+  for (const extension of this.extensions) extension.activate(message);
+};
+
+Extensions.prototype.deactivate = function deactivate(message) {
+  if (!this[kActivated]) return;
+  this[kActivated] = false;
+  for (const extension of this.extensions) extension.deactivate(message);
+};

package/src/activity/Activity.js

@@ -1,5 +1,4 @@
 import ActivityExecution from './ActivityExecution';
-import BpmnIO from '../io/BpmnIO';
 import {brokerSafeId, getUniqueId} from '../shared';
 import {ActivityApi} from '../Api';
 import {ActivityBroker} from '../EventBroker';
@@ -8,7 +7,6 @@ import {cloneContent, cloneParent, cloneMessage} from '../messageHelper';
 import {makeErrorFromMessage, ActivityError} from '../error/Errors';
 
 const kActivityDef = Symbol.for('activityDefinition');
-const kBpmnIo = Symbol.for('bpmnIo');
 const kConsuming = Symbol.for('consuming');
 const kCounters = Symbol.for('counters');
 const kEventDefinitions = Symbol.for('eventDefinitions');
@@ -105,6 +103,7 @@ function Activity(Behaviour, activityDef, context) {
   }
 
   this[kEventDefinitions] = eventDefinitions && eventDefinitions.map((ed) => new ed.Behaviour(this, ed, this.context));
+  this[kExtensions] = context.loadExtensions(this);
 }
 
 const proto = Activity.prototype;
@@ -130,21 +129,18 @@ Object.defineProperty(proto, 'executionId', {
   },
 });
 
-Object.defineProperty(proto, 'bpmnIo', {
+Object.defineProperty(proto, 'extensions', {
   enumerable: true,
   get() {
-    if (kBpmnIo in this) return this[kBpmnIo];
-    const bpmnIo = this[kBpmnIo] = new BpmnIO(this, this.context);
-    return bpmnIo;
+    return this[kExtensions];
   },
 });
 
-Object.defineProperty(proto, 'extensions', {
+Object.defineProperty(proto, 'bpmnIo', {
   enumerable: true,
   get() {
-    if (kExtensions in this) return this[kExtensions];
-    const extensions = this[kExtensions] = this.context.loadExtensions(this);
-    return extensions;
+    const extensions = this[kExtensions];
+    return extensions && extensions.extensions.find(e => e.type === 'bpmnio');
   },
 });
 
@@ -408,10 +404,12 @@ proto._discardRun = function discardRun() {
   }
 
   this._deactivateRunConsumers();
-  if (this.extensions) this.extensions.deactivate();
+
+  const message = this[kStateMessage];
+  if (this.extensions) this.extensions.deactivate(cloneMessage(message));
   const broker = this.broker;
   broker.getQueue('run-q').purge();
-  broker.publish('run', 'run.discard', cloneContent(this[kStateMessage].content));
+  broker.publish('run', 'run.discard', cloneContent(message.content));
   this._consumeRunQ();
 };
 
@@ -452,6 +450,7 @@ proto._onInbound = function onInbound(routingKey, message) {
   switch (routingKey) {
     case 'association.take':
     case 'flow.take':
+    case 'activity.restart':
     case 'activity.enter':
       return this.run({
         message: content.message,
@@ -600,12 +599,9 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.status = 'entered';
       if (!isRedelivered) {
         this[kExec].execution = null;
+        if (this.extensions) this.extensions.activate(cloneMessage(message));
+        this._publishEvent('enter', content, {correlationId});
       }
-
-      if (this.extensions) this.extensions.activate(cloneMessage(message), this);
-      if (this.bpmnIo) this.bpmnIo.activate(message);
-
-      if (!isRedelivered) this._publishEvent('enter', content, {correlationId});
       break;
     }
     case 'run.discard': {
@@ -614,8 +610,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.status = 'discard';
       this[kExec].execution = null;
 
-      if (this.extensions) this.extensions.activate(cloneMessage(message), this);
-      if (this.bpmnIo) this.bpmnIo.activate(message);
+      if (this.extensions) this.extensions.activate(cloneMessage(message));
 
       if (!isRedelivered) {
         this.broker.publish('run', 'run.discarded', content, {correlationId});
@@ -630,7 +625,6 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
         this.broker.publish('run', 'run.execute', content, {correlationId});
         this._publishEvent('start', content, {correlationId});
       }
-
       break;
     }
     case 'run.execute.passthrough': {
@@ -644,23 +638,15 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
       this.status = 'executing';
       this[kExecuteMessage] = message;
 
-      this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {exclusive: true, consumerTag: '_activity-execution'});
       const exec = this[kExec];
+      if (isRedelivered && this.extensions) this.extensions.activate(cloneMessage(message));
       if (!exec.execution) exec.execution = new ActivityExecution(this, this.context);
-
-      if (isRedelivered) {
-        return this._resumeExtensions(message, (err, formattedContent) => {
-          if (err) return this.emitFatal(err, message.content);
-          if (formattedContent) message.content = formattedContent;
-          this.status = 'executing';
-          return exec.execution.execute(message);
-        });
-      }
-
+      this.broker.getQueue('execution-q').assertConsumer(this[kMessageHandlers].onExecutionMessage, {exclusive: true, consumerTag: '_activity-execution'});
       return exec.execution.execute(message);
     }
     case 'run.end': {
-      if (this.status === 'end') break;
+      this.logger.debug(`<${id}> end`, isRedelivered ? 'redelivered' : '');
+      if (isRedelivered) break;
 
       this[kCounters].taken++;
 
@@ -706,8 +692,7 @@ proto._continueRunMessage = function continueRunMessage(routingKey, message) {
     case 'run.leave': {
       this.status = undefined;
 
-      if (this.bpmnIo) this.bpmnIo.deactivate(message);
-      if (this.extensions) this.extensions.deactivate(message);
+      if (this.extensions) this.extensions.deactivate(cloneMessage(message));
 
       if (!isRedelivered) {
         this.broker.publish('run', 'run.next', content, {persistent: false});
@@ -788,7 +773,7 @@ proto._doRunLeave = function doRunLeave(message, isDiscarded, onOutbound) {
     }
 
     this.broker.publish('run', 'run.leave', cloneContent(content, {
-      ...(outbound.length ? {outbound} : undefined),
+      ...(outbound.length && {outbound}),
     }), {correlationId});
 
     onOutbound();
@@ -832,7 +817,7 @@ proto._doRunOutbound = function doRunOutbound(outboundList, content, discardSequ
       flow: {
         ...outboundFlow,
         sequenceId: getUniqueId(`${flowId}_${action}`),
-        ...(discardSequence ? {discardSequence: discardSequence.slice()} : undefined),
+        ...(discardSequence && {discardSequence: discardSequence.slice()}),
       },
     }));
   }
@@ -843,7 +828,8 @@ proto._onResumeMessage = function onResumeMessage(message) {
   message.ack();
 
   const stateMessage = this[kStateMessage];
-  const {fields} = stateMessage;
+  const fields = stateMessage.fields;
+  if (!fields.redelivered) return;
 
   switch (fields.routingKey) {
     case 'run.enter':
@@ -856,7 +842,7 @@ proto._onResumeMessage = function onResumeMessage(message) {
       return;
   }
 
-  if (!fields.redelivered) return;
+  if (this.extensions) this.extensions.activate(cloneMessage(stateMessage));
 
   this.logger.debug(`<${this.id}> resume from ${message.content.status}`);
 
@@ -886,7 +872,7 @@ proto._onStop = function onStop(message) {
   broker.cancel('_format-consumer');
 
   if (running) {
-    if (this.extensions) this.extensions.deactivate(message || this._createMessage());
+    if (this.extensions) this.extensions.deactivate(message ? cloneMessage(message) : this._createMessage());
     this._publishEvent('stop', this._createMessage());
   }
 };
@@ -919,9 +905,9 @@ proto._createMessage = function createMessage(override) {
     ...override,
     id: this.id,
     type: this.type,
-    ...(name ? {name} : undefined),
-    ...(status ? {status} : undefined),
-    ...(parent ? {parent: cloneParent(parent)} : undefined),
+    ...(name && {name}),
+    ...(status && {status}),
+    ...(parent && {parent: cloneParent(parent)}),
   };
 
   for (const [flag, value] of Object.entries(this[kFlags])) {
@@ -935,20 +921,6 @@ proto._getOutboundSequenceFlowById = function getOutboundSequenceFlowById(flowId
   return this[kFlows].outboundSequenceFlows.find((flow) => flow.id === flowId);
 };
 
-proto._resumeExtensions = function resumeExtensions(message, callback) {
-  const extensions = this.extensions, bpmnIo = this.bpmnIo;
-  if (!extensions && !bpmnIo) return callback();
-
-  if (extensions) extensions.activate(cloneMessage(message), this);
-  if (bpmnIo) bpmnIo.activate(cloneMessage(message), this);
-
-  this.status = 'formatting';
-  return this.formatter.format(message, (err, formattedContent, formatted) => {
-    if (err) return callback(err);
-    return callback(null, formatted && formattedContent);
-  });
-};
-
 proto._deactivateRunConsumers = function _deactivateRunConsumers() {
   const broker = this.broker;
   broker.cancel('_activity-api');
@@ -1070,7 +1042,7 @@ OutboundEvaluator.prototype.completed = function completed(err) {
   for (const flow of Object.values(result)) {
     evaluationResult.push({
       ...flow,
-      ...(message !== undefined ? {message} : undefined),
+      ...(message !== undefined && {message}),
     });
   }
 
@@ -1082,6 +1054,6 @@ function formatFlowAction(flow, options) {
     ...options,
     id: flow.id,
     action: options.action,
-    ...(flow.isDefault ? {isDefault: true} : undefined),
+    ...(flow.isDefault && {isDefault: true}),
   };
 }

package/src/activity/ActivityExecution.js

@@ -345,7 +345,7 @@ proto._debug = function debug(logMessage, executionId) {
 
 function getExecuteMessage(message) {
   const result = cloneMessage(message, {
-    ...(message.fields.redelivered ? {isRecovered: true} : undefined),
+    ...(message.fields.redelivered && {isRecovered: true}),
     ignoreIfExecuting: undefined,
   });
   return result;

package/src/activity/Message.js

@@ -16,7 +16,7 @@ export default function Message(messageDef, context) {
       id,
       type,
       messageType: 'message',
-      ...(name ? {name: environment.resolveExpression(name, executionMessage)} : undefined),
+      ...(name && {name: environment.resolveExpression(name, executionMessage)}),
       parent: {...parent},
     };
   }

package/src/activity/Signal.js

@@ -16,7 +16,7 @@ export default function Signal(signalDef, context) {
       id,
       type,
       messageType: 'signal',
-      ...(name ? {name: environment.resolveExpression(name, executionMessage)} : undefined),
+      ...(name && {name: environment.resolveExpression(name, executionMessage)}),
       parent: {...parent},
     };
   }