@onify/flow-extensions 1.0.0 → 1.1.0

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+# 1.0.1
+
+- allow ISO8601 repeating interval and duration in timeCycle
+
 # 1.0.0
 
 - proper routing keys for end formatting

package/dist/index.js

@@ -20,6 +20,8 @@ var _IO = require("./src/IO");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const iso8601cycle = /^\s*(R\d+\/)?P\w+/i;
+
 class FormatError extends Error {
   constructor(elementId, err) {
     super(`<${elementId}> ${err.message}`);
@@ -330,7 +332,7 @@ class FormatActivity {
     if (timeCycles) {
       for (const cycle of timeCycles) {
         const cron = elementApi.resolveExpression(cycle);
-        if (!cron) continue;
+        if (!cron || iso8601cycle.test(cron)) continue;
 
         const expireAtDt = _cronParser.default.parseExpression(cron).next().toDate();
 
@@ -340,9 +342,9 @@ class FormatActivity {
 
     return {
       resultVariable: this.resultVariable,
-      ...(scheduledStart && activity.parent.type === 'bpmn:Process' ? {
+      ...(scheduledStart && activity.parent.type === 'bpmn:Process' && {
         scheduledStart
-      } : undefined),
+      }),
       ...(((_user = user) === null || _user === void 0 ? void 0 : _user.length) && {
         candidateUsers: user
       }),
@@ -444,12 +446,12 @@ function registerIOScripts(parentId, context, type, ioBehaviour) {
     context.addScript(filename, {
       id: filename,
       scriptFormat: definition.scriptFormat,
-      ...(definition.value ? {
+      ...(definition.value && {
         body: definition.value
-      } : undefined),
-      ...(definition.resource ? {
+      }),
+      ...(definition.resource && {
         resource: definition.resource
-      } : undefined)
+      })
     });
   }
 }

package/dist/src/IO.js

@@ -64,12 +64,12 @@ class InputOutput {
               type: parm.$type,
               behaviour: {
                 scriptFormat,
-                ...(value ? {
+                ...(value && {
                   script: value
-                } : undefined),
-                ...(resource ? {
+                }),
+                ...(resource && {
                   resource
-                } : undefined)
+                })
               }
             });
             mapped.push(new IOScript(parm, id));

package/index.js

@@ -5,6 +5,8 @@ import Connector from './src/Connector';
 import ServiceExpression from './src/ServiceExpression';
 import {InputOutput} from './src/IO';
 
+const iso8601cycle = /^\s*(R\d+\/)?P\w+/i;
+
 class FormatError extends Error {
   constructor(elementId, err) {
     super(`<${elementId}> ${err.message}`);
@@ -236,7 +238,8 @@ class FormatActivity {
     if (timeCycles) {
       for (const cycle of timeCycles) {
         const cron = elementApi.resolveExpression(cycle);
-        if (!cron) continue;
+        if (!cron || iso8601cycle.test(cron)) continue;
+
         const expireAtDt = cronParser.parseExpression(cron).next().toDate();
         if (!expireAt || expireAtDt < expireAt) expireAt = expireAtDt;
       }
@@ -244,7 +247,7 @@ class FormatActivity {
 
     return {
       resultVariable: this.resultVariable,
-      ...(scheduledStart && activity.parent.type === 'bpmn:Process' ? {scheduledStart} : undefined),
+      ...(scheduledStart && activity.parent.type === 'bpmn:Process' && {scheduledStart}),
       ...(user?.length && {candidateUsers: user}),
       ...(groups?.length && {candidateGroups: groups}),
       ...(!elementApi.content.description && description && {description: elementApi.resolveExpression(description)}),
@@ -323,8 +326,8 @@ function registerIOScripts(parentId, context, type, ioBehaviour) {
     context.addScript(filename, {
       id: filename,
       scriptFormat: definition.scriptFormat,
-      ...(definition.value ? {body: definition.value}: undefined),
-      ...(definition.resource ? {resource: definition.resource}: undefined),
+      ...(definition.value && {body: definition.value}),
+      ...(definition.resource && {resource: definition.resource}),
     });
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/flow-extensions",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Onify Flow extensions",
   "module": "index.js",
   "main": "dist/index.js",
@@ -35,12 +35,12 @@
   "license": "MIT",
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.18.5",
-    "@babel/preset-env": "^7.18.2",
-    "@babel/register": "^7.17.7",
-    "bpmn-elements": "^8.0.1",
-    "bpmn-engine": "^14.0.0",
+    "@babel/cli": "^7.18.6",
+    "@babel/core": "^7.18.6",
+    "@babel/preset-env": "^7.18.6",
+    "@babel/register": "^7.18.6",
+    "bpmn-elements": "^8.1.0",
+    "bpmn-engine": "^14.1.0",
     "bpmn-moddle": "^7.1.2",
     "c8": "^7.11.3",
     "camunda-bpmn-moddle": "^6.1.2",
@@ -51,10 +51,10 @@
     "mocha": "^10.0.0",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^2.1.0",
-    "nock": "^13.2.6"
+    "nock": "^13.2.8"
   },
   "dependencies": {
-    "cron-parser": "^4.4.0"
+    "cron-parser": "^4.5.0"
   },
   "files": [
     "src",

package/src/IO.js

@@ -51,8 +51,8 @@ class InputOutput {
             type: parm.$type,
             behaviour: {
               scriptFormat,
-              ...(value ? {script: value} : undefined),
-              ...(resource ? {resource} : undefined),
+              ...(value && {script: value}),
+              ...(resource && {resource}),
             },
           });