bpmn-elements 6.0.0 → 8.0.0

package/dist/src/tasks/ReceiveTask.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = ReceiveTask;
 exports.ReceiveTaskBehaviour = ReceiveTaskBehaviour;
+exports.default = ReceiveTask;
 
 var _Activity = _interopRequireDefault(require("../activity/Activity"));
 
@@ -12,8 +12,13 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const kCompleted = Symbol.for('completed');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kReferenceElement = Symbol.for('referenceElement');
+const kReferenceInfo = Symbol.for('referenceInfo');
+
 function ReceiveTask(activityDef, context) {
-  const task = (0, _Activity.default)(ReceiveTaskBehaviour, activityDef, context);
+  const task = new _Activity.default(ReceiveTaskBehaviour, activityDef, context);
   task.broker.assertQueue('message', {
     autoDelete: false,
     durable: true
@@ -28,205 +33,251 @@ function ReceiveTaskBehaviour(activity) {
   const {
     id,
     type,
-    broker,
-    logger,
-    behaviour = {},
-    getActivityById
+    behaviour
   } = activity;
-  const reference = behaviour.messageRef || {
-    name: 'anonymous'
+  this.id = id;
+  this.type = type;
+  const reference = this.reference = {
+    name: 'anonymous',
+    ...behaviour.messageRef,
+    referenceType: 'message'
   };
-  const referenceElement = reference.id && getActivityById(reference.id);
-  const loopCharacteristics = behaviour.loopCharacteristics && behaviour.loopCharacteristics.Behaviour(activity, behaviour.loopCharacteristics);
-  const source = {
-    id,
-    type,
-    reference: { ...reference,
-      referenceType: 'message'
-    },
-    execute
-  };
-  return source;
+  this.loopCharacteristics = behaviour.loopCharacteristics && new behaviour.loopCharacteristics.Behaviour(activity, behaviour.loopCharacteristics);
+  this.activity = activity;
+  this.broker = activity.broker;
+  this[kReferenceElement] = reference.id && activity.getActivityById(reference.id);
+}
 
-  function execute(executeMessage) {
-    const content = executeMessage.content;
-    const {
-      executionId
-    } = content;
-    if (content.isRootScope) setupMessageHandling(executionId);
+ReceiveTaskBehaviour.prototype.execute = function execute(executeMessage) {
+  return new ReceiveTaskExecution(this).execute(executeMessage);
+};
 
-    if (loopCharacteristics && content.isRootScope) {
-      return loopCharacteristics.execute(executeMessage);
-    }
+function ReceiveTaskExecution(parent) {
+  const {
+    activity,
+    broker,
+    loopCharacteristics,
+    reference
+  } = parent;
+  this.id = activity.id;
+  this.logger = activity.logger;
+  this.reference = reference;
+  this.broker = broker;
+  this.loopCharacteristics = loopCharacteristics;
+  this.referenceElement = parent[kReferenceElement];
+  this[kCompleted] = false;
+}
 
-    let completed;
-    const {
-      message: referenceMessage,
-      description
-    } = resolveReference(executeMessage);
-    broker.consume('message', onCatchMessage, {
-      noAck: true,
-      consumerTag: `_onmessage-${executionId}`
-    });
-    if (completed) return;
-    broker.subscribeTmp('api', `activity.#.${executionId}`, onApiMessage, {
-      noAck: true,
-      consumerTag: `_api-${executionId}`,
-      priority: 400
-    });
-    logger.debug(`<${executionId} (${id})> expect ${description}`);
-    broker.publish('event', 'activity.wait', (0, _messageHelper.cloneContent)(content, {
-      message: { ...referenceMessage
-      }
-    }));
-
-    function onCatchMessage(routingKey, message) {
-      const {
-        content: delegateContent
-      } = message;
-      const {
-        id: signalId,
-        executionId: signalExecutionId
-      } = delegateContent.message || {};
-
-      if (!referenceMessage.id && signalId || signalExecutionId) {
-        if (loopCharacteristics && signalExecutionId !== executionId) return;
-        if (signalId !== id && signalExecutionId !== executionId) return;
-        logger.debug(`<${executionId} (${id})> caught direct message`);
-      } else if (referenceMessage.id !== signalId) return;else {
-        logger.debug(`<${executionId} (${id})> caught ${description}`);
-      }
+const proto = ReceiveTaskExecution.prototype;
 
-      const {
-        type: messageType,
-        correlationId
-      } = message.properties;
-      broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(content, {
-        message: { ...message.content.message
-        }
-      }), {
-        correlationId,
-        type: messageType
-      });
-      broker.publish('event', 'activity.catch', (0, _messageHelper.cloneContent)(content, {
-        message: message.content.message
-      }), {
-        type: 'catch',
-        correlationId
-      });
-      complete(message.content.message, {
-        correlationId
-      });
-    }
+proto.execute = function execute(executeMessage) {
+  this[kExecuteMessage] = executeMessage;
+  const executeContent = executeMessage.content;
+  const {
+    executionId,
+    isRootScope
+  } = executeContent;
+  this.executionId = executionId;
 
-    function onApiMessage(routingKey, message) {
-      const {
-        type: messageType,
-        correlationId
-      } = message.properties;
-
-      switch (messageType) {
-        case 'message':
-        case 'signal':
-          {
-            return complete(message.content.message, {
-              correlationId
-            });
-          }
-
-        case 'discard':
-          {
-            completed = true;
-            stop();
-            return broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(content), {
-              correlationId
-            });
-          }
-
-        case 'stop':
-          {
-            return stop();
-          }
-      }
-    }
+  const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
 
-    function complete(output, options) {
-      completed = true;
-      stop();
-      return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content, {
-        output
-      }), options);
-    }
+  if (isRootScope) {
+    this._setupMessageHandling(executionId);
+  }
 
-    function stop() {
-      broker.cancel(`_onmessage-${executionId}`);
-      broker.cancel(`_api-${executionId}`);
-    }
+  const loopCharacteristics = this.loopCharacteristics;
+
+  if (loopCharacteristics && executeMessage.content.isRootScope) {
+    return loopCharacteristics.execute(executeMessage);
   }
 
-  function setupMessageHandling(executionId) {
-    broker.subscribeTmp('api', '#.signal.*', onDelegateMessage, {
-      noAck: true,
-      consumerTag: `_api-delegated-${executionId}`
-    }, {
-      noAck: true
-    });
-    broker.subscribeTmp('api', `activity.stop.${executionId}`, onStopApiMessage, {
-      noAck: true,
-      consumerTag: `_api-stop-${executionId}`,
-      priority: 400
-    });
-    broker.subscribeTmp('execution', 'execute.#', onComplete, {
-      noAck: true,
-      consumerTag: `_execution-complete-${executionId}`
-    }, {
-      noAck: true
-    });
-
-    function onDelegateMessage(_, message) {
-      if (!message.properties.delegate) return;
-      broker.sendToQueue('message', message.content, message.properties);
+  const broker = this.broker;
+  broker.consume('message', this._onCatchMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_onmessage-${executionId}`
+  });
+  if (this[kCompleted]) return;
+  broker.subscribeTmp('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-${executionId}`,
+    priority: 400
+  });
+
+  this._debug(`expect ${info.description}`);
+
+  broker.publish('event', 'activity.wait', (0, _messageHelper.cloneContent)(executeContent, {
+    message: { ...info.message
     }
+  }));
+};
+
+proto._onCatchMessage = function onCatchMessage(routingKey, message) {
+  const content = message.content;
+  const {
+    id: signalId,
+    executionId: signalExecutionId
+  } = content.message || {};
+  const {
+    message: referenceMessage,
+    description
+  } = this[kReferenceInfo];
 
-    function onStopApiMessage() {
-      stop(true);
+  if (!referenceMessage.id && signalId || signalExecutionId) {
+    if (this.loopCharacteristics && signalExecutionId !== this.executionId) return;
+    if (signalId !== this.id && signalExecutionId !== this.executionId) return;
+
+    this._debug('caught direct message');
+  } else if (referenceMessage.id !== signalId) return;else {
+    this._debug(`caught ${description}`);
+  }
+
+  const {
+    type: messageType,
+    correlationId
+  } = message.properties;
+  const broker = this.broker;
+  const executeContent = this[kExecuteMessage].content;
+  broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(executeContent, {
+    message: { ...message.content.message
     }
+  }), {
+    correlationId,
+    type: messageType
+  });
+  broker.publish('event', 'activity.catch', (0, _messageHelper.cloneContent)(executeContent, {
+    message: message.content.message
+  }), {
+    type: 'catch',
+    correlationId
+  });
+
+  this._complete(message.content.message, {
+    correlationId
+  });
+};
 
-    function onComplete(routingKey, {
-      content
-    }) {
-      if (!content.isRootScope) return;
-
-      switch (routingKey) {
-        case 'execute.completed':
-        case 'execute.error':
-        case 'execute.discard':
-          stop();
-          break;
+proto._onApiMessage = function onApiMessage(routingKey, message) {
+  const {
+    type: messageType,
+    correlationId
+  } = message.properties;
+
+  switch (messageType) {
+    case 'message':
+    case 'signal':
+      {
+        return this._complete(message.content.message, {
+          correlationId
+        });
       }
-    }
 
-    function stop(keepMessageQ) {
-      broker.cancel(`_api-delegated-${executionId}`);
-      broker.cancel(`_api-stop-${executionId}`);
-      broker.cancel(`_execution-complete-${executionId}`);
-      if (!keepMessageQ) broker.purgeQueue('message');
-    }
+    case 'discard':
+      {
+        this[kCompleted] = true;
+
+        this._stop();
+
+        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content), {
+          correlationId
+        });
+      }
+
+    case 'stop':
+      {
+        return this._stop();
+      }
   }
+};
 
-  function resolveReference(message) {
-    if (!referenceElement) {
-      return {
-        message: { ...reference
-        },
-        description: 'anonymous message'
-      };
-    }
+proto._complete = function complete(output, options) {
+  this[kCompleted] = true;
+
+  this._stop();
+
+  return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content, {
+    output
+  }), options);
+};
 
