@onify/flow-extensions 1.0.0 → 2.0.0

package/dist/index.js

@@ -5,21 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extendFn = extendFn;
 exports.extensions = extensions;
-
 var _cronParser = _interopRequireDefault(require("cron-parser"));
-
 var _IOProperties = _interopRequireDefault(require("./src/IOProperties"));
-
 var _IOForm = _interopRequireDefault(require("./src/IOForm"));
-
 var _Connector = _interopRequireDefault(require("./src/Connector"));
-
 var _ServiceExpression = _interopRequireDefault(require("./src/ServiceExpression"));
-
 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}`);
@@ -28,33 +21,28 @@ class FormatError extends Error {
       statusCode: 500
     };
   }
-
 }
-
 function extensions(element, context) {
   if (element.type === 'bpmn:Process') return new OnifyProcessExtensions(element, context);
   return new OnifyElementExtensions(element, context);
 }
-
 class OnifyProcessExtensions {
   constructor(bp, context) {
     this.process = bp;
     this.context = context;
     this.extensions = getExtensions(bp, context);
-
     this._activate();
   }
-
   _activate() {
     const bp = this.process;
     bp.on('process.enter', elementApi => {
       try {
         const result = this._onEnter(elementApi);
-
         const environment = elementApi.environment;
         environment.assignVariables(result);
       } catch (err) {
-        elementApi.broker.publish('event', 'process.error', { ...elementApi.content,
+        elementApi.broker.publish('event', 'process.error', {
+          ...elementApi.content,
           error: new FormatError(bp.id, err)
         }, {
           mandatory: true,
@@ -65,7 +53,6 @@ class OnifyProcessExtensions {
       consumerTag: '_onify-extension-on-enter'
     });
   }
-
   _onEnter(elementApi) {
     const {
       format,
@@ -74,17 +61,13 @@ class OnifyProcessExtensions {
     const result = {};
     Object.assign(result, format.resolve(elementApi));
     Object.assign(elementApi.content, result);
-
     if (properties) {
       Object.assign(result, properties.resolve(elementApi));
       Object.assign(elementApi.content, result);
     }
-
     return result;
   }
-
 }
-
 class OnifyElementExtensions {
   constructor(activity, context) {
     this.activity = activity;
@@ -92,43 +75,28 @@ class OnifyElementExtensions {
     const {
       Service
     } = this.extensions = getExtensions(activity, context);
-
     if (Service) {
       activity.behaviour.Service = Service;
     }
   }
-
-  activate() {
+  activate(message) {
     const activity = this.activity;
     const broker = activity.broker;
     const formatQ = activity.broker.getQueue('format-run-q');
-    activity.on('enter', async elementApi => {
-      formatQ.queueMessage({
-        routingKey: 'run.enter.format'
-      }, {
-        endRoutingKey: 'run.enter.complete'
+    if (message.fields.redelivered && message.fields.routingKey === 'run.start') {
+      activity.on('start', elementApi => {
+        this._formatOnEnter(broker, formatQ, elementApi);
       }, {
-        persistent: false
+        consumerTag: '_onify-extension-on-enter'
       });
-
-      try {
-        var format = await this._onEnter(elementApi);
-      } catch (err) {
-        return broker.publish('format', 'run.enter.error', {
-          error: err
-        }, {
-          persistent: false
-        });
-      }
-
-      broker.publish('format', 'run.enter.complete', format, {
-        persistent: false
+    } else {
+      activity.on('enter', elementApi => {
+        this._formatOnEnter(broker, formatQ, elementApi);
+      }, {
+        consumerTag: '_onify-extension-on-enter'
       });
-    }, {
-      consumerTag: '_onify-extension-on-enter'
-    });
+    }
     activity.on('activity.execution.completed', async elementApi => {
-      if (elementApi.fields.redelivered) return;
       formatQ.queueMessage({
         routingKey: 'run.end.format'
       }, {
@@ -136,7 +104,6 @@ class OnifyElementExtensions {
       }, {
         persistent: false
       });
-
       try {
         var format = await this._onExecuted(elementApi);
       } catch (err) {
@@ -146,8 +113,8 @@ class OnifyElementExtensions {
           persistent: false
         });
       }
-
-      broker.publish('format', 'run.end.complete', { ...format
+      broker.publish('format', 'run.end.complete', {
+        ...format
       }, {
         persistent: false
       });
@@ -155,13 +122,32 @@ class OnifyElementExtensions {
       consumerTag: '_onify-extension-on-executed'
     });
   }
-
   deactivate() {
     const broker = this.activity.broker;
     broker.cancel('_onify-extension-on-enter');
     broker.cancel('_onify-extension-on-executed');
   }
-
+  async _formatOnEnter(broker, formatQ, elementApi) {
+    formatQ.queueMessage({
+      routingKey: 'run.enter.format'
+    }, {
+      endRoutingKey: 'run.enter.complete'
+    }, {
+      persistent: false
+    });
+    try {
+      var format = await this._onEnter(elementApi);
+    } catch (err) {
+      return broker.publish('format', 'run.enter.error', {
+        error: err
+      }, {
+        persistent: false
+      });
+    }
+    broker.publish('format', 'run.enter.complete', format, {
+      persistent: false
+    });
+  }
   async _onEnter(elementApi) {
     const {
       format,
@@ -172,47 +158,38 @@ class OnifyElementExtensions {
     const result = {};
     Object.assign(result, format.resolve(elementApi));
     Object.assign(elementApi.content, result);
-
     if (properties) {
       Object.assign(result, {
         properties: properties.resolve(elementApi)
       });
       Object.assign(elementApi.content, result);
     }
-
     if (io) {
-      var _io$input, _io$output;
-
-      if ((_io$input = io.input) !== null && _io$input !== void 0 && _io$input.length) {
+      if (io.input?.length) {
         const input = await io.getInput(this.activity, elementApi);
         Object.assign(result, {
           input
         });
         Object.assign(elementApi.content, result);
       }
-
-      if ((_io$output = io.output) !== null && _io$output !== void 0 && _io$output.length) {
+      if (io.output?.length) {
         result.assignToOutput = true;
       }
     }
-
     if (form) {
       Object.assign(result, {
         form: form.resolve(elementApi)
       });
     }
-
     return result;
   }
-
   async _onExecuted(elementApi) {
     const {
       properties,
       io
     } = this.extensions;
     const result = {};
-
-    if (io !== null && io !== void 0 && io.output.length) {
+    if (io?.output.length) {
       const output = await io.getOutput(this.activity, elementApi);
       Object.assign(result, {
         output
@@ -221,7 +198,6 @@ class OnifyElementExtensions {
         output
       });
     }
-
     if (properties) {
       const props = properties.resolve(elementApi);
       Object.assign(result, {
@@ -231,50 +207,39 @@ class OnifyElementExtensions {
         properties: props
       });
     }
-
     const {
       output,
       assignToOutput,
       resultVariable
     } = elementApi.content;
     if (output === undefined || output === null) return result;
-
     if (assignToOutput && typeof output === 'object') {
       Object.assign(this.activity.environment.output, output);
     } else if (resultVariable) {
       elementApi.environment.output[resultVariable] = output;
     }
-
     return result;
   }
-
 }
-
 function getExtensions(element, context) {
-  var _element$behaviour$ex, _ext$values, _ext$fields;
-
   const result = {
     format: element.type === 'bpmn:Process' ? new FormatProcess(element) : new FormatActivity(element)
   };
   const expression = element.behaviour.expression;
   if (expression) result.Service = _ServiceExpression.default;
-  const extensions = (_element$behaviour$ex = element.behaviour.extensionElements) === null || _element$behaviour$ex === void 0 ? void 0 : _element$behaviour$ex.values;
+  const extensions = element.behaviour.extensionElements?.values;
   if (!extensions) return result;
-
   for (const ext of extensions) {
     switch (ext.$type) {
       case 'camunda:Properties':
-        if ((_ext$values = ext.values) !== null && _ext$values !== void 0 && _ext$values.length) result.properties = new _IOProperties.default(element, ext);
+        if (ext.values?.length) result.properties = new _IOProperties.default(element, ext);
         break;
-
       case 'camunda:InputOutput':
         result.io = new _IO.InputOutput(element.id, ext, context);
         break;
-
       case 'camunda:FormData':
-        if ((_ext$fields = ext.fields) !== null && _ext$fields !== void 0 && _ext$fields.length) result.form = new _IOForm.default(element, ext);
+        if (ext.fields?.length) result.form = new _IOForm.default(element, ext);
         break;
-
       case 'camunda:Connector':
         {
           const {
@@ -287,16 +252,13 @@ function getExtensions(element, context) {
         }
     }
   }
-
   return result;
 }
-
 class FormatActivity {
   constructor(activity) {
     this.activity = activity;
     this.resultVariable = activity.behaviour.resultVariable || '_' + activity.id;
     let timeCycles;
-
     if (activity.eventDefinitions) {
       for (const ed of activity.eventDefinitions.filter(e => e.type === 'bpmn:TimerEventDefinition')) {
         if (!('timeCycle' in ed)) continue;
@@ -304,13 +266,9 @@ class FormatActivity {
         timeCycles.push(ed.timeCycle);
       }
     }
-
     this.timeCycles = timeCycles;
   }
-
   resolve(elementApi) {
-    var _documentation$, _user, _groups;
-
     let user, groups, assigneeValue, description;
     const activity = this.activity;
     const {
@@ -323,30 +281,26 @@ class FormatActivity {
     if (candidateUsers) user = resolveAndSplit(elementApi, candidateUsers);
     if (candidateGroups) groups = resolveAndSplit(elementApi, candidateGroups);
     if (assignee) assigneeValue = elementApi.resolveExpression(assignee);
-    if (documentation) description = (_documentation$ = documentation[0]) === null || _documentation$ === void 0 ? void 0 : _documentation$.text;
+    if (documentation) description = documentation[0]?.text;
     let expireAt;
     let timeCycles = this.timeCycles;
-
     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();
-
         if (!expireAt || expireAtDt < expireAt) expireAt = expireAtDt;
       }
     }
-
     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) && {
+      }),
+      ...(user?.length && {
         candidateUsers: user
       }),
-      ...(((_groups = groups) === null || _groups === void 0 ? void 0 : _groups.length) && {
+      ...(groups?.length && {
         candidateGroups: groups
       }),
       ...(!elementApi.content.description && description && {
@@ -360,17 +314,12 @@ class FormatActivity {
       })
     };
   }
-
 }
-
 class FormatProcess {
   constructor(bp) {
     this.process = bp;
   }
-
   resolve(elementApi) {
-    var _documentation$2, _user2, _groups2;
-
     let user, groups, description;
     const bp = this.process;
     const {
@@ -380,13 +329,13 @@ class FormatProcess {
     } = bp.behaviour;
     if (candidateStarterUsers) user = resolveAndSplit(elementApi, candidateStarterUsers);
     if (candidateStarterGroups) groups = resolveAndSplit(elementApi, candidateStarterGroups);
-    if (documentation) description = (_documentation$2 = documentation[0]) === null || _documentation$2 === void 0 ? void 0 : _documentation$2.text;
+    if (documentation) description = documentation[0]?.text;
     return {
       resultVariable: this.resultVariable,
-      ...(((_user2 = user) === null || _user2 === void 0 ? void 0 : _user2.length) && {
+      ...(user?.length && {
         candidateStarterUsers: user
       }),
-      ...(((_groups2 = groups) === null || _groups2 === void 0 ? void 0 : _groups2.length) && {
+      ...(groups?.length && {
         candidateStarterGroups: groups
       }),
       ...(!elementApi.content.description && description && {
@@ -394,9 +343,7 @@ class FormatProcess {
       })
     };
   }
-
 }
-
 function resolveAndSplit(elementApi, str) {
   if (Array.isArray(str)) return str.filter(Boolean);
   if (typeof str !== 'string') return;
@@ -405,10 +352,7 @@ function resolveAndSplit(elementApi, str) {
   if (typeof resolved !== 'string') return;
   return resolved.split(',').map(g => g.trim && g.trim().toLowerCase()).filter(Boolean);
 }
-
 function extendFn(behaviour, context) {
-  var _behaviour$extensionE;
-
   if (behaviour.$type === 'bpmn:StartEvent' && behaviour.eventDefinitions) {
     const timer = behaviour.eventDefinitions.find(({
       type,
@@ -418,21 +362,18 @@ function extendFn(behaviour, context) {
       scheduledStart: timer.behaviour.timeCycle
     });
   }
-
-  if (!Array.isArray((_behaviour$extensionE = behaviour.extensionElements) === null || _behaviour$extensionE === void 0 ? void 0 : _behaviour$extensionE.values)) return;
+  if (!Array.isArray(behaviour.extensionElements?.values)) return;
   const inputOutput = behaviour.extensionElements.values.find(el => el.$type === 'camunda:InputOutput');
   const connector = behaviour.extensionElements.values.find(el => el.$type === 'camunda:Connector');
   if (inputOutput) registerIOScripts(behaviour.id, context, inputOutput.$type, inputOutput);
   if (connector) registerIOScripts(behaviour.id, context, connector.$type, connector.inputOutput);
 }
-
 function registerIOScripts(parentId, context, type, ioBehaviour) {
   if (!ioBehaviour) return;
   const {
     inputParameters = [],
     outputParameters = []
   } = ioBehaviour;
-
   for (const {
     $type,
     name,
@@ -444,12 +385,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

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Connector;
-
 var _Errors = require("./Errors");
-
 function Connector(connectorId, io, activity, executionMessage) {
   if (!(this instanceof Connector)) return new Connector(connectorId, io, activity, executionMessage);
   this.connectorId = connectorId;
@@ -14,7 +12,6 @@ function Connector(connectorId, io, activity, executionMessage) {
   this.activity = activity;
   this.executionMessage = executionMessage;
 }
-
 Connector.prototype.execute = async function execute(...args) {
   const callback = args.pop();
   args.push(formatCallback);
@@ -25,20 +22,18 @@ Connector.prototype.execute = async function execute(...args) {
   const executionMessage = this.executionMessage;
   const serviceFunction = environment.services[connectorId];
   if (!serviceFunction) return callback(new _Errors.NotImplemented(connectorId));
-
   try {
     const input = io && (await io.getInput(activity, executionMessage));
     await serviceFunction.call(activity, input, ...args);
   } catch (err) {
     return callback(err);
   }
-
   async function formatCallback(serviceErr, result) {
     if (serviceErr) return callback(serviceErr);
-    if (!(io !== null && io !== void 0 && io.output.length)) return callback(null, result);
-
+    if (!io?.output.length) return callback(null, result);
     try {
-      const formattedResult = await io.getOutput(activity, { ...executionMessage,
+      const formattedResult = await io.getOutput(activity, {
+        ...executionMessage,
         ...result
       });
       return callback(null, formattedResult);

package/dist/src/Errors.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NotImplemented = void 0;
-
 class NotImplemented extends Error {
   constructor(serviceId) {
     super(`${serviceId} service function not found`);
@@ -13,7 +12,5 @@ class NotImplemented extends Error {
       statusCode: 501
     };
   }
-
 }
-
 exports.NotImplemented = NotImplemented;

package/dist/src/FlowScripts.js

@@ -6,16 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.FlowScripts = FlowScripts;
 exports.JavaScript = JavaScript;
 exports.JavaScriptResource = JavaScriptResource;
-
 var _path = require("path");
-
 var _fs = require("fs");
-
 var _vm = require("vm");
-
 const kSyntaxError = Symbol.for('syntax error');
 const kResources = Symbol.for('resources base');
-
 class FlowScriptError extends Error {
   constructor(fromErr) {
     super(fromErr.message);
@@ -25,22 +20,17 @@ class FlowScriptError extends Error {
       get() {
         return fromErr.stack && fromErr.stack.split('\n').slice(0, 7).join('\n');
       }
-
     });
     Object.defineProperty(this, 'code', {
       get() {
         return 'EFLOW_SCRIPT';
       }
-
     });
   }
-
   toString() {
     return '[FlowScriptError] ' + this.message + '\n' + this.stack;
   }
-
 }
-
 class FlowSyntaxError extends Error {
   constructor(fromErr) {
     super(fromErr.message);
@@ -50,22 +40,17 @@ class FlowSyntaxError extends Error {
       get() {
         return fromErr.stack && fromErr.stack.split('\n').slice(0, 6).join('\n');
       }
-
     });
     Object.defineProperty(this, 'code', {
       get() {
         return 'EFLOW_SCRIPT';
       }
-
     });
   }
-
   toString() {
     return '[FlowSyntaxError] ' + this.message + '\n' + this.stack;
   }
-
 }
-
 function FlowScripts(flowName, resourceBase, runContext, timeout = 60000) {
   this._name = flowName;
   this._scripts = {};
@@ -73,14 +58,12 @@ function FlowScripts(flowName, resourceBase, runContext, timeout = 60000) {
   this._runContext = runContext;
   this[kResources] = resourceBase;
 }
-
 FlowScripts.prototype.register = function register({
   id,
   type,
   behaviour
 }) {
   let language, scriptBody, resource;
-
   switch (type) {
     case 'bpmn:SequenceFlow':
       {
@@ -90,7 +73,6 @@ FlowScripts.prototype.register = function register({
         resource = behaviour.conditionExpression.resource;
         break;
       }
-
     default:
       {
         language = behaviour.scriptFormat;
@@ -98,13 +80,11 @@ FlowScripts.prototype.register = function register({
         resource = behaviour.resource;
       }
   }
-
   if (!language) language = 'javascript';
   if (!['js', 'javascript'].includes(language.toLowerCase().trim())) return;
   language = 'javascript';
   const name = this._name;
   const filename = `${name}/${type}/${id}`;
-
   if (scriptBody) {
     this._scripts[id] = new JavaScript(name, scriptBody, this._runContext, {
       filename,
@@ -117,37 +97,33 @@ FlowScripts.prototype.register = function register({
     });
   }
 };
-
 FlowScripts.prototype.getScript = function getScript(scriptType, {
   id
 }) {
   return this._scripts[id];
 };
-
 function JavaScript(flowName, scriptBody, runContext, options) {
   this.flowName = flowName;
   this._runContext = runContext;
   this.timeout = options && options.timeout;
-
   try {
     this.script = new _vm.Script(scriptBody, options);
   } catch (err) {
     this[kSyntaxError] = new FlowSyntaxError(err);
   }
 }
-
 JavaScript.prototype.execute = async function execute(executionContext, callback) {
   let callbackCalled;
   const syntaxError = this[kSyntaxError];
   if (syntaxError) return next(syntaxError);
-
   try {
-    await this.script.runInNewContext({ ...executionContext,
+    await this.script.runInNewContext({
+      ...executionContext,
       Date,
       console: {
         log: console.log // eslint-disable-line no-console
-
       },
+
       Buffer: {
         from: Buffer.from
       },
@@ -160,15 +136,13 @@ JavaScript.prototype.execute = async function execute(executionContext, callback
   } catch (err) {
     return next(new FlowScriptError(err));
   }
-
-  async function next(err, ...args) {
+  function next(err, ...args) {
     if (callbackCalled) return;
     callbackCalled = true;
     if (err) return callback(err);
     callback(null, ...args);
   }
 };
-
 function JavaScriptResource(flowName, resource, resourceBase, runContext, options) {
   this.flowName = flowName;
   this.resource = resource;
@@ -176,7 +150,6 @@ function JavaScriptResource(flowName, resource, resourceBase, runContext, option
   this._runContext = runContext;
   this[kResources] = resourceBase;
 }
-
 JavaScriptResource.prototype.execute = async function execute(executionContext, callback) {
   try {
     var scriptBody = await _fs.promises.readFile((0, _path.join)(this[kResources], executionContext.resolveExpression(this.resource))); // eslint-disable-line no-var
@@ -186,8 +159,8 @@ JavaScriptResource.prototype.execute = async function execute(executionContext,
     } = this.options;
     return callback(new Error(`${filename}: script resource ${this.resource} not found`));
   }
-
-  const script = new JavaScript(this.flowName, scriptBody, this._runContext, { ...this.options,
+  const script = new JavaScript(this.flowName, scriptBody, this._runContext, {
+    ...this.options,
     filename: this.resource
   });
   return script.execute(executionContext, callback);

package/dist/src/IO.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InputOutput = exports.IOScript = exports.IOMap = exports.IOList = exports.IOBase = void 0;
-
 class InputOutput {
   constructor(parentId, behaviour, context) {
     this.parentId = parentId;
@@ -16,40 +15,33 @@ class InputOutput {
     this.input = this._map(parentId, inputParameters, 'input', context);
     this.output = this._map(parentId, outputParameters, 'output', context);
   }
-
   async getInput(activity, executionMessage) {
     const input = this.input;
     const values = await Promise.all(input.map(parm => parm.getValue(activity, executionMessage)));
     return values.reduce((result, parm) => Object.assign(result, parm), {});
   }
-
   async getOutput(activity, executionMessage) {
     const output = this.output;
     const values = await Promise.all(output.map(parm => parm.getValue(activity, executionMessage)));
     return values.reduce((result, parm) => Object.assign(result, parm), {});
   }
-
   _map(parentId, list, ioType, context) {
     const mapped = [];
     if (!list) return mapped;
-
     for (const parm of list) {
       const definition = parm.definition;
       const type = definition && definition.$type;
-
       switch (type) {
         case 'camunda:Map':
           {
             mapped.push(new IOMap(parm));
             break;
           }
-
         case 'camunda:List':
           {
             mapped.push(new IOList(parm));
             break;
           }
-
         case 'camunda:Script':
           {
             const id = `${parentId}/${ioType}/${type}/${parm.name}`;
@@ -64,54 +56,44 @@ class InputOutput {
               type: parm.$type,
               behaviour: {
                 scriptFormat,
-                ...(value ? {
+                ...(value && {
                   script: value
-                } : undefined),
-                ...(resource ? {
+                }),
+                ...(resource && {
                   resource
-                } : undefined)
+                })
               }
             });
             mapped.push(new IOScript(parm, id));
             break;
           }
-
         default:
           {
             mapped.push(new IOBase(parm));
           }
       }
     }
-
     return mapped;
   }
-
 }
-
 exports.InputOutput = InputOutput;
-
 class IOBase {
   constructor(parm) {
     this.name = parm.name;
     this.type = parm.definition && parm.definition.$type || 'string';
     this.behaviour = parm;
   }
-
   getValue(activity, executionMessage) {
     return {
       [this.name]: activity.environment.resolveExpression(this.behaviour.value, executionMessage)
     };
   }
-
 }
-
 exports.IOBase = IOBase;
-
 class IOMap extends IOBase {
   constructor(parm) {
     super(parm);
   }
-
   getValue(activity, executionMessage) {
     const name = this.name;
     const entries = this.behaviour.definition.entries;
@@ -120,18 +102,15 @@ class IOMap extends IOBase {
     };
     const environment = activity.environment;
     const result = {};
-
     for (const {
       key,
       value
     } of entries) {
       if (!key) continue;
       const val = environment.resolveExpression(value, executionMessage);
-
       if (key in result) {
         if (val === undefined) continue;
         const current = result[key];
-
         if (Array.isArray(current)) {
           current.push(val);
         } else {
@@ -143,21 +122,16 @@ class IOMap extends IOBase {
         result[key] = val;
       }
     }
-
     return {
       [name]: result
     };
   }
-
 }
-
 exports.IOMap = IOMap;
-
 class IOList extends IOBase {
   constructor(parm) {
     super(parm);
   }
-
   getValue(activity, executionMessage) {
     const name = this.name;
     const items = this.behaviour.definition.items;
@@ -166,28 +140,22 @@ class IOList extends IOBase {
       [name]: result
     };
     const environment = activity.environment;
-
     for (const item of items) {
       const val = environment.resolveExpression(item.value, executionMessage);
       if (val !== undefined) result.push(val);
     }
-
     return {
       [name]: result
     };
   }
-
 }
-
 exports.IOList = IOList;
-
 class IOScript extends IOBase {
   constructor(parm, scriptId) {
     super(parm);
     this.id = scriptId;
     this.script = true;
   }
-
   getValue(activity, executionMessage) {
     const definition = this.behaviour.definition;
     const name = this.name;
@@ -221,12 +189,9 @@ class IOScript extends IOBase {
         });
       });
     });
-
     function resolveExpression(expression) {
       return environment.resolveExpression(expression, scope);
     }
   }
-
 }
-
 exports.IOScript = IOScript;

package/dist/src/IOForm.js

@@ -4,22 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _IOProperties = _interopRequireDefault(require("./IOProperties.js"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 class IOForm {
   constructor(activity, behaviour) {
     this.activity = activity;
     this.behaviour = behaviour;
   }
-
   resolve(elementApi) {
     const form = {};
-
     for (const field of this.behaviour.fields) {
-      const f = form[field.id] = { ...field,
+      const f = form[field.id] = {
+        ...field,
         ...(field.label && {
           defaultValue: elementApi.resolveExpression(field.label)
         }),
@@ -27,15 +23,11 @@ class IOForm {
           defaultValue: elementApi.resolveExpression(field.defaultValue)
         })
       };
-
       if (f.properties) {
         f.properties = new _IOProperties.default(this.activity, f.properties).resolve(elementApi);
       }
     }
-
     return form;
   }
-
 }
-
 exports.default = IOForm;

package/dist/src/IOProperties.js

@@ -4,16 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 class IOProperties {
   constructor(activity, behaviour) {
     this.activity = activity;
     this.behaviour = behaviour;
   }
-
   resolve(elementApi) {
     const properties = {};
-
     for (const {
       id,
       name,
@@ -21,10 +18,7 @@ class IOProperties {
     } of this.behaviour.values) {
       properties[id || name] = elementApi.resolveExpression(value);
     }
-
     return properties;
   }
-
 }
-
 exports.default = IOProperties;

package/dist/src/ServiceExpression.js

@@ -4,16 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ServiceExpression;
-
 var _Errors = require("./Errors");
-
 function ServiceExpression(activity) {
   if (!(this instanceof ServiceExpression)) return new ServiceExpression(activity);
   this.activity = activity;
   this.type = `${activity.type}:expression`;
   this.expression = activity.behaviour.expression;
 }
-
 ServiceExpression.prototype.execute = function execute(executionMessage, callback) {
   try {
     const expression = this.expression;
@@ -22,7 +19,6 @@ ServiceExpression.prototype.execute = function execute(executionMessage, callbac
   } 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}`);
