@onify/flow-extensions 0.0.2 → 1.1.0

package/CHANGELOG.md

@@ -0,0 +1,21 @@
+Changelog
+=========
+
+# 1.0.1
+
+- allow ISO8601 repeating interval and duration in timeCycle
+
+# 1.0.0
+
+- proper routing keys for end formatting
+
+# 0.1.0
+
+- catch errors when resolving service expression
+- test with bpmn-engine@14
+
+# 0.0.2
+
+- allow expressions in timeCycle
+- test with bpmn-engine@13
+- error message changed in node 16

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}`);
@@ -130,7 +132,7 @@ class OnifyElementExtensions {
     activity.on('activity.execution.completed', async elementApi => {
       if (elementApi.fields.redelivered) return;
       formatQ.queueMessage({
-        routingKey: 'run.end.error'
+        routingKey: 'run.end.format'
       }, {
         endRoutingKey: 'run.end.complete'
       }, {
@@ -140,7 +142,7 @@ class OnifyElementExtensions {
       try {
         var format = await this._onExecuted(elementApi);
       } catch (err) {
-        return broker.publish('format', 'run.enter.error', {
+        return broker.publish('format', 'run.end.error', {
           error: err
         }, {
           persistent: false
@@ -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/Connector.js

@@ -5,16 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = Connector;
 
-class NotImplemented extends Error {
-  constructor(serviceId) {
-    super(`${serviceId} service function not found`);
-    this.code = 'EFLOW_NOT_IMPLEMENTED';
-    this.output = {
-      statusCode: 501
-    };
-  }
-
-}
+var _Errors = require("./Errors");
 
 function Connector(connectorId, io, activity, executionMessage) {
   if (!(this instanceof Connector)) return new Connector(connectorId, io, activity, executionMessage);
@@ -33,7 +24,7 @@ Connector.prototype.execute = async function execute(...args) {
   const connectorId = this.connectorId;
   const executionMessage = this.executionMessage;
   const serviceFunction = environment.services[connectorId];
-  if (!serviceFunction) return callback(new NotImplemented(connectorId));
+  if (!serviceFunction) return callback(new _Errors.NotImplemented(connectorId));
 
   try {
     const input = io && (await io.getInput(activity, executionMessage));

package/dist/src/Errors.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.NotImplemented = void 0;
+
+class NotImplemented extends Error {
+  constructor(serviceId) {
+    super(`${serviceId} service function not found`);
+    this.code = 'EFLOW_NOT_IMPLEMENTED';
+    this.output = {
+      statusCode: 501
+    };
+  }
+
+}
+
+exports.NotImplemented = NotImplemented;

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));
@@ -159,10 +159,8 @@ class IOList extends IOBase {
   }
 
   getValue(activity, executionMessage) {
-    var _this$behaviour$defin;
-
     const name = this.name;
-    const items = (_this$behaviour$defin = this.behaviour.definition) === null || _this$behaviour$defin === void 0 ? void 0 : _this$behaviour$defin.items;
+    const items = this.behaviour.definition.items;
     const result = [];
     if (!Array.isArray(items)) return {
       [name]: result

package/dist/src/ServiceExpression.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = ServiceExpression;
 
+var _Errors = require("./Errors");
+
 function ServiceExpression(activity) {
   if (!(this instanceof ServiceExpression)) return new ServiceExpression(activity);
   this.activity = activity;
@@ -13,7 +15,14 @@ function ServiceExpression(activity) {
 }
 
 ServiceExpression.prototype.execute = function execute(executionMessage, callback) {
-  const serviceFn = this.activity.environment.resolveExpression(this.expression, executionMessage);
+  try {
+    const expression = this.expression;
+    var serviceFn = this.activity.environment.resolveExpression(expression, executionMessage);
+    if (typeof serviceFn !== 'function') throw new _Errors.NotImplemented(`expression "${expression}"`);
+  } catch (err) {
+    return callback(err);
+  }
+
   serviceFn.call(this.activity, executionMessage, (err, result) => {
     callback(err, result);
   });

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}`);
@@ -90,12 +92,12 @@ class OnifyElementExtensions {
     activity.on('activity.execution.completed', async (elementApi) => {
       if (elementApi.fields.redelivered) return;
 
-      formatQ.queueMessage({routingKey: 'run.end.error'}, {endRoutingKey: 'run.end.complete'}, {persistent: false});
+      formatQ.queueMessage({routingKey: 'run.end.format'}, {endRoutingKey: 'run.end.complete'}, {persistent: false});
 
       try {
         var format = await this._onExecuted(elementApi);
       } catch (err) {
-        return broker.publish('format', 'run.enter.error', {error: err}, {persistent: false});
+        return broker.publish('format', 'run.end.error', {error: err}, {persistent: false});
       }
 
       broker.publish('format', 'run.end.complete', {...format}, {persistent: false});
@@ -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": "0.0.2",
+  "version": "1.1.0",
   "description": "Onify Flow extensions",
   "module": "index.js",
   "main": "dist/index.js",
@@ -35,26 +35,26 @@
   "license": "MIT",
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.8",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/register": "^7.17.7",
-    "bpmn-elements": "^7.0.0",
-    "bpmn-engine": "^13.0.1",
+    "@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.0",
+    "c8": "^7.11.3",
     "camunda-bpmn-moddle": "^6.1.2",
     "chai": "^4.3.6",
     "chronokinesis": "^3.1.2",
     "debug": "^4.3.4",
-    "eslint": "^8.11.0",
-    "mocha": "^9.2.2",
+    "eslint": "^7.32.0",
+    "mocha": "^10.0.0",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^2.1.0",
-    "nock": "^13.2.4"
+    "nock": "^13.2.8"
   },
   "dependencies": {
-    "cron-parser": "^4.2.1"
+    "cron-parser": "^4.5.0"
   },
   "files": [
     "src",

package/src/Connector.js

@@ -1,10 +1,4 @@
-class NotImplemented extends Error {
-  constructor(serviceId) {
-    super(`${serviceId} service function not found`);
-    this.code = 'EFLOW_NOT_IMPLEMENTED';
-    this.output = {statusCode: 501};
-  }
-}
+import {NotImplemented} from './Errors';
 
 export default function Connector(connectorId, io, activity, executionMessage) {
   if (!(this instanceof Connector)) return new Connector(connectorId, io, activity, executionMessage);

package/src/Errors.js

@@ -0,0 +1,11 @@
+class NotImplemented extends Error {
+  constructor(serviceId) {
+    super(`${serviceId} service function not found`);
+    this.code = 'EFLOW_NOT_IMPLEMENTED';
+    this.output = {statusCode: 501};
+  }
+}
+
+export {
+  NotImplemented,
+};

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}),
             },
           });
 
@@ -123,7 +123,7 @@ class IOList extends IOBase {
   }
   getValue(activity, executionMessage) {
     const name = this.name;
-    const items = this.behaviour.definition?.items;
+    const items = this.behaviour.definition.items;
 
     const result = [];
     if (!Array.isArray(items)) return {[name]: result};

package/src/ServiceExpression.js

@@ -1,3 +1,5 @@
+import {NotImplemented} from './Errors';
+
 export default function ServiceExpression(activity) {
   if (!(this instanceof ServiceExpression)) return new ServiceExpression(activity);
   this.activity = activity;
@@ -6,7 +8,14 @@ export default function ServiceExpression(activity) {
 }
 
 ServiceExpression.prototype.execute = function execute(executionMessage, callback) {
-  const serviceFn = this.activity.environment.resolveExpression(this.expression, executionMessage);
+  try {
+    const expression = this.expression;
+    var serviceFn = this.activity.environment.resolveExpression(expression, executionMessage);
+    if (typeof serviceFn !== 'function') throw new NotImplemented(`expression "${expression}"`);
+  } catch (err) {
+    return callback(err);
+  }
+
   serviceFn.call(this.activity, executionMessage, (err, result) => {
     callback(err, result);
   });