bpmn-elements 6.0.1 → 8.0.1

package/dist/src/events/BoundaryEvent.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = BoundaryEvent;
 exports.BoundaryEventBehaviour = BoundaryEventBehaviour;
+exports.default = BoundaryEvent;
 
 var _Activity = _interopRequireDefault(require("../activity/Activity"));
 
@@ -16,165 +16,201 @@ var _shared = require("../shared");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const kAttachedTags = Symbol.for('attachedConsumers');
+const kCompleteContent = Symbol.for('completeContent');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kExecution = Symbol.for('execution');
+const kShovels = Symbol.for('shovels');
+
 function BoundaryEvent(activityDef, context) {
-  return (0, _Activity.default)(BoundaryEventBehaviour, activityDef, context);
+  return new _Activity.default(BoundaryEventBehaviour, activityDef, context);
 }
 
 function BoundaryEventBehaviour(activity) {
-  const {
-    id,
-    type = 'BoundaryEvent',
-    broker,
-    environment,
-    attachedTo,
-    behaviour = {},
-    eventDefinitions,
-    logger
-  } = activity;
-  const attachedToId = attachedTo.id;
-  const cancelActivity = 'cancelActivity' in behaviour ? behaviour.cancelActivity : true;
-  const eventDefinitionExecution = eventDefinitions && (0, _EventDefinitionExecution.default)(activity, eventDefinitions, 'execute.bound.completed');
-  return {
-    id,
-    type,
-    attachedTo,
-    cancelActivity,
-    execute
-  };
-
-  function execute(executeMessage) {
-    const executeContent = (0, _messageHelper.cloneContent)(executeMessage.content);
-    const {
-      isRootScope,
-      executionId,
-      inbound
-    } = executeContent;
-    let parentExecutionId, completeContent;
-    const errorConsumerTags = [];
-    const shovels = [];
-
-    if (isRootScope) {
-      parentExecutionId = executionId;
-
-      if (eventDefinitionExecution && !environment.settings.strict) {
-        broker.subscribeTmp('execution', 'execute.expect', onExpectMessage, {
-          noAck: true,
-          consumerTag: '_expect-tag'
-        });
-      }
-
-      attachedTo.broker.subscribeTmp('event', 'activity.leave', onAttachedLeave, {
-        noAck: true,
-        consumerTag: `_bound-listener-${parentExecutionId}`,
-        priority: 300
-      });
-      broker.subscribeOnce('execution', 'execute.detach', onDetachMessage, {
-        consumerTag: '_detach-tag'
-      });
-      broker.subscribeOnce('api', `activity.#.${parentExecutionId}`, onApiMessage, {
-        consumerTag: `_api-${parentExecutionId}`
-      });
-      broker.subscribeOnce('execution', 'execute.bound.completed', onCompleted, {
-        consumerTag: `_execution-completed-${parentExecutionId}`
-      });
-    }
+  this.id = activity.id;
+  this.type = activity.type;
+  this.attachedTo = activity.attachedTo;
+  this.activity = activity;
+  this.environment = activity.environment;
+  this.broker = activity.broker;
+  this[kExecution] = activity.eventDefinitions && new _EventDefinitionExecution.default(activity, activity.eventDefinitions, 'execute.bound.completed');
+  this[kShovels] = [];
+  this[kAttachedTags] = [];
+}
 
-    if (eventDefinitionExecution) eventDefinitionExecution.execute(executeMessage);
+const proto = BoundaryEventBehaviour.prototype;
+Object.defineProperty(proto, 'executionId', {
+  get() {
+    const message = this[kExecuteMessage];
+    return message && message.content.executionId;
+  }
 
-    function onCompleted(_, message) {
-      if (!cancelActivity && !message.content.cancelActivity) {
-        stop();
-        return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(message.content));
-      }
+});
+Object.defineProperty(proto, 'cancelActivity', {
+  enumerable: true,
 
-      completeContent = message.content;
-      const attachedToContent = inbound && inbound[0];
-      logger.debug(`<${executionId} (id)> cancel ${attachedTo.status} activity <${attachedToContent.executionId} (${attachedToContent.id})>`);
-      attachedTo.getApi({
-        content: attachedToContent
-      }).discard();
-    }
+  get() {
+    const behaviour = this.activity.behaviour || {};
+    return 'cancelActivity' in behaviour ? behaviour.cancelActivity : true;
+  }
 
-    function onAttachedLeave(routingKey, message) {
-      if (message.content.id !== attachedToId) return;
-      stop();
-      if (!completeContent) return broker.publish('execution', 'execute.discard', executeContent);
-      return broker.publish('execution', 'execute.completed', completeContent);
-    }
+});
 