@@ -70,26 +72,22 @@ class OnifyElementExtensions {
       activity.behaviour.Service = Service;
     }
   }
-  activate() {
+  activate(message) {
     const activity = this.activity;
     const broker = activity.broker;
     const formatQ = activity.broker.getQueue('format-run-q');
 
-    activity.on('enter', async (elementApi) => {
-      formatQ.queueMessage({routingKey: 'run.enter.format'}, {endRoutingKey: 'run.enter.complete'}, {persistent: false});
-
-      try {
-        var format = await this._onEnter(elementApi);
-      } catch (err) {
-        return broker.publish('format', 'run.enter.error', {error: err}, {persistent: false});
-      }
-
-      broker.publish('format', 'run.enter.complete', format, {persistent: false});
-    }, {consumerTag: '_onify-extension-on-enter'});
+    if (message.fields.redelivered && message.fields.routingKey === 'run.start') {
+      activity.on('start', (elementApi) => {
+        this._formatOnEnter(broker, formatQ, elementApi);
+      }, {consumerTag: '_onify-extension-on-enter'});
+    } else {
+      activity.on('enter', (elementApi) => {
+        this._formatOnEnter(broker, formatQ, elementApi);
+      }, {consumerTag: '_onify-extension-on-enter'});
+    }
 
     activity.on('activity.execution.completed', async (elementApi) => {
-      if (elementApi.fields.redelivered) return;
-
       formatQ.queueMessage({routingKey: 'run.end.format'}, {endRoutingKey: 'run.end.complete'}, {persistent: false});
 
       try {
@@ -106,6 +104,17 @@ class OnifyElementExtensions {
     broker.cancel('_onify-extension-on-enter');
     broker.cancel('_onify-extension-on-executed');
   }
+  async _formatOnEnter(broker, formatQ, elementApi) {
+    formatQ.queueMessage({routingKey: 'run.enter.format'}, {endRoutingKey: 'run.enter.complete'}, {persistent: false});
+
+    try {
+      var format = await this._onEnter(elementApi);
+    } catch (err) {
+      return broker.publish('format', 'run.enter.error', {error: err}, {persistent: false});
+    }
+
+    broker.publish('format', 'run.enter.complete', format, {persistent: false});
+  }
   async _onEnter(elementApi) {
     const {format, properties, io, form} = this.extensions;
 
@@ -176,7 +185,6 @@ function getExtensions(element, context) {
   const extensions = element.behaviour.extensionElements?.values;
   if (!extensions) return result;
 
-
   for (const ext of extensions) {
     switch (ext.$type) {
       case 'camunda:Properties':
@@ -236,7 +244,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 +253,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)}),
@@ -267,7 +276,6 @@ class FormatProcess {
       candidateStarterGroups,
     } = bp.behaviour;
 
-
     if (candidateStarterUsers) user = resolveAndSplit(elementApi, candidateStarterUsers);
     if (candidateStarterGroups) groups = resolveAndSplit(elementApi, candidateStarterGroups);
     if (documentation) description = documentation[0]?.text;
@@ -323,8 +331,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": "2.0.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.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",
-    "bpmn-moddle": "^7.1.2",
-    "c8": "^7.11.3",
-    "camunda-bpmn-moddle": "^6.1.2",
-    "chai": "^4.3.6",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.20.2",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/register": "^7.18.9",
+    "bpmn-elements-8-1": "npm:bpmn-elements@8.1",
+    "bpmn-engine": "^15.1.0",
+    "bpmn-engine-14": "npm:bpmn-engine@14",
+    "bpmn-moddle": "^7.1.3",
+    "c8": "^7.12.0",
+    "camunda-bpmn-moddle": "^7.0.1",
+    "chai": "^4.3.7",
     "chronokinesis": "^3.1.2",
     "debug": "^4.3.4",
-    "eslint": "^7.32.0",
-    "mocha": "^10.0.0",
+    "eslint": "^8.27.0",
+    "mocha": "^10.1.0",
     "mocha-cakes-2": "^3.3.0",
-    "moddle-context-serializer": "^2.1.0",
-    "nock": "^13.2.6"
+    "moddle-context-serializer": "^2.1.0"
   },
   "dependencies": {
-    "cron-parser": "^4.4.0"
+    "cron-parser": "^4.6.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}),
             },
           });
 

package/CHANGELOG.md

@@ -1,17 +0,0 @@
-Changelog
-=========
-
-# 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