bpmn-elements 7.0.0 → 8.1.0

package/dist/src/eventDefinitions/MessageEventDefinition.js

@@ -13,11 +13,11 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const completedSymbol = Symbol.for('completed');
-const messageQSymbol = Symbol.for('messageQ');
-const executeMessageSymbol = Symbol.for('executeMessage');
-const referenceElementSymbol = Symbol.for('referenceElement');
-const referenceInfoSymbol = Symbol.for('referenceInfo');
+const kCompleted = Symbol.for('completed');
+const kMessageQ = Symbol.for('messageQ');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kReferenceElement = Symbol.for('referenceElement');
+const kReferenceInfo = Symbol.for('referenceInfo');
 
 function MessageEventDefinition(activity, eventDefinition) {
   const {
@@ -41,13 +41,13 @@ function MessageEventDefinition(activity, eventDefinition) {
   this.activity = activity;
   this.broker = broker;
   this.logger = environment.Logger(type.toLowerCase());
-  const referenceElement = this[referenceElementSymbol] = reference.id && activity.getActivityById(reference.id);
+  const referenceElement = this[kReferenceElement] = reference.id && activity.getActivityById(reference.id);
 
   if (!isThrowing) {
-    this[completedSymbol] = false;
+    this[kCompleted] = false;
     const referenceId = referenceElement ? referenceElement.id : 'anonymous';
     const messageQueueName = `${reference.referenceType}-${(0, _shared.brokerSafeId)(id)}-${(0, _shared.brokerSafeId)(referenceId)}-q`;
-    this[messageQSymbol] = broker.assertQueue(messageQueueName, {
+    this[kMessageQ] = broker.assertQueue(messageQueueName, {
       autoDelete: false,
       durable: true
     });
@@ -60,7 +60,7 @@ function MessageEventDefinition(activity, eventDefinition) {
 const proto = MessageEventDefinition.prototype;
 Object.defineProperty(proto, 'executionId', {
   get() {
-    const message = this[executeMessageSymbol];
+    const message = this[kExecuteMessage];
     return message && message.content.executionId;
   }
 
@@ -71,8 +71,8 @@ proto.execute = function execute(executeMessage) {
 };
 
 proto.executeCatch = function executeCatch(executeMessage) {
-  this[executeMessageSymbol] = executeMessage;
-  this[completedSymbol] = false;
+  this[kExecuteMessage] = executeMessage;
+  this[kCompleted] = false;
   const executeContent = executeMessage.content;
   const {
     executionId,
@@ -80,7 +80,7 @@ proto.executeCatch = function executeCatch(executeMessage) {
   } = executeContent;
   const parentExecutionId = parent && parent.executionId;
 
-  const info = this[referenceInfoSymbol] = this._getReferenceInfo(executeMessage);
+  const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
 
   this._debug(`expect ${info.description}`);
 
@@ -88,11 +88,11 @@ proto.executeCatch = function executeCatch(executeMessage) {
 
   const onCatchMessage = this._onCatchMessage.bind(this);
 
-  this[messageQSymbol].consume(onCatchMessage, {
+  this[kMessageQ].consume(onCatchMessage, {
     noAck: true,
     consumerTag: `_api-message-${executionId}`
   });
-  if (this[completedSymbol]) return;
+  if (this[kCompleted]) return;
 
   const onApiMessage = this._onApiMessage.bind(this);
 
@@ -146,12 +146,12 @@ proto.executeThrow = function executeThrow(executeMessage) {
 };
 
 proto._onCatchMessage = function onCatchMessage(routingKey, message) {
-  if ((0, _getPropertyValue.default)(message, 'content.message.id') !== this[referenceInfoSymbol].message.id) return;
+  if ((0, _getPropertyValue.default)(message, 'content.message.id') !== this[kReferenceInfo].message.id) return;
   const {
     type,
     correlationId
   } = message.properties;
-  this.broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content, {
+  this.broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content, {
     message: { ...message.content.message
     }
   }), {
@@ -181,11 +181,11 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 
     case 'discard':
       {
-        this[completedSymbol] = true;
+        this[kCompleted] = true;
 
         this._stop();
 
-        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content), {
+        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content), {
           correlationId
         });
       }
@@ -198,14 +198,14 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 };
 
 proto._complete = function complete(verb, output, options) {
-  this[completedSymbol] = true;
+  this[kCompleted] = true;
 
   this._stop();
 
-  this._debug(`${verb} ${this[referenceInfoSymbol].description}`);
+  this._debug(`${verb} ${this[kReferenceInfo].description}`);
 
   const broker = this.broker;
-  const executeContent = this[executeMessageSymbol].content;
+  const executeContent = this[kExecuteMessage].content;
   const catchContent = (0, _messageHelper.cloneContent)(executeContent, {
     message: { ...output
     },
@@ -228,11 +228,11 @@ proto._stop = function stop() {
   broker.cancel(`_api-${executionId}`);
   broker.cancel(`_api-parent-${executionId}`);
   broker.cancel(`_api-delegated-${executionId}`);
-  this[messageQSymbol].purge();
+  this[kMessageQ].purge();
 };
 
 proto._getReferenceInfo = function getReferenceInfo(message) {
-  const referenceElement = this[referenceElementSymbol];
+  const referenceElement = this[kReferenceElement];
 
   if (!referenceElement) {
     return {

package/dist/src/eventDefinitions/SignalEventDefinition.js

@@ -13,11 +13,11 @@ var _messageHelper = require("../messageHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const completedSymbol = Symbol.for('completed');
-const messageQSymbol = Symbol.for('messageQ');
-const executeMessageSymbol = Symbol.for('executeMessage');
-const referenceElementSymbol = Symbol.for('referenceElement');
-const referenceInfoSymbol = Symbol.for('referenceInfo');
+const kCompleted = Symbol.for('completed');
+const kMessageQ = Symbol.for('messageQ');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kReferenceElement = Symbol.for('referenceElement');
+const kReferenceInfo = Symbol.for('referenceInfo');
 
 function SignalEventDefinition(activity, eventDefinition) {
   const {
@@ -42,13 +42,13 @@ function SignalEventDefinition(activity, eventDefinition) {
   this.activity = activity;
   this.broker = broker;
   this.logger = environment.Logger(type.toLowerCase());
-  const referenceElement = this[referenceElementSymbol] = reference.id && activity.getActivityById(reference.id);
+  const referenceElement = this[kReferenceElement] = reference.id && activity.getActivityById(reference.id);
 
   if (!isThrowing && isStart) {
-    this[completedSymbol] = false;
+    this[kCompleted] = false;
     const referenceId = referenceElement ? referenceElement.id : 'anonymous';
     const messageQueueName = `${reference.referenceType}-${(0, _shared.brokerSafeId)(id)}-${(0, _shared.brokerSafeId)(referenceId)}-q`;
-    this[messageQSymbol] = broker.assertQueue(messageQueueName, {
+    this[kMessageQ] = broker.assertQueue(messageQueueName, {
       autoDelete: false,
       durable: true
     });
@@ -61,7 +61,7 @@ function SignalEventDefinition(activity, eventDefinition) {
 const proto = SignalEventDefinition.prototype;
 Object.defineProperty(proto, 'executionId', {
   get() {
-    const message = this[executeMessageSymbol];
+    const message = this[kExecuteMessage];
     return message && message.content.executionId;
   }
 
@@ -72,8 +72,8 @@ proto.execute = function execute(executeMessage) {
 };
 
 proto.executeCatch = function executeCatch(executeMessage) {
-  this[executeMessageSymbol] = executeMessage;
-  this[completedSymbol] = false;
+  this[kExecuteMessage] = executeMessage;
+  this[kCompleted] = false;
   const executeContent = executeMessage.content;
   const {
     executionId,
@@ -81,18 +81,18 @@ proto.executeCatch = function executeCatch(executeMessage) {
   } = executeContent;
   const parentExecutionId = parent && parent.executionId;
 
-  const info = this[referenceInfoSymbol] = this._getReferenceInfo(executeMessage);
+  const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
 
   const broker = this.broker;
 
   const onCatchMessage = this._onCatchMessage.bind(this);
 
   if (this.activity.isStart) {
-    this[messageQSymbol].consume(onCatchMessage, {
+    this[kMessageQ].consume(onCatchMessage, {
       noAck: true,
       consumerTag: `_api-signal-${executionId}`
     });
-    if (this[completedSymbol]) return;
+    if (this[kCompleted]) return;
   }
 
   const onApiMessage = this._onApiMessage.bind(this);
@@ -147,9 +147,9 @@ proto.executeThrow = function executeThrow(executeMessage) {
 };
 
 proto._onCatchMessage = function onCatchMessage(routingKey, message) {
-  const info = this[referenceInfoSymbol];
+  const info = this[kReferenceInfo];
   if ((0, _getPropertyValue.default)(message, 'content.message.id') !== info.message.id) return;
-  this[completedSymbol] = true;
+  this[kCompleted] = true;
 
   this._stop();
 
@@ -157,7 +157,7 @@ proto._onCatchMessage = function onCatchMessage(routingKey, message) {
     type,
     correlationId
   } = message.properties;
-  this.broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content, {
+  this.broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content, {
     message: { ...message.content.message
     }
   }), {
@@ -183,11 +183,11 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 
     case 'discard':
       {
-        this[completedSymbol] = true;
+        this[kCompleted] = true;
 
         this._stop();
 
-        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content), {
+        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content), {
           correlationId
         });
       }
@@ -202,13 +202,13 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 };
 
 proto._complete = function complete(output, options) {
-  this[completedSymbol] = true;
+  this[kCompleted] = true;
 
   this._stop();
 
-  this._debug(`signaled with ${this[referenceInfoSymbol].description}`);
+  this._debug(`signaled with ${this[kReferenceInfo].description}`);
 
-  return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(this[executeMessageSymbol].content, {
+  return this.broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(this[kExecuteMessage].content, {
     output,
     state: 'signal'
   }), options);
@@ -221,11 +221,11 @@ proto._stop = function stop() {
   broker.cancel(`_api-parent-${executionId}`);
   broker.cancel(`_api-${executionId}`);
   broker.cancel(`_api-delegated-${executionId}`);
-  if (this.activity.isStart) this[messageQSymbol].purge();
+  if (this.activity.isStart) this[kMessageQ].purge();
 };
 
 proto._getReferenceInfo = function getReferenceInfo(message) {
-  const referenceElement = this[referenceElementSymbol];
+  const referenceElement = this[kReferenceElement];
 
   if (!referenceElement) {
     return {

package/dist/src/eventDefinitions/TimerEventDefinition.js

@@ -9,9 +9,10 @@ var _messageHelper = require("../messageHelper");
 
 var _iso8601Duration = require("iso8601-duration");
 
-const stoppedSymbol = Symbol.for('stopped');
-const timerContentSymbol = Symbol.for('timerContent');
-const timerSymbol = Symbol.for('timer');
+const kStopped = Symbol.for('stopped');
+const kTimerContent = Symbol.for('timerContent');
+const kTimer = Symbol.for('timer');
+const repeatPattern = /^\s*R(\d+)\//;
 
 function TimerEventDefinition(activity, eventDefinition) {
   const type = this.type = eventDefinition.type || 'TimerEventDefinition';
@@ -28,14 +29,14 @@ function TimerEventDefinition(activity, eventDefinition) {
   if (timeDate) this.timeDate = timeDate;
   this.broker = activity.broker;
   this.logger = environment.Logger(type.toLowerCase());
-  this[stoppedSymbol] = false;
-  this[timerSymbol] = null;
+  this[kStopped] = false;
+  this[kTimer] = null;
 }
 
 const proto = TimerEventDefinition.prototype;
 Object.defineProperty(proto, 'executionId', {
   get() {
-    const content = this[timerContentSymbol];
+    const content = this[kTimerContent];
     return content && content.executionId;
   }
 
@@ -44,7 +45,7 @@ Object.defineProperty(proto, 'stopped', {
   enumerable: true,
 
   get() {
-    return this[stoppedSymbol];
+    return this[kStopped];
   }
 
 });
@@ -52,7 +53,7 @@ Object.defineProperty(proto, 'timer', {
   enumerable: true,
 
   get() {
-    return this[timerSymbol];
+    return this[kTimer];
   }
 
 });
@@ -62,24 +63,24 @@ proto.execute = function execute(executeMessage) {
     routingKey: executeKey,
     redelivered: isResumed
   } = executeMessage.fields;
-  const timer = this[timerSymbol];
+  const timer = this[kTimer];
 
   if (timer && executeKey === 'execute.timer') {
     return;
   }
 
-  if (timer) this[timerSymbol] = this.environment.timers.clearTimeout(timer);
-  this[stoppedSymbol] = false;
+  if (timer) this[kTimer] = this.environment.timers.clearTimeout(timer);
+  this[kStopped] = false;
   const content = executeMessage.content;
   const executionId = content.executionId;
   const startedAt = this.startedAt = 'startedAt' in content ? new Date(content.startedAt) : new Date();
 
   const resolvedTimer = this._getTimers(executeMessage);
 
-  const timerContent = this[timerContentSymbol] = (0, _messageHelper.cloneContent)(content, { ...resolvedTimer,
-    ...(isResumed ? {
+  const timerContent = this[kTimerContent] = (0, _messageHelper.cloneContent)(content, { ...resolvedTimer,
+    ...(isResumed && {
       isResumed
-    } : undefined),
+    }),
     startedAt,
     state: 'timer'
   });
@@ -99,7 +100,7 @@ proto.execute = function execute(executeMessage) {
   if (timerContent.timeout === undefined) return this._debug(`waiting for ${timerContent.timerType || 'signal'}`);
   if (timerContent.timeout <= 0) return this._completed();
   const timers = this.environment.timers.register(timerContent);
-  this[timerSymbol] = timers.setTimeout(this._completed.bind(this), timerContent.timeout, {
+  this[kTimer] = timers.setTimeout(this._completed.bind(this), timerContent.timeout, {
     id: content.id,
     type: this.type,
     executionId,
@@ -108,8 +109,8 @@ proto.execute = function execute(executeMessage) {
 };
 
 proto.stop = function stopTimer() {
-  const timer = this[timerSymbol];
-  if (timer) this[timerSymbol] = this.environment.timers.clearTimeout(timer);
+  const timer = this[kTimer];
+  if (timer) this[kTimer] = this.environment.timers.clearTimeout(timer);
 };
 
 proto._completed = function completed(completeContent, options) {
@@ -120,7 +121,7 @@ proto._completed = function completed(completeContent, options) {
 
   this._debug(`completed in ${runningTime}ms`);
 
-  const timerContent = this[timerContentSymbol];
+  const timerContent = this[kTimerContent];
   const content = {
     stoppedAt,
     runningTime,
@@ -129,6 +130,14 @@ proto._completed = function completed(completeContent, options) {
   };
   const broker = this.broker;
   broker.publish('event', 'activity.timeout', (0, _messageHelper.cloneContent)(timerContent, content), options);
+
+  if (timerContent.repeat > 1) {
+    const repeat = timerContent.repeat - 1;
+    broker.publish('execution', 'execute.repeat', (0, _messageHelper.cloneContent)(timerContent, { ...content,
+      repeat
+    }), options);
+  }
+
   broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(timerContent, content), options);
 };
 
@@ -148,7 +157,7 @@ proto._onDelegatedApiMessage = function onDelegatedApiMessage(routingKey, messag
     type,
     correlationId
   } = message.properties;
-  this.broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(this[timerContentSymbol], {
+  this.broker.publish('event', 'activity.consumed', (0, _messageHelper.cloneContent)(this[kTimerContent], {
     message: { ...content.message
     }
   }), {
@@ -171,9 +180,9 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 
         return this._completed({
           state: 'cancel',
-          ...(message.content.message ? {
+          ...(message.content.message && {
             message: message.content.message
-          } : undefined)
+          })
         }, {
           correlationId
         });
@@ -192,7 +201,7 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 
         this._debug('discarded');
 
-        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[timerContentSymbol], {
+        return this.broker.publish('execution', 'execute.discard', (0, _messageHelper.cloneContent)(this[kTimerContent], {
           state: 'discard'
         }), {
           correlationId
@@ -202,9 +211,9 @@ proto._onApiMessage = function onApiMessage(routingKey, message) {
 };
 
 proto._stop = function stop() {
-  this[stoppedSymbol] = true;
-  const timer = this[timerSymbol];
-  if (timer) this[timerSymbol] = this.environment.timers.clearTimeout(timer);
+  this[kStopped] = true;
+  const timer = this[kTimer];
+  if (timer) this[kTimer] = this.environment.timers.clearTimeout(timer);
   const broker = this.broker;
   broker.cancel(`_api-${this.executionId}`);
   broker.cancel(`_api-delegated-${this.executionId}`);
@@ -213,39 +222,48 @@ proto._stop = function stop() {
 proto._getTimers = function getTimers(executeMessage) {
   const content = executeMessage.content;
   const now = Date.now();
-  const result = { ...('expireAt' in content ? {
+  const result = { ...('expireAt' in content && {
       expireAt: new Date(content.expireAt)
-    } : undefined)
+    })
   };
 
   for (const t of ['timeDuration', 'timeDate', 'timeCycle']) {
     if (t in content) result[t] = content[t];else if (t in this) result[t] = this.environment.resolveExpression(this[t], executeMessage);else continue;
-    let expireAtDate;
-
-    if (t === 'timeDuration') {
-      const durationStr = result[t];
-
-      if (durationStr) {
-        const delay = this._getDurationInMilliseconds(durationStr);
-
-        if (delay !== undefined) expireAtDate = new Date(now + delay);
-      } else {
-        expireAtDate = new Date(now);
-      }
-    } else if (t === 'timeDate') {
-      const dateStr = result[t];
-
-      if (dateStr) {
-        const ms = Date.parse(dateStr);
-
-        if (!isNaN(ms)) {
-          expireAtDate = new Date(ms);
-        } else {
-          this._warn(`invalid timeDate >${dateStr}<`);
-        }
-      } else {
-        expireAtDate = new Date(now);
+    let expireAtDate, repeat;
+    const timerStr = result[t];
+
+    if (timerStr) {
+      switch (t) {
+        case 'timeCycle':
+          {
+            const mRepeat = timerStr.match(repeatPattern);
+            if (mRepeat && mRepeat.length) repeat = parseInt(mRepeat[1]);
+          }
+
+        case 'timeDuration':
+          {
+            const delay = this._getDurationInMilliseconds(timerStr);
+
+            if (delay !== undefined) expireAtDate = new Date(now + delay);
+            break;
+          }
+
+        case 'timeDate':
+          {
+            const dateStr = result[t];
+            const ms = Date.parse(dateStr);
+
+            if (!isNaN(ms)) {
+              expireAtDate = new Date(ms);
+            } else {
+              this._warn(`invalid timeDate >${dateStr}<`);
+            }
+
+            break;
+          }
       }
+    } else {
+      expireAtDate = new Date(now);
     }
 
     if (!expireAtDate) continue;
@@ -253,6 +271,7 @@ proto._getTimers = function getTimers(executeMessage) {
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
       result.timerType = t;
       result.expireAt = expireAtDate;
+      if (repeat) result.repeat = repeat;
     }
   }
 
@@ -264,6 +283,10 @@ proto._getTimers = function getTimers(executeMessage) {
     result.timeout = 0;
   }
 
+  if (content.inbound && 'repeat' in content.inbound[0]) {
+    result.repeat = content.inbound[0].repeat;
+  }
+
   return result;
 };
 
@@ -271,7 +294,7 @@ proto._getDurationInMilliseconds = function getDurationInMilliseconds(duration)
   try {
     return (0, _iso8601Duration.toSeconds)((0, _iso8601Duration.parse)(duration)) * 1000;
   } catch (err) {
-    this._warn(`failed to parse timeDuration >${duration}<: ${err.message}`);
+    this._warn(`failed to parse ${this.timerType} >${duration}<: ${err.message}`);
   }
 };