-    function onExpectMessage(_, message) {
-      const errorConsumerTag = `_bound-error-listener-${message.content.executionId}`;
-      errorConsumerTags.push(errorConsumerTag);
-      attachedTo.broker.subscribeTmp('event', 'activity.error', attachedErrorHandler(message.content.expectRoutingKey), {
-        noAck: true,
-        consumerTag: errorConsumerTag,
-        priority: 300
-      });
-    }
+proto.execute = function execute(executeMessage) {
+  const {
+    isRootScope,
+    executionId
+  } = executeMessage.content;
+  const eventDefinitionExecution = this[kExecution];
 
-    function attachedErrorHandler(routingKey) {
-      return function onAttachedError(_, message) {
-        if (message.content.id !== attachedToId) return;
-        broker.publish('execution', routingKey, (0, _messageHelper.cloneContent)(message.content));
-      };
-    }
+  if (isRootScope) {
+    this[kExecuteMessage] = executeMessage;
+    const broker = this.broker;
 
-    function onDetachMessage(_, {
-      content
-    }) {
-      logger.debug(`<${parentExecutionId} (${id})> detach from activity <${attachedTo.id}>`);
-      stop(true);
-      const {
-        executionId: detachId,
-        bindExchange,
-        sourceExchange = 'execution',
-        sourcePattern
-      } = content;
-      const shovelName = `_detached-${(0, _shared.brokerSafeId)(id)}_${detachId}`;
-      shovels.push(shovelName);
-      attachedTo.broker.createShovel(shovelName, {
-        exchange: sourceExchange,
-        pattern: sourcePattern
-      }, {
-        broker,
-        exchange: bindExchange
-      }, {
-        cloneMessage: _messageHelper.cloneMessage
-      });
-      broker.subscribeOnce('execution', 'execute.bound.completed', onDetachedCompleted, {
-        consumerTag: `_execution-completed-${parentExecutionId}`
+    if (eventDefinitionExecution && !this.environment.settings.strict) {
+      broker.subscribeTmp('execution', 'execute.expect', this._onExpectMessage.bind(this), {
+        noAck: true,
+        consumerTag: '_expect-tag'
       });
     }
 
-    function onDetachedCompleted(_, message) {
-      stop();
-      return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(message.content));
-    }
+    const consumerTag = `_bound-listener-${executionId}`;
+    this.attachedTo.broker.subscribeTmp('event', 'activity.leave', this._onAttachedLeave.bind(this), {
+      noAck: true,
+      consumerTag,
+      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}`
+    });
+  }
 
-    function onApiMessage(_, message) {
-      const messageType = message.properties.type;
+  if (eventDefinitionExecution) {
+    return eventDefinitionExecution.execute(executeMessage);
+  }
+};
 
-      switch (messageType) {
-        case 'discard':
-          stop();
-          break;
+proto._onCompleted = function onCompleted(_, {
+  content
+}) {
+  if (!this.cancelActivity && !content.cancelActivity) {
+    this._stop();
 
-        case 'stop':
-          stop();
-          break;
-      }
-    }
+    return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content));
+  }
 
-    function stop(detach) {
-      attachedTo.broker.cancel(`_bound-listener-${parentExecutionId}`);
-      attachedTo.broker.cancel(`_bound-error-listener-${parentExecutionId}`);
-      errorConsumerTags.splice(0).forEach(tag => attachedTo.broker.cancel(tag));
-      shovels.splice(0).forEach(shovelName => attachedTo.broker.closeShovel(shovelName));
-      broker.cancel('_expect-tag');
-      broker.cancel('_detach-tag');
-      broker.cancel(`_execution-completed-${parentExecutionId}`);
-      if (detach) return;
-      broker.cancel(`_api-${parentExecutionId}`);
-    }
+  this[kCompleteContent] = content;
+  const {
+    inbound
+  } = this[kExecuteMessage].content;
+  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})>`);
+  attachedTo.getApi({
+    content: attachedToContent
+  }).discard();
+};
+
+proto._onAttachedLeave = function onAttachedLeave(_, {
+  content
+}) {
+  if (content.id !== this.attachedTo.id) return;
+
+  this._stop();
+
+  const completeContent = this[kCompleteContent];
+  if (!completeContent) return this.broker.publish('execution', 'execute.discard', this[kExecuteMessage].content);
+  return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(completeContent));
+};
+
+proto._onExpectMessage = function onExpectMessage(_, {
+  content
+}) {
+  const {
+    executionId,
+    expectRoutingKey
+  } = content;
+  const attachedTo = this.attachedTo;
+  const errorConsumerTag = `_bound-error-listener-${executionId}`;
+  this[kAttachedTags].push(errorConsumerTag);
+  attachedTo.broker.subscribeTmp('event', 'activity.error', (__, errorMessage) => {
+    if (errorMessage.content.id !== attachedTo.id) return;
+    this.broker.publish('execution', expectRoutingKey, (0, _messageHelper.cloneContent)(errorMessage.content));
+  }, {
+    noAck: true,
+    consumerTag: errorConsumerTag,
+    priority: 300
+  });
+};
+
+proto._onDetachMessage = function onDetachMessage(_, {
+  content
+}) {
+  const id = this.id,
+        executionId = this.executionId,
+        attachedTo = this.attachedTo;
+  this.activity.logger.debug(`<${executionId} (${id})> detach from activity <${attachedTo.id}>`);
+
+  this._stop(true);
+
+  const {
+    executionId: detachId,
+    bindExchange,
+    sourceExchange,
+    sourcePattern
+  } = content;
+  const shovelName = `_detached-${(0, _shared.brokerSafeId)(id)}_${detachId}`;
+  this[kShovels].push(shovelName);
+  const broker = this.broker;
+  attachedTo.broker.createShovel(shovelName, {
+    exchange: sourceExchange,
+    pattern: sourcePattern
+  }, {
+    broker,
+    exchange: bindExchange
+  }, {
+    cloneMessage: _messageHelper.cloneMessage
+  });
+  broker.subscribeOnce('execution', 'execute.bound.completed', (__, {
+    content: completeContent
+  }) => {
+    this._stop();
+
+    this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(completeContent));
+  }, {
+    consumerTag: `_execution-completed-${executionId}`
+  });
+};
+
+proto._onApiMessage = function onApiMessage(_, message) {
+  switch (message.properties.type) {
+    case 'discard':
+    case 'stop':
+      this._stop();
+
+      break;
   }
-}
+};
+
+proto._stop = function stop(detach) {
+  const attachedTo = this.attachedTo,
+        broker = this.broker,
+        executionId = this.executionId;
+
+  for (const tag of this[kAttachedTags].splice(0)) attachedTo.broker.cancel(tag);
+
+  for (const shovelName of this[kShovels].splice(0)) attachedTo.broker.closeShovel(shovelName);
+
+  broker.cancel('_expect-tag');
+  broker.cancel('_detach-tag');
+  broker.cancel(`_execution-completed-${executionId}`);
+  if (detach) return;
+  broker.cancel(`_api-${executionId}`);
+};