-    const result = {
-      message: referenceElement.resolve(message)
+proto._stop = function stop() {
+  const broker = this.broker,
+        executionId = this.executionId;
+  broker.cancel(`_onmessage-${executionId}`);
+  broker.cancel(`_api-${executionId}`);
+};
+
+proto._setupMessageHandling = function setupMessageHandling(executionId) {
+  const broker = this.broker;
+  broker.subscribeTmp('api', '#.signal.*', this._onDelegateMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-delegated-${executionId}`
+  }, {
+    noAck: true
+  });
+  broker.subscribeTmp('api', `activity.stop.${executionId}`, this._onStopApiMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-stop-${executionId}`,
+    priority: 400
+  });
+  broker.subscribeTmp('execution', 'execute.#', this._onExecutionComplete.bind(this), {
+    noAck: true,
+    consumerTag: `_execution-complete-${executionId}`
+  }, {
+    noAck: true
+  });
+};
+
+proto._onDelegateMessage = function onDelegateMessage(_, message) {
+  if (!message.properties.delegate) return;
+  this.broker.sendToQueue('message', message.content, message.properties);
+};
+
+proto._onStopApiMessage = function onStopApiMessage() {
+  this._stopMessageHandling(true);
+};
+
+proto._onExecutionComplete = function onExecutionComplete(routingKey, {
+  content
+}) {
+  if (!content.isRootScope) return;
+
+  switch (routingKey) {
+    case 'execute.completed':
+    case 'execute.error':
+    case 'execute.discard':
+      this._stopMessageHandling();
+
+      break;
+  }
+};
+
+proto._stopMessageHandling = function stop(keepMessageQ) {
+  const broker = this.broker,
+        executionId = this.executionId;
+  broker.cancel(`_api-delegated-${executionId}`);
+  broker.cancel(`_api-stop-${executionId}`);
+  broker.cancel(`_execution-complete-${executionId}`);
+  if (!keepMessageQ) broker.purgeQueue('message');
+};
+
+proto._getReferenceInfo = function getReferenceInfo(message) {
+  const referenceElement = this.referenceElement;
+
+  if (!referenceElement) {
+    return {
+      message: { ...this.reference
+      },
+      description: 'anonymous message'
     };
-    result.description = `${result.message.name} <${result.message.id}>`;
-    return result;
   }
-}
+
+  const result = {
+    message: referenceElement.resolve(message)
+  };
+  result.description = `${result.message.name} <${result.message.id}>`;
+  return result;
+};
+
+proto._debug = function debug(msg) {
+  this.logger.debug(`<${this.executionId} (${this.id})> ${msg}`);
+};

