bpmn-elements 13.1.1 → 13.2.0

package/README.md

@@ -1,5 +1,4 @@
-bpmn-elements
-=============
+# bpmn-elements
 
 [![Build](https://github.com/paed01/bpmn-elements/actions/workflows/build.yaml/badge.svg)](https://github.com/paed01/bpmn-elements/actions/workflows/build.yaml)[![Coverage Status](https://coveralls.io/repos/github/paed01/bpmn-elements/badge.svg?branch=master)](https://coveralls.io/github/paed01/bpmn-elements?branch=master)
 

package/dist/Context.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = Context;
 var _BpmnIO = _interopRequireDefault(require("./io/BpmnIO.js"));
 var _Environment = _interopRequireDefault(require("./Environment.js"));
-var _ExtensionsMapper = _interopRequireDefault(require("./ExtensionsMapper.js"));
 var _shared = require("./shared.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const kOwner = Symbol.for('owner');
+const kActivated = Symbol.for('activated');
 function Context(definitionContext, environment) {
   environment = environment ? environment.clone() : new _Environment.default();
   return new ContextInstance(definitionContext, environment);
@@ -27,7 +27,7 @@ function ContextInstance(definitionContext, environment, owner) {
   this.sid = sid;
   this.definitionContext = definitionContext;
   this.environment = environment;
-  this.extensionsMapper = new _ExtensionsMapper.default(this);
+  this.extensionsMapper = new ExtensionsMapper(this);
   this.refs = {
     activityRefs: {},
     associationRefs: [],
@@ -192,4 +192,38 @@ ContextInstance.prototype.getActivityParentById = function getActivityParentById
   const activity = this.getActivityById(activityId);
   const parentId = activity.parent.id;
   return this.getProcessById(parentId) || this.getActivityById(parentId);
+};
+function ExtensionsMapper(context) {
+  this.context = context;
+}
+ExtensionsMapper.prototype.get = function get(activity) {
+  return new Extensions(activity, this.context, this._getExtensions());
+};
+ExtensionsMapper.prototype._getExtensions = function getExtensions() {
+  let extensions;
+  if (!(extensions = this.context.environment.extensions)) return [];
+  return Object.values(extensions);
+};
+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;
+}
+Object.defineProperty(Extensions.prototype, 'count', {
+  get() {
+    return this.extensions.length;
+  }
+});
+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/dist/definition/DefinitionExecution.js

@@ -427,6 +427,7 @@ DefinitionExecution.prototype._onProcessMessage = function onProcessMessage(rout
           for (const bp of this[kProcesses].running.slice()) {
             if (bp.id !== childId) bp.stop();
           }
+          Object.assign(this.environment.output, content.output);
           this._complete('error', {
             error: content.error
           });
@@ -454,13 +455,13 @@ DefinitionExecution.prototype._onProcessCompleted = function onProcessCompleted(
     type,
     inbound
   } = message.content;
+  message.ack();
   this._debug(`left <${executionId} (${id})> (${type}), pending runs ${this.postponedCount}`);
   if (inbound && inbound.length) {
     const bp = this._removeProcessByExecutionId(executionId);
     this._deactivateProcess(bp);
   }
   if (!this.postponedCount) {
-    message.ack();
     this._complete('completed');
   }
 };

package/dist/getPropertyValue.js

@@ -48,7 +48,6 @@ function executeFn(fn, args, base, fnScope) {
   }
   if (!fnScope) return fn.apply(null, callArguments);
   return function ScopedIIFE() {
-    // eslint-disable-line no-extra-parens
     return fn.apply(this, callArguments);
   }.call(fnScope);
 }
@@ -65,7 +64,7 @@ function splitArguments(args, base, fnScope) {
         argCompleted = true;
       } else if (charPos !== ' ') {
         arg += charPos;
-        if (charPos === '\'' || charPos === '"') {
+        if (charPos === "'" || charPos === '"') {
           insideString = true;
           delimiter = charPos;
         }

package/dist/index.js

@@ -399,5 +399,5 @@ var _Timers = require("./Timers.js");
 var ISODuration = _interopRequireWildcard(require("./iso-duration.js"));
 exports.ISODuration = ISODuration;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "13.1.1",
+  "version": "13.2.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,7 +33,7 @@
   "scripts": {
     "test": "mocha -R @bonniernews/hot-bev -p -t 3000",
     "posttest": "npm run lint && npm run dist",
-    "lint": "eslint . --cache",
+    "lint": "eslint . --cache && prettier . --check --cache",
     "prepack": "npm run dist",
     "cov:html": "c8 -r html -r text mocha -R @bonniernews/hot-bev -p -t 3000",
     "test:lcov": "c8 -r lcov mocha && npm run lint",
@@ -64,25 +64,26 @@
   ],
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
+    "@babel/cli": "^7.24.1",
+    "@babel/core": "^7.24.4",
+    "@babel/preset-env": "^7.24.4",
     "@babel/register": "^7.23.7",
     "@bonniernews/hot-bev": "^0.4.0",
-    "@types/node": "^16.18.80",
-    "bpmn-moddle": "^8.1.0",
+    "@types/node": "^16.18.95",
+    "bpmn-moddle": "^9.0.1",
     "c8": "^9.1.0",
     "camunda-bpmn-moddle": "^7.0.1",
-    "chai": "^5.0.3",
+    "chai": "^5.1.0",
     "chronokinesis": "^6.0.0",
     "debug": "^4.3.4",
-    "eslint": "^8.56.0",
-    "eslint-plugin-import": "^2.29.1",
-    "got": "^14.2.0",
-    "mocha": "^10.3.0",
+    "eslint": "^9.0.0",
+    "globals": "^15.0.0",
+    "got": "^14.2.1",
+    "mocha": "^10.4.0",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^4.1.2",
-    "nock": "^13.5.1"
+    "nock": "^13.5.3",
+    "prettier": "^3.2.5"
   },
   "dependencies": {
     "smqp": "^8.2.2"

package/src/Api.js

@@ -1,13 +1,7 @@
-import {cloneMessage} from './messageHelper.js';
-import {getUniqueId} from './shared.js';
-
-export {
-  ActivityApi,
-  DefinitionApi,
-  ProcessApi,
-  FlowApi,
-  Api,
-};
+import { cloneMessage } from './messageHelper.js';
+import { getUniqueId } from './shared.js';
+
+export { ActivityApi, DefinitionApi, ProcessApi, FlowApi, Api };
 
 function ActivityApi(broker, apiMessage, environment) {
   return new Api('activity', broker, apiMessage, environment);
@@ -30,7 +24,7 @@ function Api(pfx, broker, sourceMessage, environment) {
 
   const apiMessage = cloneMessage(sourceMessage);
 
-  const {id, type, name, executionId} = apiMessage.content;
+  const { id, type, name, executionId } = apiMessage.content;
   this.id = id;
   this.type = type;
   this.name = name;
@@ -45,7 +39,7 @@ function Api(pfx, broker, sourceMessage, environment) {
 }
 
 Api.prototype.cancel = function cancel(message, options) {
-  this.sendApiMessage('cancel', {message}, options);
+  this.sendApiMessage('cancel', { message }, options);
 };
 
 Api.prototype.discard = function discard() {
@@ -53,11 +47,11 @@ Api.prototype.discard = function discard() {
 };
 
 Api.prototype.fail = function fail(error) {
-  this.sendApiMessage('error', {error});
+  this.sendApiMessage('error', { error });
 };
 
 Api.prototype.signal = function signal(message, options) {
-  this.sendApiMessage('signal', {message}, options);
+  this.sendApiMessage('signal', { message }, options);
 };
 
 Api.prototype.stop = function stop() {
@@ -65,18 +59,22 @@ Api.prototype.stop = function stop() {
 };
 
 Api.prototype.resolveExpression = function resolveExpression(expression) {
-  return this.environment.resolveExpression(expression, {
-    fields: this.fields,
-    content: this.content,
-    properties: this.messageProperties,
-  }, this.owner);
+  return this.environment.resolveExpression(
+    expression,
+    {
+      fields: this.fields,
+      content: this.content,
+      properties: this.messageProperties,
+    },
+    this.owner,
+  );
 };
 
 Api.prototype.sendApiMessage = function sendApiMessage(action, content, options) {
   const correlationId = (options && options.correlationId) || getUniqueId(`${this.id || this.messagePrefix}_signal`);
   let key = `${this.messagePrefix}.${action}`;
   if (this.executionId) key += `.${this.executionId}`;
-  this.broker.publish('api', key, this.createMessage(content), {...options, correlationId, type: action});
+  this.broker.publish('api', key, this.createMessage(content), { ...options, correlationId, type: action });
 };
 
 Api.prototype.getPostponed = function getPostponed(...args) {

package/src/Context.js

@@ -1,9 +1,9 @@
 import BpmnIO from './io/BpmnIO.js';
 import Environment from './Environment.js';
-import ExtensionsMapper from './ExtensionsMapper.js';
-import {getUniqueId} from './shared.js';
+import { getUniqueId } from './shared.js';
 
 const kOwner = Symbol.for('owner');
+const kActivated = Symbol.for('activated');
 
 export default function Context(definitionContext, environment) {
   environment = environment ? environment.clone() : new Environment();
@@ -11,7 +11,7 @@ export default function Context(definitionContext, environment) {
 }
 
 function ContextInstance(definitionContext, environment, owner) {
-  const {id = 'Def', name, type = 'context'} = definitionContext;
+  const { id = 'Def', name, type = 'context' } = definitionContext;
   const sid = getUniqueId(id);
   this.id = id;
   this.name = name;
@@ -148,11 +148,11 @@ ContextInstance.prototype.getNewProcessById = function getNewProcessById(process
 };
 
 ContextInstance.prototype.getProcesses = function getProcesses() {
-  return this.definitionContext.getProcesses().map(({id: processId}) => this.getProcessById(processId));
+  return this.definitionContext.getProcesses().map(({ id: processId }) => this.getProcessById(processId));
 };
 
 ContextInstance.prototype.getExecutableProcesses = function getExecutableProcesses() {
-  return this.definitionContext.getExecutableProcesses().map(({id: processId}) => this.getProcessById(processId));
+  return this.definitionContext.getExecutableProcesses().map(({ id: processId }) => this.getProcessById(processId));
 };
 
 ContextInstance.prototype.getMessageFlows = function getMessageFlows(sourceId) {
@@ -180,7 +180,8 @@ ContextInstance.prototype.getDataStoreById = function getDataStoreById(reference
   let dataStore;
   if ((dataStore = this.refs.dataStoreRefs[referenceId])) return dataStore;
 
-  const dataStoreDef = this.definitionContext.getDataStoreById(referenceId) || this.definitionContext.getDataStoreReferenceById(referenceId);
+  const dataStoreDef =
+    this.definitionContext.getDataStoreById(referenceId) || this.definitionContext.getDataStoreReferenceById(referenceId);
   if (!dataStoreDef) return;
 
   dataStore = this.refs.dataStoreRefs[dataStoreDef.id] = new dataStoreDef.Behaviour(dataStoreDef, this);
@@ -189,7 +190,7 @@ ContextInstance.prototype.getDataStoreById = function getDataStoreById(reference
 };
 
 ContextInstance.prototype.getStartActivities = function getStartActivities(filterOptions, scopeId) {
-  const {referenceId, referenceType = 'unknown'} = filterOptions || {};
+  const { referenceId, referenceType = 'unknown' } = filterOptions || {};
   const result = [];
   for (const activity of this.getActivities()) {
     if (!activity.isStart) continue;
@@ -224,3 +225,44 @@ ContextInstance.prototype.getActivityParentById = function getActivityParentById
   const parentId = activity.parent.id;
   return this.getProcessById(parentId) || this.getActivityById(parentId);
 };
+
+function ExtensionsMapper(context) {
+  this.context = context;
+}
+
+ExtensionsMapper.prototype.get = function get(activity) {
+  return new Extensions(activity, this.context, this._getExtensions());
+};
+
+ExtensionsMapper.prototype._getExtensions = function getExtensions() {
+  let extensions;
+  if (!(extensions = this.context.environment.extensions)) return [];
+  return Object.values(extensions);
+};
+
+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;
+}
+
+Object.defineProperty(Extensions.prototype, 'count', {
+  get() {
+    return this.extensions.length;
+  },
+});
+
+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/Environment.js

@@ -1,21 +1,11 @@
 import Expressions from './Expressions.js';
-import {Scripts as IScripts} from './Scripts.js';
-import {Timers} from './Timers.js';
+import { Scripts as IScripts } from './Scripts.js';
+import { Timers } from './Timers.js';
 
 const kServices = Symbol.for('services');
 const kVariables = Symbol.for('variables');
 
-const defaultOptions = [
-  'expressions',
-  'extensions',
-  'Logger',
-  'output',
-  'scripts',
-  'services',
-  'settings',
-  'timers',
-  'variables',
-];
+const defaultOptions = ['expressions', 'extensions', 'Logger', 'output', 'scripts', 'services', 'settings', 'timers', 'variables'];
 
 export default function Environment(options = {}) {
   this.options = validateOptions(options);
@@ -25,7 +15,7 @@ export default function Environment(options = {}) {
   this.output = options.output || {};
   this.scripts = options.scripts || IScripts();
   this.timers = options.timers || new Timers();
-  this.settings = {...options.settings};
+  this.settings = { ...options.settings };
   this.Logger = options.Logger || DummyLogger;
   this[kServices] = options.services || {};
   this[kVariables] = options.variables || {};
@@ -53,9 +43,9 @@ Object.defineProperties(Environment.prototype, {
 
 Environment.prototype.getState = function getState() {
   return {
-    settings: {...this.settings},
-    variables: {...this[kVariables]},
-    output: {...this.output},
+    settings: { ...this.settings },
+    variables: { ...this[kVariables] },
+    output: { ...this.output },
   };
 };
 
@@ -72,8 +62,8 @@ Environment.prototype.recover = function recover(state) {
 Environment.prototype.clone = function clone(overrideOptions = {}) {
   const services = this[kServices];
   const newOptions = {
-    settings: {...this.settings},
-    variables: {...this[kVariables]},
+    settings: { ...this.settings },
+    variables: { ...this[kVariables] },
     Logger: this.Logger,
     extensions: this.extensions,
     scripts: this.scripts,
@@ -84,7 +74,7 @@ Environment.prototype.clone = function clone(overrideOptions = {}) {
     services,
   };
 
-  if (overrideOptions.services) newOptions.services = {...services, ...overrideOptions.services};
+  if (overrideOptions.services) newOptions.services = { ...services, ...overrideOptions.services };
 
   return new this.constructor(newOptions);
 };

package/src/EventBroker.js

@@ -1,13 +1,7 @@
 import { Broker } from 'smqp';
 import { makeErrorFromMessage } from './error/Errors.js';
 
-export {
-  ActivityBroker,
-  DefinitionBroker,
-  MessageFlowBroker,
-  ProcessBroker,
-  EventBroker
-};
+export { ActivityBroker, DefinitionBroker, MessageFlowBroker, ProcessBroker, EventBroker };
 
 function ActivityBroker(activity) {
   const executionBroker = ExecutionBroker(activity, 'activity');
@@ -16,7 +10,7 @@ function ActivityBroker(activity) {
 
 function ProcessBroker(owner) {
   const executionBroker = ExecutionBroker(owner, 'process');
-  executionBroker.broker.assertQueue('api-q', {durable: false, autoDelete: false});
+  executionBroker.broker.assertQueue('api-q', { durable: false, autoDelete: false });
   executionBroker.broker.bindQueue('api-q', 'api', '#');
   return executionBroker;
 }
@@ -26,29 +20,29 @@ function DefinitionBroker(owner, onBrokerReturn) {
 }
 
 function MessageFlowBroker(owner) {
-  const eventBroker = new EventBroker(owner, {prefix: 'messageflow', autoDelete: false, durable: false});
+  const eventBroker = new EventBroker(owner, { prefix: 'messageflow', autoDelete: false, durable: false });
   const broker = eventBroker.broker;
 
-  broker.assertExchange('message', 'topic', {durable: true, autoDelete: false});
-  broker.assertQueue('message-q', {durable: true, autoDelete: false});
+  broker.assertExchange('message', 'topic', { durable: true, autoDelete: false });
+  broker.assertQueue('message-q', { durable: true, autoDelete: false });
   broker.bindQueue('message-q', 'message', 'message.#');
 
   return eventBroker;
 }
 
 function ExecutionBroker(brokerOwner, prefix, onBrokerReturn) {
-  const eventBroker = new EventBroker(brokerOwner, {prefix, autoDelete: false, durable: false}, onBrokerReturn);
+  const eventBroker = new EventBroker(brokerOwner, { prefix, autoDelete: false, durable: false }, onBrokerReturn);
   const broker = eventBroker.broker;
 
-  broker.assertExchange('api', 'topic', {autoDelete: false, durable: false});
-  broker.assertExchange('run', 'topic', {autoDelete: false});
-  broker.assertExchange('format', 'topic', {autoDelete: false});
-  broker.assertExchange('execution', 'topic', {autoDelete: false});
+  broker.assertExchange('api', 'topic', { autoDelete: false, durable: false });
+  broker.assertExchange('run', 'topic', { autoDelete: false });
+  broker.assertExchange('format', 'topic', { autoDelete: false });
+  broker.assertExchange('execution', 'topic', { autoDelete: false });
 
-  const runQ = broker.assertQueue('run-q', {durable: true, autoDelete: false});
-  const formatRunQ = broker.assertQueue('format-run-q', {durable: true, autoDelete: false});
-  const executionQ = broker.assertQueue('execution-q', {durable: true, autoDelete: false});
-  broker.assertQueue('inbound-q', {durable: true, autoDelete: false});
+  const runQ = broker.assertQueue('run-q', { durable: true, autoDelete: false });
+  const formatRunQ = broker.assertQueue('format-run-q', { durable: true, autoDelete: false });
+  const executionQ = broker.assertQueue('execution-q', { durable: true, autoDelete: false });
+  broker.assertQueue('inbound-q', { durable: true, autoDelete: false });
 
   broker.bindQueue(runQ.name, 'run', 'run.#');
   broker.bindQueue(formatRunQ.name, 'format', 'run.#');
@@ -61,7 +55,7 @@ function EventBroker(brokerOwner, options, onBrokerReturn) {
   this.options = options;
   this.eventPrefix = options.prefix;
 
-  const broker = this.broker = Broker(brokerOwner);
+  const broker = (this.broker = Broker(brokerOwner));
   broker.assertExchange('event', 'topic', options);
   broker.on('return', onBrokerReturn ? onBrokerReturn.bind(brokerOwner) : this._onBrokerReturnFn.bind(this));
 
@@ -76,7 +70,7 @@ EventBroker.prototype.on = function on(eventName, callback, eventOptions = { onc
   const key = this._getEventRoutingKey(eventName);
 
   if (eventOptions.once) return this.broker.subscribeOnce('event', key, eventCallback, eventOptions);
-  return this.broker.subscribeTmp('event', key, eventCallback, {...eventOptions, noAck: true});
+  return this.broker.subscribeTmp('event', key, eventCallback, { ...eventOptions, noAck: true });
 
   function eventCallback(routingKey, message, owner) {
     if (eventName === 'error') return callback(makeErrorFromMessage(message));
@@ -85,7 +79,7 @@ EventBroker.prototype.on = function on(eventName, callback, eventOptions = { onc
 };
 
 EventBroker.prototype.once = function once(eventName, callback, eventOptions = {}) {
-  return this.on(eventName, callback, {...eventOptions, once: true});
+  return this.on(eventName, callback, { ...eventOptions, once: true });
 };
 
 EventBroker.prototype.waitFor = function waitFor(eventName, onMessage) {
@@ -93,8 +87,8 @@ EventBroker.prototype.waitFor = function waitFor(eventName, onMessage) {
 
   return new Promise((resolve, reject) => {
     const consumers = [
-      this.broker.subscribeTmp('event', key, eventCallback, {noAck: true}),
-      this.broker.subscribeTmp('event', '*.error', errorCallback, {noAck: true}),
+      this.broker.subscribeTmp('event', key, eventCallback, { noAck: true }),
+      this.broker.subscribeTmp('event', '*.error', errorCallback, { noAck: true }),
     ];
 
     function eventCallback(routingKey, message, owner) {
@@ -118,11 +112,11 @@ EventBroker.prototype.waitFor = function waitFor(eventName, onMessage) {
 };
 
 EventBroker.prototype.emit = function emit(eventName, content, props) {
-  this.broker.publish('event', `${this.eventPrefix}.${eventName}`, {...content}, {type: eventName, ...props});
+  this.broker.publish('event', `${this.eventPrefix}.${eventName}`, { ...content }, { type: eventName, ...props });
 };
 
 EventBroker.prototype.emitFatal = function emitFatal(error, content) {
-  this.emit('error', {...content, error}, {mandatory: true});
+  this.emit('error', { ...content, error }, { mandatory: true });
 };
 
 EventBroker.prototype._onBrokerReturnFn = function onBrokerReturnFn(message) {

package/src/MessageFormatter.js

@@ -1,15 +1,15 @@
-import {cloneMessage} from './messageHelper.js';
-import {getUniqueId} from './shared.js';
-import {ActivityError} from './error/Errors.js';
-import {getRoutingKeyPattern} from 'smqp';
+import { cloneMessage } from './messageHelper.js';
+import { getUniqueId } from './shared.js';
+import { ActivityError } from './error/Errors.js';
+import { getRoutingKeyPattern } from 'smqp';
 
 const kOnMessage = Symbol.for('onMessage');
 const kExecution = Symbol.for('execution');
 
-export {Formatter};
+export { Formatter };
 
 function Formatter(element, formatQ) {
-  const {id, broker, logger} = element;
+  const { id, broker, logger } = element;
   this.id = id;
   this.broker = broker;
   this.logger = logger;
@@ -21,16 +21,20 @@ function Formatter(element, formatQ) {
 }
 
 Formatter.prototype.format = function format(message, callback) {
-  const correlationId = this._runId = getUniqueId(message.fields.routingKey);
+  const correlationId = (this._runId = getUniqueId(message.fields.routingKey));
   const consumerTag = '_formatter-' + correlationId;
   const formatQ = this.formatQ;
 
-  formatQ.queueMessage({
-    routingKey: '_formatting.exec',
-  }, {}, {
-    correlationId,
-    persistent: false,
-  });
+  formatQ.queueMessage(
+    {
+      routingKey: '_formatting.exec',
+    },
+    {},
+    {
+      correlationId,
+      persistent: false,
+    },
+  );
 
   this[kExecution] = {
     correlationId,
@@ -49,7 +53,7 @@ Formatter.prototype.format = function format(message, callback) {
 };
 
 Formatter.prototype._onMessage = function onMessage(routingKey, message) {
-  const {formatKey, correlationId, pending, executeMessage} = this[kExecution];
+  const { formatKey, correlationId, pending, executeMessage } = this[kExecution];
   const asyncFormatting = pending.length;
 
   switch (routingKey) {
@@ -72,7 +76,7 @@ Formatter.prototype._onMessage = function onMessage(routingKey, message) {
       }
 
       if (asyncFormatting) {
-        const {isError, message: startMessage} = this._popFormatStart(pending, routingKey);
+        const { isError, message: startMessage } = this._popFormatStart(pending, routingKey);
         if (startMessage) startMessage.ack();
 
         if (isError) {
@@ -91,7 +95,7 @@ Formatter.prototype._onMessage = function onMessage(routingKey, message) {
 };
 
 Formatter.prototype._complete = function complete(message, isError) {
-  const {runMessage, formatKey, callback, formatted, executeMessage} = this[kExecution];
+  const { runMessage, formatKey, callback, formatted, executeMessage } = this[kExecution];
   this[kExecution] = null;
   if (executeMessage) executeMessage.ack();
 
@@ -134,15 +138,15 @@ Formatter.prototype._decorate = function decorate(withContent) {
 Formatter.prototype._popFormatStart = function popFormattingStart(pending, routingKey) {
   for (let idx = 0; idx < pending.length; idx++) {
     const msg = pending[idx];
-    const {endRoutingKey, errorRoutingKey = '#.error'} = msg.content;
+    const { endRoutingKey, errorRoutingKey = '#.error' } = msg.content;
 
     if (endRoutingKey && getRoutingKeyPattern(endRoutingKey).test(routingKey)) {
       this._debug(`completed formatting ${msg.fields.routingKey} message content with formatter ${routingKey}`);
       pending.splice(idx, 1);
-      return {message: msg};
+      return { message: msg };
     } else if (getRoutingKeyPattern(errorRoutingKey).test(routingKey)) {
       pending.splice(idx, 1);
-      return {isError: true, message: msg};
+      return { isError: true, message: msg };
     }
   }
 

package/src/Tracker.js

@@ -45,28 +45,28 @@ ActivityTracker.prototype.track = function track(routingKey, message) {
 };
 
 ActivityTracker.prototype._executing = function executing(id) {
-  const {wait, execute} = this.status;
+  const { wait, execute } = this.status;
   if (execute.indexOf(id) === -1) execute.push(id);
   let idx;
   if ((idx = wait.indexOf(id)) !== -1) wait.splice(idx, 1);
 };
 
 ActivityTracker.prototype._waiting = function waiting(id) {
-  const {wait, execute} = this.status;
+  const { wait, execute } = this.status;
   if (wait.indexOf(id) === -1) wait.push(id);
   let idx;
   if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
 };
 
 ActivityTracker.prototype._timer = function timerFn(id) {
-  const {timer, execute} = this.status;
+  const { timer, execute } = this.status;
   if (timer.indexOf(id) === -1) timer.push(id);
   let idx;
   if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);
 };
 
 ActivityTracker.prototype._leave = function leave(id) {
-  const {wait, execute, timer} = this.status;
+  const { wait, execute, timer } = this.status;
   let idx;
   if ((idx = wait.indexOf(id)) !== -1) wait.splice(idx, 1);
   if ((idx = execute.indexOf(id)) !== -1) execute.splice(idx, 1);