@onify/flow-extensions 7.1.0 → 8.0.1

package/FlowScripts.d.ts

@@ -0,0 +1 @@
+import './types/index.js';

package/README.md

@@ -11,10 +11,14 @@
 
 ## Bpmn engine example
 
-```js
-const { Engine } = require('bpmn-engine');
-const { extensions } = require('@onify/flow-extensions');
-const FlowScripts = require('@onify/flow-extensions/dist/src/FlowScripts');
+```javascript
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { Engine } from 'bpmn-engine';
+import { extensions } from '@onify/flow-extensions';
+import { FlowScripts } from '@onify/flow-extensions/FlowScripts';
+
+const nodeRequire = createRequire(fileURLToPath(import.meta.url));
 
 const source = `
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
@@ -23,7 +27,7 @@ const source = `
   <process id="theProcess" isExecutable="true">
     <serviceTask id="task1" camunda:expression="\${environment.services.serviceFn}" camunda:resultVariable="result" />
     <sequenceFlow id="to-task2" sourceRef="task1" targetRef="task2" />
-    <scriptTask id="task2" camunda:resultVariable="out">
+    <scriptTask id="task2" camunda:resultVariable="out" scriptFormat="js">
       <script>
         next(null, myContextFn());
       </script>
@@ -36,7 +40,7 @@ const engine = new Engine({
   name,
   source,
   moddleOptions: {
-    camunda: require('camunda-bpmn-moddle/resources/camunda.json'),
+    camunda: nodeRequire('camunda-bpmn-moddle/resources/camunda.json'),
   },
   services: {
     serviceFn(scope, callback) {
@@ -61,12 +65,15 @@ engine.execute((err, instance) => {
 
 ## Extract scripts with extend function
 
-```js
-const { extendFn } = require('@onify/flow-extensions');
+```javascript
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import BpmnModdle from 'bpmn-moddle';
+import * as Elements from 'bpmn-elements';
+import { Serializer, TypeResolver } from 'moddle-context-serializer';
+import { extendFn } from '@onify/flow-extensions';
 
-const BpmnModdle = require('bpmn-moddle');
-const Elements = require('bpmn-elements');
-const { default: Serializer, TypeResolver } = require('moddle-context-serializer');
+const nodeRequire = createRequire(fileURLToPath(import.meta.url));
 
 const source = `
 <definitions id="Def_0" xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
@@ -97,7 +104,7 @@ const source = `
       </extensionElements>
     </serviceTask>
     <sequenceFlow id="to-task2" sourceRef="task1" targetRef="task2" />
-    <scriptTask id="task2" camunda:resultVariable="out">
+    <scriptTask id="task2" camunda:resultVariable="out" scriptFormat="js">
       <script>
         next(null, 2);
       </script>
@@ -105,14 +112,85 @@ const source = `
   </process>
 </definitions>`;
 
-(async () => {
-  const moddle = await getModdleContext(source, {
-    camunda: require('camunda-bpmn-moddle/resources/camunda.json'),
+getScripts(source).then(console.log).catch(console.error);
+
+async function getScripts(bpmnSource) {
+  const moddle = await getModdleContext(bpmnSource, {
+    camunda: nodeRequire('camunda-bpmn-moddle/resources/camunda.json'),
   });
 
   const serialized = Serializer(moddle, TypeResolver(Elements), extendFn);
-  console.log(serialized.elements.scripts);
-})();
+  return serialized.elements.scripts;
+}
+
+function getModdleContext(source, options) {
+  const bpmnModdle = new BpmnModdle(options);
+  return bpmnModdle.fromXML(Buffer.isBuffer(source) ? source.toString() : source.trim());
+}
+```
+
+## Extract timers
+
+```javascript
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import BpmnModdle from 'bpmn-moddle';
+import * as Elements from 'bpmn-elements';
+import { Serializer, TypeResolver } from 'moddle-context-serializer';
+import { extendFn, OnifyTimerEventDefinition } from '@onify/flow-extensions';
+
+const nodeRequire = createRequire(fileURLToPath(import.meta.url));
+
+const source = `
+<definitions id="Def_0" xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+  xmlns:camunda="http://camunda.org/schema/1.0/bpmn"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  targetNamespace="http://bpmn.io/schema/bpmn">
+  <process id="cycle-1" name="Onify start at time cycle" isExecutable="true" camunda:historyTimeToLive="PT180M">
+    <startEvent id="start">
+      <timerEventDefinition>
+        <timeCycle xsi:type="tFormalExpression">0 1 * * *</timeCycle>
+      </timerEventDefinition>
+    </startEvent>
+    <sequenceFlow id="to-task" sourceRef="start" targetRef="task" />
+    <userTask id="task" />
+    <boundaryEvent id="bound-timer" cancelActivity="false" attachedToRef="task">
+      <timerEventDefinition>
+        <timeDuration xsi:type="tFormalExpression">R3/PT1M</timeDuration>
+      </timerEventDefinition>
+    </boundaryEvent>
+    <sequenceFlow id="to-wait" sourceRef="task" targetRef="wait" />
+    <intermediateThrowEvent id="timer">
+      <timerEventDefinition>
+        <timeCycle xsi:type="tFormalExpression">\${environment.settings.postpone}</timeCycle>
+      </timerEventDefinition>
+    </intermediateThrowEvent>
+    <sequenceFlow id="to-end" sourceRef="wait" targetRef="end" />
+    <endEvent id="end" />
+  </process>
+</definitions>`;
+
+getTimers(source).then(console.log).catch(console.error);
+
+const dummyEventActivity = { broker: {}, environment: { Logger() {} } };
+
+async function getTimers(bpmnSource) {
+  const moddle = await getModdleContext(bpmnSource, {
+    camunda: nodeRequire('camunda-bpmn-moddle/resources/camunda.json'),
+  });
+
+  const serialized = Serializer(moddle, TypeResolver(Elements), extendFn);
+
+  for (const t of serialized.elements.timers) {
+    const ed = new OnifyTimerEventDefinition(dummyEventActivity, t.timer);
+
+    try {
+      t.parsed = ed.parse(t.timer.timerType, t.timer.value);
+    } catch {}
+  }
+
+  return serialized.elements.timers;
+}
 
 function getModdleContext(source, options) {
   const bpmnModdle = new BpmnModdle(options);
@@ -122,11 +200,15 @@ function getModdleContext(source, options) {
 
 ## Extend sequence flow with properties and take listeners
 
-```js
-const { OnifySequenceFlow, extensions } = require('@onify/flow-extensions');
-const FlowScripts = require('@onify/flow-extensions/dist/src/FlowScripts');
-const { Engine } = require('bpmn-engine');
-const Elements = require('bpmn-elements');
+```javascript
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { Engine } from 'bpmn-engine';
+import * as Elements from 'bpmn-elements';
+import { OnifySequenceFlow, extensions } from '@onify/flow-extensions';
+import { FlowScripts } from '@onify/flow-extensions/FlowScripts';
+
+const nodeRequire = createRequire(fileURLToPath(import.meta.url));
 
 const source = `
 <?xml version="1.0" encoding="UTF-8"?>
@@ -191,7 +273,7 @@ const engine = new Engine({
   name: 'sequence flow extension',
   source,
   moddleOptions: {
-    camunda: require('camunda-bpmn-moddle/resources/camunda.json'),
+    camunda: nodeRequire('camunda-bpmn-moddle/resources/camunda.json'),
   },
   extensions: {
     onify: extensions,
@@ -201,6 +283,11 @@ const engine = new Engine({
     ...Elements,
     SequenceFlow: OnifySequenceFlow,
   },
+  variables: {
+    required: {
+      input: true,
+    },
+  },
 });
 
 engine.execute((err, instance) => {

package/dist/Connector.js

@@ -30,7 +30,7 @@ Connector.prototype.execute = async function execute(...args) {
   }
   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,

package/dist/ExecutionListeners.js

@@ -38,7 +38,7 @@ class Listener {
   }
   _getFields(environment, scope) {
     const fields = this.extension.fields;
-    if (!(fields !== null && fields !== void 0 && fields.length)) return;
+    if (!fields?.length) return;
     const result = {};
     for (const {
       name,

package/dist/FlowScripts.js

@@ -105,7 +105,7 @@ FlowScripts.prototype.getScript = function getScript(scriptType, {
 function JavaScript(flowName, scriptBody, runContext, options) {
   this.flowName = flowName;
   this._runContext = runContext;
-  this.timeout = options === null || options === void 0 ? void 0 : options.timeout;
+  this.timeout = options?.timeout;
   try {
     this.script = new _vm.Script(scriptBody, options);
   } catch (err) {

package/dist/OnifyBoundaryEventExtensions.js

@@ -28,7 +28,7 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
     }, {
       consumerTag: '_onify-extension-on-executed'
     });
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onStart) {
+    if (executionListeners?.onStart) {
       activity.on('start', async elementApi => {
         try {
           await executionListeners.execute('start', elementApi);
@@ -39,7 +39,7 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
         consumerTag: '_onify-extension-on-listenerstart'
       });
     }
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onEnd) {
+    if (executionListeners?.onEnd) {
       activity.on('end', elementApi => {
         this._executeExecutionListener('end', elementApi, formatQ);
       }, {
@@ -62,7 +62,6 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
     });
   }
   _onEnterSync(elementApi) {
-    var _io$output;
     const {
       format,
       properties,
@@ -77,7 +76,7 @@ class OnifyBoundaryEventExtensions extends _OnifyElementExtensions.OnifyElementE
       });
       Object.assign(elementApi.content, result);
     }
-    if (io !== null && io !== void 0 && (_io$output = io.output) !== null && _io$output !== void 0 && _io$output.length) {
+    if (io?.output?.length) {
       result.assignToOutput = true;
     }
     return result;

package/dist/OnifyElementExtensions.js

@@ -35,14 +35,14 @@ class OnifyElementExtensions {
     }, {
       consumerTag: '_onify-extension-on-executed'
     });
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onStart) {
+    if (executionListeners?.onStart) {
       activity.on('start', elementApi => {
         this._executeExecutionListener('start', elementApi);
       }, {
         consumerTag: '_onify-extension-on-listenerstart'
       });
     }
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onEnd) {
+    if (executionListeners?.onEnd) {
       activity.on('end', elementApi => {
         this._executeExecutionListener('end', elementApi);
       }, {
@@ -118,15 +118,14 @@ class OnifyElementExtensions {
       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;
       }
     }
@@ -143,7 +142,7 @@ class OnifyElementExtensions {
       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

package/dist/OnifyScriptTask.js

@@ -0,0 +1,3 @@
+"use strict";
+
+var _ScriptTask = require("bpmn-elements/tasks/ScriptTask.js");

package/dist/OnifySequenceFlow.js

@@ -13,8 +13,7 @@ class OnifySequenceFlow extends _bpmnElements.SequenceFlow {
     this._activate();
   }
   _activate() {
-    var _this$extensions$list;
-    if (!((_this$extensions$list = this.extensions.listeners) !== null && _this$extensions$list !== void 0 && _this$extensions$list.onTake)) return;
+    if (!this.extensions.listeners?.onTake) return;
     this.broker.subscribeTmp('event', 'flow.take', (_, msg) => {
       this._executeListeners(msg);
     }, {
@@ -32,14 +31,24 @@ class OnifySequenceFlow extends _bpmnElements.SequenceFlow {
   evaluate(fromMessage, callback) {
     const properties = this.extensions.properties;
     if (!properties) return super.evaluate(fromMessage, callback);
-    super.evaluate(fromMessage, (err, result) => {
+    try {
+      const preProperties = properties.resolve(this.getApi(fromMessage));
+      var evaluateMessage = fromMessage;
+      evaluateMessage.content.properties = {
+        ...fromMessage.content.properties,
+        ...preProperties
+      };
+    } catch (err) {
+      return callback(err);
+    }
+    super.evaluate(evaluateMessage, (err, result) => {
       if (err) return callback(err);
       try {
         let overriddenResult = result ? {} : false;
         if (result) {
           overriddenResult = {
             ...(typeof result === 'object' && result),
-            properties: properties.resolve(this.getApi(fromMessage))
+            properties: properties.resolve(this.getApi(evaluateMessage))
           };
         }
         return callback(err, overriddenResult);

package/dist/OnifySubProcessExtensions.js

@@ -25,12 +25,12 @@ class OnifySubProcessExtensions extends _OnifyElementExtensions.OnifyElementExte
     this._setupListener(broker, 'activity.execution.completed', elementApi => {
       return this._onExecutionCompleted(elementApi);
     }, '_onify-extension-on-executed');
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onStart) {
+    if (executionListeners?.onStart) {
       this._setupListener(broker, 'activity.start', elementApi => {
         this._executeExecutionListener('start', elementApi);
       }, '_onify-extension-on-listenerstart');
     }
-    if (executionListeners !== null && executionListeners !== void 0 && executionListeners.onEnd) {
+    if (executionListeners?.onEnd) {
       this._setupListener(broker, 'activity.end', elementApi => {
         this._executeExecutionListener('end', elementApi);
       }, '_onify-extension-on-listenerend');

package/dist/OnifyTimerEventDefinition.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.OnifyTimerEventDefinition = void 0;
-var _bpmnElements = require("bpmn-elements");
 var _cronParser = _interopRequireDefault(require("cron-parser"));
+var _bpmnElements = require("bpmn-elements");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
   constructor(activity, def) {
@@ -17,8 +17,7 @@ class OnifyTimerEventDefinition extends _bpmnElements.TimerEventDefinition {
   parse(timerType, value) {
     let cron;
     if (timerType === 'timeCycle' && (cron = _cronParser.default.parseString(value))) {
-      var _cron$expressions;
-      if ((_cron$expressions = cron.expressions) !== null && _cron$expressions !== void 0 && _cron$expressions.length) {
+      if (cron.expressions?.length) {
         // cronParser.parseString expressions disregards seconds, so we have to parse again
         const expireAt = _cronParser.default.parseExpression(value).next().toDate();
         return {

package/dist/formatters.js

@@ -4,9 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FormatProcess = exports.FormatActivity = void 0;
-var _cronParser = _interopRequireDefault(require("cron-parser"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const iso8601cycle = /^\s*(R\d+\/)?P\w+/i;
 class FormatActivity {
   constructor(activity) {
     this.activity = activity;
@@ -14,8 +11,7 @@ class FormatActivity {
     let timeCycles;
     if (activity.eventDefinitions) {
       for (const ed of activity.eventDefinitions.filter(e => e.type === 'bpmn:TimerEventDefinition')) {
-        var _ed$supports;
-        if ((_ed$supports = ed.supports) !== null && _ed$supports !== void 0 && _ed$supports.includes('cron')) continue;
+        if (!ed.supports?.includes('cron')) continue;
         if (!('timeCycle' in ed)) continue;
         timeCycles = timeCycles || [];
         timeCycles.push(ed.timeCycle);
@@ -24,7 +20,6 @@ class FormatActivity {
     this.timeCycles = timeCycles;
   }
   resolve(elementApi) {
-    var _documentation$, _user, _groups;
     let user, groups, assigneeValue, description;
     const activity = this.activity;
     const {
@@ -37,17 +32,7 @@ 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;
-    let expireAt;
-    const timeCycles = this.timeCycles;
-    if (timeCycles) {
-      for (const cycle of timeCycles) {
-        const cron = elementApi.resolveExpression(cycle);
-        if (!cron || iso8601cycle.test(cron)) continue;
-        const expireAtDt = _cronParser.default.parseExpression(cron).next().toDate();
-        if (!expireAt || expireAtDt < expireAt) expireAt = expireAtDt;
-      }
-    }
+    if (documentation) description = documentation[0]?.text;
     return {
       ...(this.resultVariable && {
         resultVariable: this.resultVariable
@@ -55,18 +40,15 @@ class FormatActivity {
       ...(scheduledStart && activity.parent.type === 'bpmn:Process' && {
         scheduledStart
       }),
-      ...(((_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 && {
         description: elementApi.resolveExpression(description)
       }),
-      ...(expireAt && {
-        expireAt
-      }),
       ...(assigneeValue && {
         assignee: assigneeValue
       })
@@ -83,7 +65,6 @@ class FormatProcess {
     }
   }
   resolve(elementApi) {
-    var _documentation$2, _user2, _groups2;
     let user, groups, description;
     const bp = this.process;
     const {
@@ -93,12 +74,12 @@ 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 {
-      ...(((_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 && {

package/dist/getExtensions.js

@@ -13,7 +13,6 @@ var _IOProperties = _interopRequireDefault(require("./IOProperties.js"));
 var _ServiceExpression = _interopRequireDefault(require("./ServiceExpression.js"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getExtensions(element, context) {
-  var _element$behaviour$ex, _ext$values, _ext$fields;
   const result = {};
   switch (element.type) {
     case 'bpmn:SequenceFlow':
@@ -28,18 +27,18 @@ function getExtensions(element, context) {
   const listeners = new _ExecutionListeners.default(element, context);
   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) {
     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':
           {

package/dist/index.js

@@ -37,7 +37,6 @@ function extensions(element, context) {
   }
 }
 function extendFn(behaviour, context) {
-  var _behaviour$extensionE;
   switch (behaviour.$type) {
     case 'bpmn:StartEvent':
       {
@@ -64,7 +63,7 @@ function extendFn(behaviour, context) {
         break;
       }
   }
-  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;
   let listener = 0;
   for (const extension of behaviour.extensionElements.values) {
     switch (extension.$type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/flow-extensions",
-  "version": "7.1.0",
+  "version": "8.0.1",
   "description": "Onify Flow extensions",
   "type": "module",
   "module": "src/index.js",
@@ -8,8 +8,16 @@
   "types": "./index.d.ts",
   "sideEffects": false,
   "exports": {
-    "import": "./src/index.js",
-    "require": "./dist/index.js"
+    ".": {
+      "types": "./types/index.d.ts",
+      "require": "./dist/index.js",
+      "import": "./src/index.js"
+    },
+    "./FlowScripts": {
+      "types": "./types/index.d.ts",
+      "require": "./dist/FlowScripts.js",
+      "import": "./dist/FlowScripts.js"
+    }
   },
   "scripts": {
     "test": "mocha -R dot",
@@ -17,6 +25,7 @@
     "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"
   },
@@ -38,36 +47,38 @@
   "license": "MIT",
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.23.4",
-    "@babel/core": "^7.23.7",
-    "@babel/preset-env": "^7.23.8",
+    "@babel/cli": "^7.23.9",
+    "@babel/core": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
     "@babel/register": "^7.23.7",
     "bpmn-elements-8-1": "npm:bpmn-elements@8.1",
-    "bpmn-engine": "^18.0.0",
+    "bpmn-engine": "^20.0.1",
     "bpmn-engine-14": "npm:bpmn-engine@14",
-    "bpmn-moddle": "^8.1.0",
+    "bpmn-moddle": "^9.0.1",
     "c8": "^9.1.0",
     "camunda-bpmn-moddle": "^7.0.1",
-    "chai": "^5.0.0",
+    "chai": "^5.0.3",
     "chronokinesis": "^6.0.0",
     "debug": "^4.3.4",
-    "eslint": "^8.56.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint": "^9.0.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"
   },
   "peerDependencies": {
-    "bpmn-elements": ">=8"
+    "bpmn-elements": "^14.0.0"
   },
   "dependencies": {
+    "@0dep/piso": "^0.1.3",
     "cron-parser": "^4.9.0"
   },
   "files": [
     "src",
     "dist",
-    "index.d.ts"
+    "types",
+    "FlowScripts.d.ts"
   ],
   "c8": {
     "exclude": [

package/src/OnifySequenceFlow.js

@@ -30,7 +30,18 @@ export class OnifySequenceFlow extends SequenceFlow {
     const properties = this.extensions.properties;
     if (!properties) return super.evaluate(fromMessage, callback);
 
-    super.evaluate(fromMessage, (err, result) => {
+    try {
+      const preProperties = properties.resolve(this.getApi(fromMessage));
+      var evaluateMessage = fromMessage;
+      evaluateMessage.content.properties = {
+        ...fromMessage.content.properties,
+        ...preProperties,
+      };
+    } catch (err) {
+      return callback(err);
+    }
+
+    super.evaluate(evaluateMessage, (err, result) => {
       if (err) return callback(err);
 
       try {
@@ -38,7 +49,7 @@ export class OnifySequenceFlow extends SequenceFlow {
         if (result) {
           overriddenResult = {
             ...(typeof result === 'object' && result),
-            properties: properties.resolve(this.getApi(fromMessage)),
+            properties: properties.resolve(this.getApi(evaluateMessage)),
           };
         }
         return callback(err, overriddenResult);

package/src/OnifyTimerEventDefinition.js

@@ -1,5 +1,5 @@
-import { TimerEventDefinition } from 'bpmn-elements';
 import cronParser from 'cron-parser';
+import { TimerEventDefinition } from 'bpmn-elements';
 
 export class OnifyTimerEventDefinition extends TimerEventDefinition {
   constructor(activity, def) {
@@ -14,12 +14,14 @@ export class OnifyTimerEventDefinition extends TimerEventDefinition {
       if (cron.expressions?.length) {
         // cronParser.parseString expressions disregards seconds, so we have to parse again
         const expireAt = cronParser.parseExpression(value).next().toDate();
+
         return {
           expireAt,
           delay: expireAt - Date.now(),
         };
       }
     }
+
     return super.parse(timerType, value);
   }
 }

package/src/formatters.js

@@ -1,7 +1,3 @@
-import cronParser from 'cron-parser';
-
-const iso8601cycle = /^\s*(R\d+\/)?P\w+/i;
-
 export class FormatActivity {
   constructor(activity) {
     this.activity = activity;
@@ -10,7 +6,7 @@ export class FormatActivity {
     let timeCycles;
     if (activity.eventDefinitions) {
       for (const ed of activity.eventDefinitions.filter((e) => e.type === 'bpmn:TimerEventDefinition')) {
-        if (ed.supports?.includes('cron')) continue;
+        if (!ed.supports?.includes('cron')) continue;
         if (!('timeCycle' in ed)) continue;
         timeCycles = timeCycles || [];
         timeCycles.push(ed.timeCycle);
@@ -28,25 +24,12 @@ export class FormatActivity {
     if (assignee) assigneeValue = elementApi.resolveExpression(assignee);
     if (documentation) description = documentation[0]?.text;
 
-    let expireAt;
-    const timeCycles = this.timeCycles;
-    if (timeCycles) {
-      for (const cycle of timeCycles) {
-        const cron = elementApi.resolveExpression(cycle);
-        if (!cron || iso8601cycle.test(cron)) continue;
-
-        const expireAtDt = cronParser.parseExpression(cron).next().toDate();
-        if (!expireAt || expireAtDt < expireAt) expireAt = expireAtDt;
-      }
-    }
-
     return {
       ...(this.resultVariable && { resultVariable: this.resultVariable }),
       ...(scheduledStart && activity.parent.type === 'bpmn:Process' && { scheduledStart }),
       ...(user?.length && { candidateUsers: user }),
       ...(groups?.length && { candidateGroups: groups }),
       ...(!elementApi.content.description && description && { description: elementApi.resolveExpression(description) }),
-      ...(expireAt && { expireAt }),
       ...(assigneeValue && { assignee: assigneeValue }),
     };
   }

package/{index.d.ts → types/index.d.ts}

@@ -1,5 +1,5 @@
 declare module '@onify/flow-extensions' {
-  import { SequenceFlow, TimerEventDefinition, ElementBase, Context, IExtension } from 'bpmn-elements';
+  import { SequenceFlow, TimerEventDefinition, ElementBase, IExtension } from 'bpmn-elements';
   import { extendFn as extendFunction } from 'moddle-context-serializer';
 
   export class OnifySequenceFlow extends SequenceFlow {}
@@ -9,3 +9,8 @@ declare module '@onify/flow-extensions' {
   export function extensions(element: ElementBase, context: Context): IExtension;
   export const extendFn: extendFunction;
 }
+
+declare module '@onify/flow-extensions/FlowScripts' {
+  import { IScripts } from 'bpmn-elements';
+  export var FlowScripts: IScripts;
+}

package/CHANGELOG.md

@@ -1,75 +0,0 @@
-# Changelog
-
-# 7.1.0
-
-- add process attribute `historyTimeToLive` to process environment variables when running
-- add process attribute `historyTimeToLive` as timer to definition context via `extendFn`, formatted as ISO8601 duration
-- use prettier since eslint will deprecate formatting rules in the next major release
-
-# 7.0.0
-
-Attempting to mitigate Boundary Event formatting interrupting normal execution flow. Asynchronous formatting prevents catching events from attached task. Should probably be done in bpmn-elements but the developer is busy.
-
-## Breaking
-
-- No async formatting on boundary events before end
-- Boundary event start execution listener will be executed but _without_ formatting capabilities and detached from execution. Occasional error will just be logged
-- Boundary event end execution listener is still executed _with_ formatting capabilities
-
-# 6.0.0
-
-- Require peer dependency `bpmn-elements >= 8`
-- Support timer event definition cron time cycle by overloading parse function. Requires `bpmn-elements >= 10`
-
-# 5.0.2
-
-- Correct package module file...
-
-# 5.0.1
-
-- Doh! Add neglected package.json file to common js dist folder
-
-# 5.0.0
-
-- Turn into module with exports for node
-- Add type declaration
-
-# 4.1.0
-
-- Support sequence flow properties and take execution listener. Requires `bpmn-elements >= 9.2`
-
-# 4.0.0
-
-- make sure sub-process extensions are only triggered once. Sub process activities unintentionally trigger formatting since events bubble
-- add script element type to registered scripts
-- restructure and split up index.js to separate files
-- abide to new lint rules
-
-# 3.0.0
-
-- Support activity script and expression execution listeners
-- Remove default behaviour of saving activity output even if output is not declared. Output **was** saved to `environment.output._<Activity ID>` if no result variable or output was declared. The reason was that there was no easy way of getting output from SubProcess or a multi-instance task. Now SubProcess output can be defined and multi-instance output can be solved with execution listener
-
-# 2.0.0
-
-- fix resume extension when recovered mid formatting
-- drop node 12 support
-
-# 1.1.0
-
-- 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