package/dist/src/tasks/ScriptTask.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = ScriptTask;
 exports.ScriptTaskBehaviour = ScriptTaskBehaviour;
+exports.default = ScriptTask;
 
 var _Activity = _interopRequireDefault(require("../activity/Activity"));
 
@@ -17,60 +17,54 @@ var _messageHelper = require("../messageHelper");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ScriptTask(activityDef, context) {
-  return (0, _Activity.default)(ScriptTaskBehaviour, activityDef, context);
+  return new _Activity.default(ScriptTaskBehaviour, activityDef, context);
 }
 
 function ScriptTaskBehaviour(activity) {
   const {
     id,
     type,
-    behaviour,
-    broker,
-    logger,
-    environment,
-    emitFatal
+    behaviour
   } = activity;
-  const {
-    scriptFormat
-  } = activity.behaviour;
-  const loopCharacteristics = behaviour.loopCharacteristics && behaviour.loopCharacteristics.Behaviour(activity, behaviour.loopCharacteristics);
+  this.id = id;
+  this.type = type;
+  this.scriptFormat = behaviour.scriptFormat;
+  this.loopCharacteristics = behaviour.loopCharacteristics && new behaviour.loopCharacteristics.Behaviour(activity, behaviour.loopCharacteristics);
+  this.activity = activity;
+  const environment = this.environment = activity.environment;
   environment.registerScript(activity);
-  const source = {
-    id,
-    type,
-    loopCharacteristics,
-    execute
-  };
-  return source;
-
-  function execute(executeMessage) {
-    const content = executeMessage.content;
+}
 
-    if (loopCharacteristics && content.isRootScope) {
-      return loopCharacteristics.execute(executeMessage);
-    }
+ScriptTaskBehaviour.prototype.execute = function execute(executeMessage) {
+  const executeContent = executeMessage.content;
+  const loopCharacteristics = this.loopCharacteristics;
 
-    const script = environment.getScript(scriptFormat, activity, (0, _messageHelper.cloneMessage)(executeMessage));
+  if (loopCharacteristics && executeContent.isRootScope) {
+    return loopCharacteristics.execute(executeMessage);
+  }
 
-    if (!script) {
-      return emitFatal(new _Errors.ActivityError(`Script format ${scriptFormat} is unsupported or was not registered for <${activity.id}>`, executeMessage), content);
-    }
+  const activity = this.activity,
+        scriptFormat = this.scriptFormat;
+  const script = this.environment.getScript(scriptFormat, activity, (0, _messageHelper.cloneMessage)(executeMessage));
 
-    return script.execute((0, _ExecutionScope.default)(activity, executeMessage), scriptCallback);
+  if (!script) {
+    return activity.emitFatal(new _Errors.ActivityError(`Script format ${scriptFormat} is unsupported or was not registered for <${activity.id}>`, executeMessage), executeContent);
+  }
 
-    function scriptCallback(err, output) {
-      if (err) {
-        logger.error(`<${content.executionId} (${id})>`, err);
-        return broker.publish('execution', 'execute.error', (0, _messageHelper.cloneContent)(content, {
-          error: new _Errors.ActivityError(err.message, executeMessage, err)
-        }, {
-          mandatory: true
-        }));
-      }
+  return script.execute((0, _ExecutionScope.default)(activity, executeMessage), scriptCallback);
 
-      return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content, {
-        output
+  function scriptCallback(err, output) {
+    if (err) {
+      activity.logger.error(`<${executeContent.executionId} (${activity.id})>`, err);
+      return activity.broker.publish('execution', 'execute.error', (0, _messageHelper.cloneContent)(executeContent, {
+        error: new _Errors.ActivityError(err.message, executeMessage, err)
+      }, {
+        mandatory: true
       }));
     }
+
+    return activity.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeContent, {
+      output
+    }));
   }
-}
+};