package/dist/src/events/EndEvent.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = EndEvent;
 exports.EndEventBehaviour = EndEventBehaviour;
+exports.default = EndEvent;
 
 var _Activity = _interopRequireDefault(require("../activity/Activity"));
 
@@ -14,32 +14,27 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const kExecution = Symbol.for('execution');
+
 function EndEvent(activityDef, context) {
-  return (0, _Activity.default)(EndEventBehaviour, { ...activityDef,
+  return new _Activity.default(EndEventBehaviour, { ...activityDef,
     isThrowing: true
   }, context);
 }
 
 function EndEventBehaviour(activity) {
-  const {
-    id,
-    type,
-    broker,
-    eventDefinitions
-  } = activity;
-  const eventDefinitionExecution = eventDefinitions && (0, _EventDefinitionExecution.default)(activity, eventDefinitions);
-  const source = {
-    id,
-    type,
-    execute
-  };
-  return source;
-
-  function execute(executeMessage) {
-    if (eventDefinitionExecution) {
-      return eventDefinitionExecution.execute(executeMessage);
-    }
-
-    return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeMessage.content));
+  this.id = activity.id;
+  this.type = activity.type;
+  this.broker = activity.broker;
+  this[kExecution] = activity.eventDefinitions && new _EventDefinitionExecution.default(activity, activity.eventDefinitions);
+}
+
+EndEventBehaviour.prototype.execute = function execute(executeMessage) {
+  const execution = this[kExecution];
+
+  if (execution) {
+    return execution.execute(executeMessage);
   }
-}
+
+  return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeMessage.content));
+};

package/dist/src/events/IntermediateCatchEvent.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = IntermediateCatchEvent;
 exports.IntermediateCatchEventBehaviour = IntermediateCatchEventBehaviour;
+exports.default = IntermediateCatchEvent;
 
 var _Activity = _interopRequireDefault(require("../activity/Activity"));
 
