@onify/flow-extensions 8.3.0 → 9.0.0

package/dist/OnifyTimerEventDefinition.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OnifyTimerEventDefinition = void 0;
-var _cronParser = _interopRequireDefault(require("cron-parser"));
+var _croner = require("croner");
 var _bpmnElements = require("bpmn-elements");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const invalidCronEntryPattern = /Invalid (characters|range)/i;
 class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
   constructor(activity, def) {
     super(activity, def);
@@ -23,14 +21,15 @@ class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
         var rangeError = err;
       }
       try {
-        const expireAt = _cronParser.default.parseExpression(value).next().toDate();
+        const expireAt = new _croner.Cron(value).nextRun();
         return {
           expireAt,
           delay: expireAt - Date.now()
         };
       } catch (err) {
-        if (invalidCronEntryPattern.test(err.message)) throw rangeError;
-        throw err;
+        this.logger.error(`<${this.activity?.id}> failed to parse timeCycle: ${rangeError.message}`);
+        this.logger.error(`<${this.activity?.id}> failed to parse timeCycle as cron: ${err.message}`);
+        throw new RangeError(`Failed to parse timeCycle <${value?.substring(0, 255)}> as ISO 8601 interval or cron`);
       }
     }
     return super.parse(timerType, value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/flow-extensions",
-  "version": "8.3.0",
+  "version": "9.0.0",
   "description": "Onify Flow extensions",
   "type": "module",
   "module": "src/index.js",
@@ -50,9 +50,8 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@babel/register": "^7.23.7",
-    "bpmn-elements": "^15.0.3",
     "bpmn-elements-8-1": "npm:bpmn-elements@8.1",
-    "bpmn-engine": "^22.0.2",
+    "bpmn-engine": "^23.0.1",
     "bpmn-engine-14": "npm:bpmn-engine@14",
     "bpmn-moddle": "^9.0.1",
     "c8": "^10.1.2",
@@ -66,14 +65,12 @@
     "moddle-context-serializer": "^4.1.1",
     "nock": "^13.5.4",
     "prettier": "^3.2.4",
-    "texample": "^0.0.5"
+    "texample": "^0.0.6"
   },
   "peerDependencies": {
-    "bpmn-elements": ">=14"
-  },
-  "dependencies": {
-    "@0dep/piso": "^2.0.0",
-    "cron-parser": "^4.9.0"
+    "@0dep/piso": ">=2",
+    "bpmn-elements": ">=14",
+    "croner": ">=9.0.0"
   },
   "files": [
     "src",

package/src/OnifyTimerEventDefinition.js

@@ -1,8 +1,6 @@
-import cronParser from 'cron-parser';
+import { Cron } from 'croner';
 import { TimerEventDefinition } from 'bpmn-elements';
 
-const invalidCronEntryPattern = /Invalid (characters|range)/i;
-
 export class OnifyTimerEventDefinition extends TimerEventDefinition {
   constructor(activity, def) {
     super(activity, def);
@@ -19,15 +17,17 @@ export class OnifyTimerEventDefinition extends TimerEventDefinition {
       }
 
       try {
-        const expireAt = cronParser.parseExpression(value).next().toDate();
+        const expireAt = new Cron(value).nextRun();
 
         return {
           expireAt,
           delay: expireAt - Date.now(),
         };
       } catch (err) {
-        if (invalidCronEntryPattern.test(err.message)) throw rangeError;
-        throw err;
+        this.logger.error(`<${this.activity?.id}> failed to parse timeCycle: ${rangeError.message}`);
+        this.logger.error(`<${this.activity?.id}> failed to parse timeCycle as cron: ${err.message}`);
+
+        throw new RangeError(`Failed to parse timeCycle <${value?.substring(0, 255)}> as ISO 8601 interval or cron`);
       }
     }