package/dist/src/tasks/ServiceImplementation.js

@@ -10,24 +10,17 @@ var _ExecutionScope = _interopRequireDefault(require("../activity/ExecutionScope
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function ServiceImplementation(activity) {
-  const {
-    type: atype,
-    behaviour,
-    environment
-  } = activity;
-  const implementation = behaviour.implementation;
-  const type = `${atype}:implementation`;
-  return {
-    type,
-    implementation,
-    execute
-  };
+  this.type = `${activity.type}:implementation`;
+  this.implementation = activity.behaviour.implementation;
+  this.activity = activity;
+}
 
-  function execute(executionMessage, callback) {
-    const serviceFn = environment.resolveExpression(implementation, executionMessage);
-    if (typeof serviceFn !== 'function') return callback(new Error(`Implementation ${implementation} did not resolve to a function`));
-    serviceFn.call(activity, (0, _ExecutionScope.default)(activity, executionMessage), (err, ...args) => {
-      callback(err, args);
-    });
-  }
-}
+ServiceImplementation.prototype.execute = function execute(executionMessage, callback) {
+  const activity = this.activity;
+  const implementation = this.implementation;
+  const serviceFn = activity.environment.resolveExpression(implementation, executionMessage);
+  if (typeof serviceFn !== 'function') return callback(new Error(`Implementation ${implementation} did not resolve to a function`));
+  serviceFn.call(activity, (0, _ExecutionScope.default)(activity, executionMessage), (err, ...args) => {
+    callback(err, args);
+  });
+};