@onify/flow-extensions 8.0.1 → 8.0.3

package/dist/OnifyTimerEventDefinition.js

@@ -7,23 +7,30 @@ exports.OnifyTimerEventDefinition = void 0;
 var _cronParser = _interopRequireDefault(require("cron-parser"));
 var _bpmnElements = require("bpmn-elements");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const invalidCronEntryPattern = /Invalid (characters|range)/i;
 class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
   constructor(activity, def) {
     super(activity, def);
     Object.defineProperty(this, 'supports', {
-      value: ['cron']
+      value: ['cron', 'iso8601']
     });
   }
   parse(timerType, value) {
-    let cron;
-    if (timerType === 'timeCycle' && (cron = _cronParser.default.parseString(value))) {
-      if (cron.expressions?.length) {
-        // cronParser.parseString expressions disregards seconds, so we have to parse again
+    if (timerType === 'timeCycle') {
+      try {
+        return super.parse(timerType, value);
+      } catch (err) {
+        var rangeError = err;
+      }
+      try {
         const expireAt = _cronParser.default.parseExpression(value).next().toDate();
         return {
           expireAt,
           delay: expireAt - Date.now()
         };
+      } catch (err) {
+        if (invalidCronEntryPattern.test(err.message)) throw rangeError;
+        throw err;
       }
     }
     return super.parse(timerType, value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/flow-extensions",
-  "version": "8.0.1",
+  "version": "8.0.3",
   "description": "Onify Flow extensions",
   "type": "module",
   "module": "src/index.js",
@@ -21,11 +21,10 @@
   },
   "scripts": {
     "test": "mocha -R dot",
-    "posttest": "npm run lint && npm run dist",
+    "posttest": "npm run lint && npm run dist && texample",
     "lint": "eslint . --cache && prettier . --check --cache",
     "prepare": "npm run dist",
     "dist": "babel src -d dist && babel test/helpers/FlowScripts.js -d dist",
-    "test:md": "node --experimental-vm-modules --no-warnings scripts/test-markdown.js ./README.md",
     "test:lcov": "c8 -r lcov mocha && npm run lint",
     "cov:html": "c8 mocha -R dot && c8 report --reporter html"
   },
@@ -52,7 +51,7 @@
     "@babel/preset-env": "^7.23.9",
     "@babel/register": "^7.23.7",
     "bpmn-elements-8-1": "npm:bpmn-elements@8.1",
-    "bpmn-engine": "^20.0.1",
+    "bpmn-engine": "^21.1.0",
     "bpmn-engine-14": "npm:bpmn-engine@14",
     "bpmn-moddle": "^9.0.1",
     "c8": "^9.1.0",
@@ -60,18 +59,19 @@
     "chai": "^5.0.3",
     "chronokinesis": "^6.0.0",
     "debug": "^4.3.4",
-    "eslint": "^9.0.0",
+    "eslint": "^9.3.0",
     "mocha": "^10.2.0",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^4.1.1",
     "nock": "^13.5.4",
-    "prettier": "^3.2.4"
+    "prettier": "^3.2.4",
+    "texample": "^0.0.5"
   },
   "peerDependencies": {
-    "bpmn-elements": "^14.0.0"
+    "bpmn-elements": "^14.1.0"
   },
   "dependencies": {
-    "@0dep/piso": "^0.1.3",
+    "@0dep/piso": "^0.1.4",
     "cron-parser": "^4.9.0"
   },
   "files": [
@@ -84,7 +84,6 @@
     "exclude": [
       "dist",
       "test",
-      ".mocharc.cjs",
       "babel.config.cjs"
     ]
   }

package/src/OnifyTimerEventDefinition.js

@@ -1,24 +1,33 @@
 import cronParser from 'cron-parser';
 import { TimerEventDefinition } from 'bpmn-elements';
 
+const invalidCronEntryPattern = /Invalid (characters|range)/i;
+
 export class OnifyTimerEventDefinition extends TimerEventDefinition {
   constructor(activity, def) {
     super(activity, def);
     Object.defineProperty(this, 'supports', {
-      value: ['cron'],
+      value: ['cron', 'iso8601'],
     });
   }
   parse(timerType, value) {
-    let cron;
-    if (timerType === 'timeCycle' && (cron = cronParser.parseString(value))) {
-      if (cron.expressions?.length) {
-        // cronParser.parseString expressions disregards seconds, so we have to parse again
+    if (timerType === 'timeCycle') {
+      try {
+        return super.parse(timerType, value);
+      } catch (err) {
+        var rangeError = err;
+      }
+
+      try {
         const expireAt = cronParser.parseExpression(value).next().toDate();
 
         return {
           expireAt,
           delay: expireAt - Date.now(),
         };
+      } catch (err) {
+        if (invalidCronEntryPattern.test(err.message)) throw rangeError;
+        throw err;
       }
     }
 

package/types/index.d.ts

@@ -1,12 +1,12 @@
 declare module '@onify/flow-extensions' {
-  import { SequenceFlow, TimerEventDefinition, ElementBase, IExtension } from 'bpmn-elements';
+  import { SequenceFlow, TimerEventDefinition, ElementBase, IExtension, ContextInstance } from 'bpmn-elements';
   import { extendFn as extendFunction } from 'moddle-context-serializer';
 
   export class OnifySequenceFlow extends SequenceFlow {}
   export class OnifyTimerEventDefinition extends TimerEventDefinition {
     readonly supports: string[];
   }
-  export function extensions(element: ElementBase, context: Context): IExtension;
+  export function extensions(element: ElementBase, context: ContextInstance): IExtension;
   export const extendFn: extendFunction;
 }