@onify/flow-extensions 7.0.0 → 8.0.0

package/README.md

@@ -1,5 +1,4 @@
-Onify Flow Extensions
-=====================
+# Onify Flow Extensions
 
 [![Built latest](https://github.com/onify/flow-extensions/actions/workflows/build-latest.yaml/badge.svg)](https://github.com/onify/flow-extensions/actions/workflows/build-latest.yaml)[![Coverage Status](https://coveralls.io/repos/github/onify/flow-extensions/badge.svg?branch=default)](https://coveralls.io/github/onify/flow-extensions?branch=default)
 
@@ -13,8 +12,8 @@ Onify Flow Extensions
 ## Bpmn engine example
 
 ```js
-const {Engine} = require('bpmn-engine');
-const {extensions} = require('@onify/flow-extensions');
+const { Engine } = require('bpmn-engine');
+const { extensions } = require('@onify/flow-extensions');
 const FlowScripts = require('@onify/flow-extensions/dist/src/FlowScripts');
 
 const source = `
@@ -41,8 +40,8 @@ const engine = new Engine({
   },
   services: {
     serviceFn(scope, callback) {
-      callback(null, {data: 1});
-    }
+      callback(null, { data: 1 });
+    },
   },
   extensions: {
     onify: extensions,
@@ -63,11 +62,11 @@ engine.execute((err, instance) => {
 ## Extract scripts with extend function
 
 ```js
-const {extendFn} = require('@onify/flow-extensions');
+const { extendFn } = require('@onify/flow-extensions');
 
 const BpmnModdle = require('bpmn-moddle');
 const Elements = require('bpmn-elements');
-const {default: Serializer, TypeResolver} = require('moddle-context-serializer');
+const { default: Serializer, TypeResolver } = require('moddle-context-serializer');
 
 const source = `
 <definitions id="Def_0" xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
@@ -124,9 +123,9 @@ function getModdleContext(source, options) {
 ## Extend sequence flow with properties and take listeners
 
 ```js
-const {OnifySequenceFlow, extensions} = require('@onify/flow-extensions');
+const { OnifySequenceFlow, extensions } = require('@onify/flow-extensions');
 const FlowScripts = require('@onify/flow-extensions/dist/src/FlowScripts');
-const {Engine} = require('bpmn-engine');
+const { Engine } = require('bpmn-engine');
 const Elements = require('bpmn-elements');
 
 const source = `

package/dist/Connector.js

@@ -30,7 +30,7 @@ Connector.prototype.execute = async function execute(...args) {
   }
   async function formatCallback(serviceErr, result) {
     if (serviceErr) return callback(serviceErr);
-    if (!(io !== null && io !== void 0 && io.output.length)) return callback(null, result);
+    if (!io?.output.length) return callback(null, result);
     try {
       const formattedResult = await io.getOutput(activity, {
         ...executionMessage,

package/dist/ExecutionListeners.js

@@ -38,7 +38,7 @@ class Listener {
   }
   _getFields(environment, scope) {
     const fields = this.extension.fields;
-    if (!(fields !== null && fields !== void 0 && fields.length)) return;
+    if (!fields?.length) return;
     const result = {};
     for (const {
       name,

package/dist/FlowScripts.js

@@ -105,7 +105,7 @@ FlowScripts.prototype.getScript = function getScript(scriptType, {
 function JavaScript(flowName, scriptBody, runContext, options) {
   this.flowName = flowName;
   this._runContext = runContext;
-  this.timeout = options === null || options === void 0 ? void 0 : options.timeout;
+  this.timeout = options?.timeout;
   try {
     this.script = new _vm.Script(scriptBody, options);
   } catch (err) {

package/dist/OnifyBoundaryEventExtensions.js

@@ -28,7 +28,7 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
     }, {
       consumerTag: '_onify-extension-on-executed'
     });
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onStart) {
+    if (executionListeners?.onStart) {
       activity.on('start', async elementApi => {
         try {
           await executionListeners.execute('start', elementApi);
@@ -39,7 +39,7 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
         consumerTag: '_onify-extension-on-listenerstart'
       });
     }
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onEnd) {
+    if (executionListeners?.onEnd) {
       activity.on('end', elementApi => {
         this._executeExecutionListener('end', elementApi, formatQ);
       }, {
@@ -62,7 +62,6 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
     });
   }
   _onEnterSync(elementApi) {
-    var _io$output;
     const {
       format,
       properties,
@@ -77,7 +76,7 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
       });
       Object.assign(elementApi.content, result);
     }
-    if (io !== null && io !== void 0 && (_io$output = io.output) !== null && _io$output !== void 0 && _io$output.length) {
+    if (io?.output?.length) {
       result.assignToOutput = true;
     }
     return result;

package/dist/OnifyElementExtensions.js

@@ -35,14 +35,14 @@ class OnifyElementExtensions {
     }, {
       consumerTag: '_onify-extension-on-executed'
     });
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onStart) {
+    if (executionListeners?.onStart) {
       activity.on('start', elementApi => {
         this._executeExecutionListener('start', elementApi);
       }, {
         consumerTag: '_onify-extension-on-listenerstart'
       });
     }
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onEnd) {
+    if (executionListeners?.onEnd) {
       activity.on('end', elementApi => {
         this._executeExecutionListener('end', elementApi);
       }, {
@@ -118,15 +118,14 @@ class OnifyElementExtensions {
       Object.assign(elementApi.content, result);
     }
     if (io) {
-      var _io$input, _io$output;
-      if ((_io$input = io.input) !== null && _io$input !== void 0 && _io$input.length) {
+      if (io.input?.length) {
         const input = await io.getInput(this.activity, elementApi);
         Object.assign(result, {
           input
         });
         Object.assign(elementApi.content, result);
       }
-      if ((_io$output = io.output) !== null && _io$output !== void 0 && _io$output.length) {
+      if (io.output?.length) {
         result.assignToOutput = true;
       }
     }
@@ -143,7 +142,7 @@ class OnifyElementExtensions {
       io
     } = this.extensions;
     const result = {};
-    if (io !== null && io !== void 0 && io.output.length) {
+    if (io?.output.length) {
       const output = await io.getOutput(this.activity, elementApi);
       Object.assign(result, {
         output

package/dist/OnifyScriptTask.js

@@ -0,0 +1,3 @@
+"use strict";
+
+var _ScriptTask = require("bpmn-elements/tasks/ScriptTask.js");

package/dist/OnifySequenceFlow.js

@@ -13,8 +13,7 @@ class OnifySequenceFlow extends _bpmnElements.SequenceFlow {
     this._activate();
   }
   _activate() {
-    var _this$extensions$list;
-    if (!((_this$extensions$list = this.extensions.listeners) !== null && _this$extensions$list !== void 0 && _this$extensions$list.onTake)) return;
+    if (!this.extensions.listeners?.onTake) return;
     this.broker.subscribeTmp('event', 'flow.take', (_, msg) => {
       this._executeListeners(msg);
     }, {
@@ -32,14 +31,24 @@ class OnifySequenceFlow extends _bpmnElements.SequenceFlow {
   evaluate(fromMessage, callback) {
     const properties = this.extensions.properties;
     if (!properties) return super.evaluate(fromMessage, callback);
-    super.evaluate(fromMessage, (err, result) => {
+    try {
+      const preProperties = properties.resolve(this.getApi(fromMessage));
+      var evaluateMessage = fromMessage;
+      evaluateMessage.content.properties = {
+        ...fromMessage.content.properties,
+        ...preProperties
+      };
+    } catch (err) {
+      return callback(err);
+    }
+    super.evaluate(evaluateMessage, (err, result) => {
       if (err) return callback(err);
       try {
         let overriddenResult = result ? {} : false;
         if (result) {
           overriddenResult = {
             ...(typeof result === 'object' && result),
-            properties: properties.resolve(this.getApi(fromMessage))
+            properties: properties.resolve(this.getApi(evaluateMessage))
           };
         }
         return callback(err, overriddenResult);

package/dist/OnifySubProcessExtensions.js

@@ -25,12 +25,12 @@ class OnifySubProcessExtensions extends _OnifyElementExtensions.OnifyElementExte
     this._setupListener(broker, 'activity.execution.completed', elementApi => {
       return this._onExecutionCompleted(elementApi);
     }, '_onify-extension-on-executed');
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onStart) {
+    if (executionListeners?.onStart) {
       this._setupListener(broker, 'activity.start', elementApi => {
         this._executeExecutionListener('start', elementApi);
       }, '_onify-extension-on-listenerstart');
     }
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onEnd) {
+    if (executionListeners?.onEnd) {
       this._setupListener(broker, 'activity.end', elementApi => {
         this._executeExecutionListener('end', elementApi);
       }, '_onify-extension-on-listenerend');

package/dist/OnifyTimerEventDefinition.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OnifyTimerEventDefinition = void 0;
-var _bpmnElements = require("bpmn-elements");
 var _cronParser = _interopRequireDefault(require("cron-parser"));
+var _bpmnElements = require("bpmn-elements");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
   constructor(activity, def) {
@@ -17,8 +17,7 @@ class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
   parse(timerType, value) {
     let cron;
     if (timerType === 'timeCycle' && (cron = _cronParser.default.parseString(value))) {
-      var _cron$expressions;
-      if ((_cron$expressions = cron.expressions) !== null && _cron$expressions !== void 0 && _cron$expressions.length) {
+      if (cron.expressions?.length) {
         // cronParser.parseString expressions disregards seconds, so we have to parse again
         const expireAt = _cronParser.default.parseExpression(value).next().toDate();
         return {

package/dist/formatters.js

@@ -4,9 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FormatProcess = exports.FormatActivity = void 0;
-var _cronParser = _interopRequireDefault(require("cron-parser"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const iso8601cycle = /^\s*(R\d+\/)?P\w+/i;
 class FormatActivity {
   constructor(activity) {
     this.activity = activity;
@@ -14,8 +11,7 @@ class FormatActivity {
     let timeCycles;
     if (activity.eventDefinitions) {
       for (const ed of activity.eventDefinitions.filter(e => e.type === 'bpmn:TimerEventDefinition')) {
-        var _ed$supports;
-        if ((_ed$supports = ed.supports) !== null && _ed$supports !== void 0 && _ed$supports.includes('cron')) continue;
+        if (!ed.supports?.includes('cron')) continue;
         if (!('timeCycle' in ed)) continue;
         timeCycles = timeCycles || [];
         timeCycles.push(ed.timeCycle);
@@ -24,7 +20,6 @@ class FormatActivity {
     this.timeCycles = timeCycles;
   }
   resolve(elementApi) {
-    var _documentation$, _user, _groups;
     let user, groups, assigneeValue, description;
     const activity = this.activity;
     const {
@@ -37,17 +32,7 @@ class FormatActivity {
     if (candidateUsers) user = resolveAndSplit(elementApi, candidateUsers);
     if (candidateGroups) groups = resolveAndSplit(elementApi, candidateGroups);
     if (assignee) assigneeValue = elementApi.resolveExpression(assignee);
-    if (documentation) description = (_documentation$ = documentation[0]) === null || _documentation$ === void 0 ? void 0 : _documentation$.text;
-    let expireAt;
-    const timeCycles = this.timeCycles;
-    if (timeCycles) {
-      for (const cycle of timeCycles) {
-        const cron = elementApi.resolveExpression(cycle);
-        if (!cron || iso8601cycle.test(cron)) continue;
-        const expireAtDt = _cronParser.default.parseExpression(cron).next().toDate();
-        if (!expireAt || expireAtDt < expireAt) expireAt = expireAtDt;
-      }
-    }
+    if (documentation) description = documentation[0]?.text;
     return {
       ...(this.resultVariable && {
         resultVariable: this.resultVariable
@@ -55,18 +40,15 @@ class FormatActivity {
       ...(scheduledStart && activity.parent.type === 'bpmn:Process' && {
         scheduledStart
       }),
-      ...(((_user = user) === null || _user === void 0 ? void 0 : _user.length) && {
+      ...(user?.length && {
         candidateUsers: user
       }),
-      ...(((_groups = groups) === null || _groups === void 0 ? void 0 : _groups.length) && {
+      ...(groups?.length && {
         candidateGroups: groups
       }),
       ...(!elementApi.content.description && description && {
         description: elementApi.resolveExpression(description)
       }),
-      ...(expireAt && {
-        expireAt
-      }),
       ...(assigneeValue && {
         assignee: assigneeValue
       })
@@ -77,9 +59,12 @@ exports.FormatActivity = FormatActivity;
 class FormatProcess {
   constructor(bp) {
     this.process = bp;
+    this._historyTTL = undefined;
+    if (bp.behaviour.historyTimeToLive) {
+      this._historyTTL = bp.context.definitionContext.getTimersByElementId(bp.id).find(t => t.timer.type === 'historyTimeToLive');
+    }
   }
   resolve(elementApi) {
-    var _documentation$2, _user2, _groups2;
     let user, groups, description;
     const bp = this.process;
     const {
@@ -89,16 +74,19 @@ class FormatProcess {
     } = bp.behaviour;
     if (candidateStarterUsers) user = resolveAndSplit(elementApi, candidateStarterUsers);
     if (candidateStarterGroups) groups = resolveAndSplit(elementApi, candidateStarterGroups);
-    if (documentation) description = (_documentation$2 = documentation[0]) === null || _documentation$2 === void 0 ? void 0 : _documentation$2.text;
+    if (documentation) description = documentation[0]?.text;
     return {
-      ...(((_user2 = user) === null || _user2 === void 0 ? void 0 : _user2.length) && {
+      ...(user?.length && {
         candidateStarterUsers: user
       }),
-      ...(((_groups2 = groups) === null || _groups2 === void 0 ? void 0 : _groups2.length) && {
+      ...(groups?.length && {
         candidateStarterGroups: groups
       }),
       ...(!elementApi.content.description && description && {
         description: elementApi.resolveExpression(description)
+      }),
+      ...(this._historyTTL && {
+        historyTimeToLive: this._historyTTL.timer.value
       })
     };
   }

package/dist/getExtensions.js

@@ -13,7 +13,6 @@ var _IOProperties = _interopRequireDefault(require("./IOProperties.js"));
 var _ServiceExpression = _interopRequireDefault(require("./ServiceExpression.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getExtensions(element, context) {
-  var _element$behaviour$ex, _ext$values, _ext$fields;
   const result = {};
   switch (element.type) {
     case 'bpmn:SequenceFlow':
@@ -28,18 +27,18 @@ function getExtensions(element, context) {
   const listeners = new _ExecutionListeners.default(element, context);
   const expression = element.behaviour.expression;
   if (expression) result.Service = _ServiceExpression.default;
-  const extensions = (_element$behaviour$ex = element.behaviour.extensionElements) === null || _element$behaviour$ex === void 0 ? void 0 : _element$behaviour$ex.values;
+  const extensions = element.behaviour.extensionElements?.values;
   if (extensions) {
     for (const ext of extensions) {
       switch (ext.$type) {
         case 'camunda:Properties':
-          if ((_ext$values = ext.values) !== null && _ext$values !== void 0 && _ext$values.length) result.properties = new _IOProperties.default(element, ext);
+          if (ext.values?.length) result.properties = new _IOProperties.default(element, ext);
           break;
         case 'camunda:InputOutput':
           result.io = new _IO.InputOutput(element.id, ext, context);
           break;
         case 'camunda:FormData':
-          if ((_ext$fields = ext.fields) !== null && _ext$fields !== void 0 && _ext$fields.length) result.form = new _IOForm.default(element, ext);
+          if (ext.fields?.length) result.form = new _IOForm.default(element, ext);
           break;
         case 'camunda:Connector':
           {

package/dist/index.js

@@ -37,17 +37,33 @@ function extensions(element, context) {
   }
 }
 function extendFn(behaviour, context) {
-  var _behaviour$extensionE;
-  if (behaviour.$type === 'bpmn:StartEvent' && behaviour.eventDefinitions) {
-    const timer = behaviour.eventDefinitions.find(({
-      type,
-      behaviour: edBehaviour
-    }) => edBehaviour && type === 'bpmn:TimerEventDefinition');
-    if (timer && timer.behaviour.timeCycle) Object.assign(behaviour, {
-      scheduledStart: timer.behaviour.timeCycle
-    });
+  switch (behaviour.$type) {
+    case 'bpmn:StartEvent':
+      {
+        if (!behaviour.eventDefinitions) break;
+        const timer = behaviour.eventDefinitions.find(({
+          type,
+          behaviour: edBehaviour
+        }) => edBehaviour && type === 'bpmn:TimerEventDefinition');
+        if (timer && timer.behaviour.timeCycle) Object.assign(behaviour, {
+          scheduledStart: timer.behaviour.timeCycle
+        });
+        break;
+      }
+    case 'bpmn:Process':
+      {
+        if (!behaviour.isExecutable) break;
+        const {
+          historyTimeToLive,
+          isExecutable
+        } = behaviour;
+        if (historyTimeToLive && isExecutable) {
+          context.addTimer(behaviour.id + ':historyTimeToLive', getHistoryTimeToLiveTimer(behaviour));
+        }
+        break;
+      }
   }
-  if (!Array.isArray((_behaviour$extensionE = behaviour.extensionElements) === null || _behaviour$extensionE === void 0 ? void 0 : _behaviour$extensionE.values)) return;
+  if (!Array.isArray(behaviour.extensionElements?.values)) return;
   let listener = 0;
   for (const extension of behaviour.extensionElements.values) {
     switch (extension.$type) {
@@ -109,4 +125,25 @@ function registerListenerScript(parentId, context, type, listener, pos) {
       resource: script.resource
     })
   });
+}
+function getHistoryTimeToLiveTimer(behaviour) {
+  const {
+    id,
+    $type: type,
+    historyTimeToLive
+  } = behaviour;
+  let value = historyTimeToLive;
+  if (/^\d+$/.test(historyTimeToLive)) {
+    value = `P${historyTimeToLive}D`;
+  }
+  return {
+    id: `${type}/${id}:historyTimeToLive`,
+    type: 'historyTimeToLive',
+    timerType: 'timeDuration',
+    value,
+    parent: {
+      id,
+      type
+    }
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/flow-extensions",
-  "version": "7.0.0",
+  "version": "8.0.0",
   "description": "Onify Flow extensions",
   "type": "module",
   "module": "src/index.js",
@@ -14,7 +14,7 @@
   "scripts": {
     "test": "mocha -R dot",
     "posttest": "npm run lint && npm run dist",
-    "lint": "eslint . --cache",
+    "lint": "eslint . --cache && prettier . --check --cache",
     "prepare": "npm run dist",
     "dist": "babel src -d dist && babel test/helpers/FlowScripts.js -d dist",
     "test:lcov": "c8 -r lcov mocha && npm run lint",
@@ -38,29 +38,30 @@
   "license": "MIT",
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.6",
-    "@babel/preset-env": "^7.23.6",
-    "@babel/register": "^7.22.15",
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
+    "@babel/register": "^7.23.7",
     "bpmn-elements-8-1": "npm:bpmn-elements@8.1",
-    "bpmn-engine": "^18.0.0",
+    "bpmn-engine": "^20.0.1",
     "bpmn-engine-14": "npm:bpmn-engine@14",
-    "bpmn-moddle": "^8.1.0",
-    "c8": "^8.0.1",
+    "bpmn-moddle": "^9.0.1",
+    "c8": "^9.1.0",
     "camunda-bpmn-moddle": "^7.0.1",
-    "chai": "^4.3.10",
+    "chai": "^5.0.3",
     "chronokinesis": "^6.0.0",
     "debug": "^4.3.4",
-    "eslint": "^8.56.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint": "^9.0.0",
     "mocha": "^10.2.0",
     "mocha-cakes-2": "^3.3.0",
-    "moddle-context-serializer": "^4.1.1"
+    "moddle-context-serializer": "^4.1.1",
+    "prettier": "^3.2.4"
   },
   "peerDependencies": {
-    "bpmn-elements": ">=8"
+    "bpmn-elements": "^14.0.0"
   },
   "dependencies": {
+    "@0dep/piso": "^0.1.3",
     "cron-parser": "^4.9.0"
   },
   "files": [

package/src/Connector.js

@@ -1,4 +1,4 @@
-import {NotImplemented} from './Errors.js';
+import { NotImplemented } from './Errors.js';
 
 export default function Connector(connectorId, io, activity, executionMessage) {
   if (!(this instanceof Connector)) return new Connector(connectorId, io, activity, executionMessage);
@@ -22,7 +22,7 @@ Connector.prototype.execute = async function execute(...args) {
   if (!serviceFunction) return callback(new NotImplemented(connectorId));
 
   try {
-    const input = io && await io.getInput(activity, executionMessage);
+    const input = io && (await io.getInput(activity, executionMessage));
     await serviceFunction.call(activity, input, ...args);
   } catch (err) {
     return callback(err);
@@ -33,7 +33,7 @@ Connector.prototype.execute = async function execute(...args) {
     if (!io?.output.length) return callback(null, result);
 
     try {
-      const formattedResult = await io.getOutput(activity, {...executionMessage, ...result});
+      const formattedResult = await io.getOutput(activity, { ...executionMessage, ...result });
       return callback(null, formattedResult);
     } catch (err) {
       return callback(err);

package/src/Errors.js

@@ -2,7 +2,7 @@ export class NotImplemented extends Error {
   constructor(serviceId) {
     super(`${serviceId} service function not found`);
     this.code = 'EFLOW_NOT_IMPLEMENTED';
-    this.output = {statusCode: 501};
+    this.output = { statusCode: 501 };
   }
 }
 
@@ -10,6 +10,6 @@ export class FormatError extends Error {
   constructor(elementId, err) {
     super(`<${elementId}> ${err.message}`);
     this.code = 'EFLOW_FORMAT';
-    this.output = {statusCode: 500};
+    this.output = { statusCode: 500 };
   }
 }

package/src/ExecutionListeners.js

@@ -10,7 +10,7 @@ class Listener {
   _getScope(message, extend) {
     const environment = this.environment;
 
-    const {fields, content, properties} = message;
+    const { fields, content, properties } = message;
     const scope = {
       ...extend,
       type: this.type,
@@ -33,7 +33,7 @@ class Listener {
     const fields = this.extension.fields;
     if (!fields?.length) return;
     const result = {};
-    for (const {name, expression, string} of fields) {
+    for (const { name, expression, string } of fields) {
       result['' + name] = expression ? environment.resolveExpression(expression, scope) : string;
     }
     return result;
@@ -43,15 +43,15 @@ class Listener {
 class ScriptListener extends Listener {
   constructor(activity, context, extension, pos) {
     super(activity, context, extension);
-    const id = this.id = `${activity.id}/${extension.script.$type}/${this.event}/${pos}`;
+    const id = (this.id = `${activity.id}/${extension.script.$type}/${this.event}/${pos}`);
     this._register(context, id, extension.script);
   }
   execute(api) {
     const environment = this.environment;
-    const scope = this._getScope(api, {id: this.id, resolveExpression});
+    const scope = this._getScope(api, { id: this.id, resolveExpression });
     const listenerFields = this._getFields(environment, scope);
     if (listenerFields) scope.listener.fields = listenerFields;
-    const script = this.environment.scripts.getScript(this.extension.scriptFormat, {id: this.id});
+    const script = this.environment.scripts.getScript(this.extension.scriptFormat, { id: this.id });
 
     return new Promise((resolve, reject) => {
       return script.execute(scope, (err, result) => {
@@ -65,11 +65,7 @@ class ScriptListener extends Listener {
     }
   }
   _register(context, id, script) {
-    const {
-      scriptFormat,
-      value,
-      resource,
-    } = script;
+    const { scriptFormat, value, resource } = script;
 
     context.environment.scripts.register({
       id,
@@ -90,7 +86,7 @@ class ScriptListener extends Listener {
 class ExpressionListener extends Listener {
   execute(message) {
     const scope = this._getScope(message);
-    return {expression: this.environment.resolveExpression(this.extension.expression, scope)};
+    return { expression: this.environment.resolveExpression(this.extension.expression, scope) };
   }
 }
 
@@ -113,7 +109,7 @@ export default class ExecutionListeners {
     return this.listeners.some((l) => l.event === 'take');
   }
   add(extension, pos) {
-    const {script, expression} = extension;
+    const { script, expression } = extension;
     if (!script && !expression) return;
 
     const list = this.listeners;