@@ -14,72 +14,58 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const kExecution = Symbol.for('execution');
+
 function IntermediateCatchEvent(activityDef, context) {
-  return (0, _Activity.default)(IntermediateCatchEventBehaviour, activityDef, context);
+  return new _Activity.default(IntermediateCatchEventBehaviour, activityDef, context);
 }
 
 function IntermediateCatchEventBehaviour(activity) {
-  const {
-    id,
-    type,
-    broker,
-    eventDefinitions
-  } = activity;
-  const eventDefinitionExecution = eventDefinitions && (0, _EventDefinitionExecution.default)(activity, eventDefinitions);
-  const source = {
-    id,
-    type,
-    execute
-  };
-  return source;
-
-  function execute(executeMessage) {
-    if (eventDefinitionExecution) {
-      return eventDefinitionExecution.execute(executeMessage);
-    }
-
-    const content = (0, _messageHelper.cloneContent)(executeMessage.content);
-    const {
-      executionId
-    } = content;
-    broker.subscribeTmp('api', `activity.#.${executionId}`, onApiMessage, {
-      noAck: true,
-      consumerTag: `_api-${executionId}`
-    });
-    return broker.publish('event', 'activity.wait', (0, _messageHelper.cloneContent)(content));
+  this.id = activity.id;
+  this.type = activity.type;
+  this.broker = activity.broker;
+  this[kExecution] = activity.eventDefinitions && new _EventDefinitionExecution.default(activity, activity.eventDefinitions);
+}
 
-    function onApiMessage(routingKey, message) {
-      const messageType = message.properties.type;
+IntermediateCatchEventBehaviour.prototype.execute = function execute(executeMessage) {
+  const execution = this[kExecution];
 
-      switch (messageType) {
-        case 'message':
-        case 'signal':
-          {
-            return complete(message.content.message);
-          }
+  if (execution) {
+    return execution.execute(executeMessage);
+  }
 
-        case 'discard':
-          {
-            stop();
-            return broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(content));
-          }
+  const executeContent = executeMessage.content;
+  const executionId = executeContent.executionId;
+  const broker = this.broker;
+  broker.subscribeTmp('api', `activity.#.${executionId}`, this._onApiMessage.bind(this, executeMessage), {
+    noAck: true,
+    consumerTag: '_api-behaviour-execution'
+  });
+  return broker.publish('event', 'activity.wait', (0, _messageHelper.cloneContent)(executeContent));
+};
 
-        case 'stop':
-          {
-            return stop();
-          }
+IntermediateCatchEventBehaviour.prototype._onApiMessage = function onApiMessage(executeMessage, routingKey, message) {
+  switch (message.properties.type) {
+    case 'message':
+    case 'signal':
+      {
+        const broker = this.broker;
+        broker.cancel('_api-behaviour-execution');
+        return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeMessage.content, {
+          output: message.content.message
+        }));
       }
-    }
 
-    function complete(output) {
-      stop();
-      return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(content, {
-        output
-      }));
-    }
+    case 'discard':
+      {
+        const broker = this.broker;
+        broker.cancel('_api-behaviour-execution');
+        return broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(executeMessage.content));
+      }
 
-    function stop() {
-      broker.cancel(`_api-${executionId}`);
-    }
+    case 'stop':
+      {
+        return this.broker.cancel('_api-behaviour-execution');
+      }
   }
-}
+};

package/dist/src/events/IntermediateThrowEvent.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = IntermediateThrowEvent;
 exports.IntermediateThrowEventBehaviour = IntermediateThrowEventBehaviour;
+exports.default = IntermediateThrowEvent;
 
 var _Activity = _interopRequireDefault(require("../activity/Activity"));
 
@@ -14,32 +14,27 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const kExecution = Symbol.for('execution');
+
 function IntermediateThrowEvent(activityDef, context) {
-  return (0, _Activity.default)(IntermediateThrowEventBehaviour, { ...activityDef,
+  return new _Activity.default(IntermediateThrowEventBehaviour, { ...activityDef,
     isThrowing: true
   }, context);
 }
 
 function IntermediateThrowEventBehaviour(activity) {
-  const {
-    id,
-    type,
-    broker,
-    eventDefinitions
-  } = activity;
-  const eventDefinitionExecution = eventDefinitions && (0, _EventDefinitionExecution.default)(activity, eventDefinitions);
-  const source = {
-    id,
-    type,
-    execute
-  };
-  return source;
-
-  function execute(executeMessage) {
-    if (eventDefinitionExecution) {
-      return eventDefinitionExecution.execute(executeMessage);
-    }
-
-    return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeMessage.content));
+  this.id = activity.id;
+  this.type = activity.type;
+  this.broker = activity.broker;
+  this[kExecution] = activity.eventDefinitions && new _EventDefinitionExecution.default(activity, activity.eventDefinitions);
+}
+
+IntermediateThrowEventBehaviour.prototype.execute = function execute(executeMessage) {
+  const execution = this[kExecution];
+
+  if (execution) {
+    return execution.execute(executeMessage);
   }
-}
+
+  return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeMessage.content));
+};