bpmn-elements 14.0.0 → 14.1.0

package/dist/eventDefinitions/SignalEventDefinition.js

@@ -120,7 +120,8 @@ SignalEventDefinition.prototype.executeThrow = function executeThrow(executeMess
   throwContent.parent = (0, _messageHelper.shiftParent)(parent);
   const broker = this.broker;
   broker.publish('event', 'activity.signal', throwContent, {
-    type: 'signal'
+    type: 'signal',
+    delegate: true
   });
   return broker.publish('execution', 'execute.completed', (0, _messageHelper.cloneContent)(executeContent));
 };

package/dist/eventDefinitions/TimerEventDefinition.js

@@ -4,8 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = TimerEventDefinition;
-var _messageHelper = require("../messageHelper.js");
 var _piso = require("@0dep/piso");
+var _messageHelper = require("../messageHelper.js");
+var _Errors = require("../error/Errors.js");
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
 const kTimer = Symbol.for('timer');
@@ -60,7 +61,13 @@ TimerEventDefinition.prototype.execute = function execute(executeMessage) {
   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);
+  try {
+    // eslint-disable-next-line no-var
+    var resolvedTimer = this._getTimers(executeMessage);
+  } catch (err) {
+    this.logger.error(`<${executionId} (${this.activity.id})> failed to get timeout delay: ${err}`);
+    throw new _Errors.RunError(err.message, executeMessage, err);
+  }
   const timerContent = this[kTimerContent] = (0, _messageHelper.cloneContent)(content, {
     ...resolvedTimer,
     ...(isResumed && {
@@ -222,6 +229,7 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
       expireAt: new Date(content.expireAt)
     })
   };
+  const now = new Date();
   for (const timerType of timerTypes) {
     if (timerType in content) result[timerType] = content[timerType];else if (timerType in this) result[timerType] = this.environment.resolveExpression(this[timerType], executeMessage);else continue;
     let expireAtDate, repeat;
@@ -232,9 +240,12 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
         expireAt: parsedExpireAt
       } = this.parse(timerType, timerStr);
       repeat = parsedRepeat;
+      if (!parsedExpireAt || !parsedExpireAt.getTime) {
+        throw new TypeError(`Parsed ${timerType} "${timerStr}" expireAt failed to resolve to a date`);
+      }
       expireAtDate = parsedExpireAt;
     } else {
-      expireAtDate = new Date();
+      expireAtDate = now;
     }
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
       result.timerType = timerType;
