bpmn-elements 16.2.1 → 16.2.2

package/dist/getPropertyValue.js

@@ -3,12 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = getPropertyValue;
 const propertyPattern = /(\w+)\((.*?)(?:\))|(\.|\[|^)(.+?)(?:\]|\[|\.|$)/;
 const stringConstantPattern = /^(['"])(.*)\1$/;
 const numberConstantPattern = /^\W*-?\d+(.\d+)?\W*$/;
 const negativeIndexPattern = /^-\d+$/;
-var _default = exports.default = getPropertyValue;
 function getPropertyValue(inputContext, propertyPath, fnScope) {
   if (!inputContext) return;
   let resultValue;

package/dist/tasks/CallActivity.js

@@ -52,7 +52,11 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
   });
   broker.subscribeTmp('api', '#.signal.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
     noAck: true,
-    consumerTag: `_api-delegated-${executionId}`
+    consumerTag: `_api-delegated-signal-${executionId}`
+  });
+  broker.subscribeTmp('api', '#.cancel.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
+    noAck: true,
+    consumerTag: `_api-delegated-cancel-${executionId}`
   });
   broker.publish('event', 'activity.call', (0, _messageHelper.cloneContent)(executeContent, {
     state: 'wait',
@@ -134,5 +138,6 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
 CallActivityBehaviour.prototype._stop = function stop(executionId) {
   const broker = this.broker;
   broker.cancel(`_api-${executionId}`);
-  broker.cancel(`_api-delegated-${executionId}`);
+  broker.cancel(`_api-delegated-signal-${executionId}`);
+  broker.cancel(`_api-delegated-cancel-${executionId}`);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "16.2.1",
+  "version": "16.2.2",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "./dist/index.js",
@@ -85,7 +85,7 @@
     "@babel/preset-env": "^7.24.4",
     "@babel/register": "^7.23.7",
     "@bonniernews/hot-bev": "^0.4.0",
-    "@types/node": "^16.18.95",
+    "@types/node": "^18.19.63",
     "bpmn-moddle": "^9.0.1",
     "c8": "^10.1.1",
     "camunda-bpmn-moddle": "^7.0.1",
@@ -95,7 +95,7 @@
     "eslint": "^9.0.0",
     "globals": "^15.0.0",
     "got": "^14.2.1",
-    "mocha": "^10.4.0",
+    "mocha": "^11.0.1",
     "mocha-cakes-2": "^3.3.0",
     "moddle-context-serializer": "^4.2.1",
     "nock": "^13.5.3",
@@ -103,7 +103,7 @@
     "texample": "^0.0.6"
   },
   "dependencies": {
-    "@0dep/piso": "^2.2.0",
-    "smqp": "^9.0.2"
+    "@0dep/piso": "^2.4.0",
+    "smqp": "^9.0.4"
   }
 }

package/src/Api.js

@@ -1,25 +1,23 @@
 import { cloneMessage } from './messageHelper.js';
 import { getUniqueId } from './shared.js';
 
-export { ActivityApi, DefinitionApi, ProcessApi, FlowApi, Api };
-
-function ActivityApi(broker, apiMessage, environment) {
+export function ActivityApi(broker, apiMessage, environment) {
   return new Api('activity', broker, apiMessage, environment);
 }
 
-function DefinitionApi(broker, apiMessage, environment) {
+export function DefinitionApi(broker, apiMessage, environment) {
   return new Api('definition', broker, apiMessage, environment);
 }
 
-function ProcessApi(broker, apiMessage, environment) {
+export function ProcessApi(broker, apiMessage, environment) {
   return new Api('process', broker, apiMessage, environment);
 }
 
-function FlowApi(broker, apiMessage, environment) {
+export function FlowApi(broker, apiMessage, environment) {
   return new Api('flow', broker, apiMessage, environment);
 }
 
-function Api(pfx, broker, sourceMessage, environment) {
+export function Api(pfx, broker, sourceMessage, environment) {
   if (!sourceMessage) throw new Error('Api requires message');
 
   const apiMessage = cloneMessage(sourceMessage);

package/src/EventBroker.js

@@ -1,25 +1,23 @@
 import { Broker } from 'smqp';
 import { makeErrorFromMessage } from './error/Errors.js';
 
-export { ActivityBroker, DefinitionBroker, MessageFlowBroker, ProcessBroker, EventBroker };
-
-function ActivityBroker(activity) {
+export function ActivityBroker(activity) {
   const executionBroker = ExecutionBroker(activity, 'activity');
   return executionBroker;
 }
 
-function ProcessBroker(owner) {
+export function ProcessBroker(owner) {
   const executionBroker = ExecutionBroker(owner, 'process');
   executionBroker.broker.assertQueue('api-q', { durable: false, autoDelete: false });
   executionBroker.broker.bindQueue('api-q', 'api', '#');
   return executionBroker;
 }
 
-function DefinitionBroker(owner, onBrokerReturn) {
+export function DefinitionBroker(owner, onBrokerReturn) {
   return ExecutionBroker(owner, 'definition', onBrokerReturn);
 }
 
-function MessageFlowBroker(owner) {
+export function MessageFlowBroker(owner) {
   const eventBroker = new EventBroker(owner, { prefix: 'messageflow', autoDelete: false, durable: false });
   const broker = eventBroker.broker;
 
@@ -51,7 +49,7 @@ function ExecutionBroker(brokerOwner, prefix, onBrokerReturn) {
   return eventBroker;
 }
 
-function EventBroker(brokerOwner, options, onBrokerReturn) {
+export function EventBroker(brokerOwner, options, onBrokerReturn) {
   this.options = options;
   this.eventPrefix = options.prefix;
 

package/src/MessageFormatter.js

@@ -6,9 +6,7 @@ import { getRoutingKeyPattern } from 'smqp';
 const kOnMessage = Symbol.for('onMessage');
 const kExecution = Symbol.for('execution');
 
-export { Formatter };
-
-function Formatter(element, formatQ) {
+export function Formatter(element, formatQ) {
   const { id, broker, logger } = element;
   this.id = id;
   this.broker = broker;

package/src/error/Errors.js

@@ -1,6 +1,6 @@
 import { cloneMessage } from '../messageHelper.js';
 
-class ActivityError extends Error {
+export class ActivityError extends Error {
   constructor(description, sourceMessage, inner) {
     super(description);
     this.type = 'ActivityError';
@@ -15,14 +15,14 @@ class ActivityError extends Error {
   }
 }
 
-class RunError extends ActivityError {
+export class RunError extends ActivityError {
   constructor(...args) {
     super(...args);
     this.type = 'RunError';
   }
 }
 
-class BpmnError extends Error {
+export class BpmnError extends Error {
   constructor(description, behaviour, sourceMessage, inner) {
     super(description);
     this.type = 'BpmnError';
@@ -35,9 +35,7 @@ class BpmnError extends Error {
   }
 }
 
-export { ActivityError, BpmnError, RunError, makeErrorFromMessage };
-
-function makeErrorFromMessage(errorMessage) {
+export function makeErrorFromMessage(errorMessage) {
   const { content } = errorMessage;
 
   if (isKnownError(content)) return content;

package/src/getPropertyValue.js

@@ -3,9 +3,7 @@ const stringConstantPattern = /^(['"])(.*)\1$/;
 const numberConstantPattern = /^\W*-?\d+(.\d+)?\W*$/;
 const negativeIndexPattern = /^-\d+$/;
 
-export default getPropertyValue;
-
-function getPropertyValue(inputContext, propertyPath, fnScope) {
+export default function getPropertyValue(inputContext, propertyPath, fnScope) {
   if (!inputContext) return;
 
   let resultValue;

package/src/messageHelper.js

@@ -1,6 +1,4 @@
-export { cloneContent, cloneMessage, cloneParent, shiftParent, unshiftParent, pushParent };
-
-function cloneContent(content, extend) {
+export function cloneContent(content, extend) {
   const { discardSequence, inbound, outbound, parent, sequence } = content;
 
   const clone = {
@@ -27,7 +25,7 @@ function cloneContent(content, extend) {
   return clone;
 }
 
-function cloneMessage(message, overrideContent) {
+export function cloneMessage(message, overrideContent) {
   return {
     fields: { ...message.fields },
     content: cloneContent(message.content, overrideContent),
@@ -35,7 +33,7 @@ function cloneMessage(message, overrideContent) {
   };
 }
 
-function cloneParent(parent) {
+export function cloneParent(parent) {
   const { path } = parent;
   const clone = { ...parent };
   if (!path) return clone;
@@ -47,7 +45,7 @@ function cloneParent(parent) {
   return clone;
 }
 
-function unshiftParent(parent, adoptingParent) {
+export function unshiftParent(parent, adoptingParent) {
   const { id, type, executionId } = adoptingParent;
   if (!parent) {
     return {
@@ -69,7 +67,7 @@ function unshiftParent(parent, adoptingParent) {
   return clone;
 }
 
-function shiftParent(parent) {
+export function shiftParent(parent) {
   if (!parent) return;
   if (!parent.path || !parent.path.length) return;
 
@@ -82,7 +80,7 @@ function shiftParent(parent) {
   return clone;
 }
 
-function pushParent(parent, ancestor) {
+export function pushParent(parent, ancestor) {
   const { id, type, executionId } = ancestor;
   if (!parent) return { id, type, executionId };
 

package/src/tasks/CallActivity.js

@@ -8,7 +8,6 @@ export default function CallActivity(activityDef, context) {
 
 export function CallActivityBehaviour(activity) {
   const { id, type, behaviour = {} } = activity;
-
   this.id = id;
   this.type = type;
   this.calledElement = behaviour.calledElement;
@@ -60,7 +59,11 @@ CallActivityBehaviour.prototype.execute = function execute(executeMessage) {
   );
   broker.subscribeTmp('api', '#.signal.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
     noAck: true,
-    consumerTag: `_api-delegated-${executionId}`,
+    consumerTag: `_api-delegated-signal-${executionId}`,
+  });
+  broker.subscribeTmp('api', '#.cancel.*', (...args) => this._onDelegatedApiMessage(calledElement, executeMessage, ...args), {
+    noAck: true,
+    consumerTag: `_api-delegated-cancel-${executionId}`,
   });
 
   broker.publish(
@@ -176,5 +179,6 @@ CallActivityBehaviour.prototype._onApiMessage = function onApiMessage(calledElem
 CallActivityBehaviour.prototype._stop = function stop(executionId) {
   const broker = this.broker;
   broker.cancel(`_api-${executionId}`);
-  broker.cancel(`_api-delegated-${executionId}`);
+  broker.cancel(`_api-delegated-signal-${executionId}`);
+  broker.cancel(`_api-delegated-cancel-${executionId}`);
 };