@@ -243,7 +254,7 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
     }
   }
   if ('expireAt' in result) {
-    result.timeout = result.expireAt - Date.now();
+    result.timeout = result.expireAt - now.getTime();
   } else if ('timeout' in content) {
     result.timeout = content.timeout;
   } else if (!Object.keys(result).length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,13 +35,14 @@
     "posttest": "npm run lint && npm run dist",
     "lint": "eslint . --cache && prettier . --check --cache",
     "prepack": "npm run dist",
+    "test:md": "texample ./docs/Examples.md,./docs/StartEvent.md,./docs/Extension.md",
     "cov:html": "c8 -r html -r text mocha -R @bonniernews/hot-bev -p -t 3000",
     "test:lcov": "c8 -r lcov mocha && npm run lint",
     "dist": "babel src -d dist/"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/paed01/bpmn-elements"
+    "url": "git://github.com/paed01/bpmn-elements.git"
   },
   "author": {
     "name": "Pål Edman",
@@ -83,7 +84,8 @@
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^4.1.2",
     "nock": "^13.5.3",
-    "prettier": "^3.2.5"
+    "prettier": "^3.2.5",
+    "texample": "^0.0.2"
   },
   "dependencies": {
     "@0dep/piso": "^0.1.3",

package/src/eventDefinitions/SignalEventDefinition.js

@@ -108,7 +108,7 @@ SignalEventDefinition.prototype.executeThrow = function executeThrow(executeMess
   throwContent.parent = shiftParent(parent);
 
   const broker = this.broker;
-  broker.publish('event', 'activity.signal', throwContent, { type: 'signal' });
+  broker.publish('event', 'activity.signal', throwContent, { type: 'signal', delegate: true });
 
   return broker.publish('execution', 'execute.completed', cloneContent(executeContent));
 };

package/src/eventDefinitions/TimerEventDefinition.js

@@ -1,5 +1,6 @@
-import { cloneContent } from '../messageHelper.js';
 import { ISOInterval, getDate } from '@0dep/piso';
+import { cloneContent } from '../messageHelper.js';
+import { RunError } from '../error/Errors.js';
 
 const kStopped = Symbol.for('stopped');
 const kTimerContent = Symbol.for('timerContent');
@@ -58,7 +59,14 @@ TimerEventDefinition.prototype.execute = function execute(executeMessage) {
   const executionId = content.executionId;
   const startedAt = (this.startedAt = 'startedAt' in content ? new Date(content.startedAt) : new Date());
 
-  const resolvedTimer = this._getTimers(executeMessage);
+  try {
+    // eslint-disable-next-line no-var
+    var resolvedTimer = this._getTimers(executeMessage);
+  } catch (err) {
+    this.logger.error(`<${executionId} (${this.activity.id})> failed to get timeout delay: ${err}`);
+    throw new RunError(err.message, executeMessage, err);
+  }
+
   const timerContent = (this[kTimerContent] = cloneContent(content, {
     ...resolvedTimer,
     ...(isResumed && { isResumed }),
@@ -220,6 +228,8 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
     ...('expireAt' in content && { expireAt: new Date(content.expireAt) }),
   };
 
+  const now = new Date();
+
   for (const timerType of timerTypes) {
     if (timerType in content) result[timerType] = content[timerType];
     else if (timerType in this) result[timerType] = this.environment.resolveExpression(this[timerType], executeMessage);
@@ -230,9 +240,12 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
     if (timerStr) {
       const { repeat: parsedRepeat, expireAt: parsedExpireAt } = this.parse(timerType, timerStr);
       repeat = parsedRepeat;
+      if (!parsedExpireAt || !parsedExpireAt.getTime) {
+        throw new TypeError(`Parsed ${timerType} "${timerStr}" expireAt failed to resolve to a date`);
+      }
       expireAtDate = parsedExpireAt;
     } else {
-      expireAtDate = new Date();
+      expireAtDate = now;
     }
 
     if (!('expireAt' in result) || result.expireAt > expireAtDate) {
@@ -243,7 +256,7 @@ TimerEventDefinition.prototype._getTimers = function getTimers(executeMessage) {
   }
 
   if ('expireAt' in result) {
-    result.timeout = result.expireAt - Date.now();
+    result.timeout = result.expireAt - now.getTime();
   } else if ('timeout' in content) {
     result.timeout = content.timeout;
   } else if (!Object.keys(result).length) {

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export * from './types.js';
-import { IActivityBehaviour, ActivityBehaviour, EventDefinition, MessageElement, ISODurationApi } from './types.js';
+import { IActivityBehaviour, ActivityBehaviour, EventDefinition, MessageElement } from './types.js';
 
 declare module 'bpmn-elements' {
   export var BoundaryEvent: typeof ActivityBehaviour;
@@ -65,8 +65,6 @@ declare module 'bpmn-elements' {
   export class Message extends MessageElement {}
   export class Signal extends MessageElement {}
   export class Escalation extends MessageElement {}
-
-  export var ISODuration: ISODurationApi;
 }
 
 declare module 'bpmn-elements/events' {

package/types/types.d.ts

@@ -697,26 +697,6 @@ declare class ActivityError extends Error {
   constructor(description: string, sourceMessage: MessageMessage, inner?: Error);
 }
 
-declare interface Duration {
-  years?: number;
-  months?: number;
-  weeks?: number;
-  days?: number;
-  hours?: number;
-  minutes?: number;
-  seconds?: number;
-  repeat?: number;
-}
-
-declare type ISODurationApi = {
-  /** Parse PnYnMnDTnHnMnS format to object */
-  parse: (durationString: string) => Duration;
-  /** Convert ISO8601 duration object to an end Date. */
-  end: (durationInput: Duration, startDate?: Date) => Date;
-  /** Convert ISO8601 duration object to seconds */
-  toSeconds: (durationInput: Duration, startDate?: Date) => number;
-};
-
 /**
  * Evaluate flow callback
  * @callback evaluateCallback