bpmn-elements 9.1.1 → 9.1.3

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+# 9.1.3
+
+- type declare execution scope
+
+# 9.1.2
+
+- allow type IScripts.register to return undefined
+
 # 9.1.1
 
 - fix type Logger declaration

package/dist/Tracker.js

@@ -22,6 +22,7 @@ Object.defineProperty(ActivityTracker.prototype, 'activityStatus', {
 });
 ActivityTracker.prototype.track = function track(routingKey, message) {
   const content = message.content;
+  if (content.isAssociation) return;
   if (content.isSequenceFlow) return;
   if (content.isSubProcess) return;
   const executionId = content.executionId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "9.1.1",
+  "version": "9.1.3",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -53,9 +53,9 @@
     "c8": "^7.13.0",
     "camunda-bpmn-moddle": "^7.0.1",
     "chai": "^4.3.7",
-    "chronokinesis": "^4.0.1",
+    "chronokinesis": "^5.0.2",
     "debug": "^4.3.4",
-    "eslint": "^8.37.0",
+    "eslint": "^8.38.0",
     "eslint-plugin-import": "^2.27.5",
     "got": "^12.6.0",
     "mocha": "^10.1.0",

package/src/Tracker.js

@@ -14,6 +14,7 @@ Object.defineProperty(ActivityTracker.prototype, 'activityStatus', {
 
 ActivityTracker.prototype.track = function track(routingKey, message) {
   const content = message.content;
+  if (content.isAssociation) return;
   if (content.isSequenceFlow) return;
   if (content.isSubProcess) return;
   const executionId = content.executionId;

package/src/tasks/ReceiveTask.js

@@ -1,215 +1,215 @@
-import Activity from '../activity/Activity.js';
-import {cloneContent} from '../messageHelper.js';
-
-const kCompleted = Symbol.for('completed');
-const kExecuteMessage = Symbol.for('executeMessage');
-const kReferenceElement = Symbol.for('referenceElement');
-const kReferenceInfo = Symbol.for('referenceInfo');
-
-export default function ReceiveTask(activityDef, context) {
-  const task = new Activity(ReceiveTaskBehaviour, activityDef, context);
-
-  task.broker.assertQueue('message', {autoDelete: false, durable: true});
-  task.broker.bindQueue('message', 'api', '*.message.#', {durable: true});
-
-  return task;
-}
-
-export function ReceiveTaskBehaviour(activity) {
-  const {id, type, behaviour} = activity;
-
-  this.id = id;
-  this.type = type;
-
-  const reference = this.reference = {
-    name: 'anonymous',
-    ...behaviour.messageRef,
-    referenceType: 'message',
-  };
-
-  this.loopCharacteristics = behaviour.loopCharacteristics && new behaviour.loopCharacteristics.Behaviour(activity, behaviour.loopCharacteristics);
-  this.activity = activity;
-  this.broker = activity.broker;
-
-  this[kReferenceElement] = reference.id && activity.getActivityById(reference.id);
-}
-
-ReceiveTaskBehaviour.prototype.execute = function execute(executeMessage) {
-  return new ReceiveTaskExecution(this).execute(executeMessage);
-};
-
-function ReceiveTaskExecution(parent) {
-  const {activity, broker, loopCharacteristics, reference} = parent;
-
-  this.id = activity.id;
-  this.logger = activity.logger;
-  this.reference = reference;
-  this.broker = broker;
-  this.loopCharacteristics = loopCharacteristics;
-  this.referenceElement = parent[kReferenceElement];
-
-  this[kCompleted] = false;
-}
-
-ReceiveTaskExecution.prototype.execute = function execute(executeMessage) {
-  this[kExecuteMessage] = executeMessage;
-
-  const executeContent = executeMessage.content;
-  const {executionId, isRootScope} = executeContent;
-  this.executionId = executionId;
-
-  const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
-
-  if (isRootScope) {
-    this._setupMessageHandling(executionId);
-  }
-
-  const loopCharacteristics = this.loopCharacteristics;
-  if (loopCharacteristics && executeMessage.content.isRootScope) {
-    return loopCharacteristics.execute(executeMessage);
-  }
-
-  const broker = this.broker;
-  broker.consume('message', this._onCatchMessage.bind(this), {
-    noAck: true,
-    consumerTag: `_onmessage-${executionId}`,
-  });
-
-  if (this[kCompleted]) return;
-
-  broker.subscribeTmp('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
-    noAck: true,
-    consumerTag: `_api-${executionId}`,
-    priority: 400,
-  });
-
-  this._debug(`expect ${info.description}`);
-
-  broker.publish('event', 'activity.wait', cloneContent(executeContent, {message: {...info.message}}));
-};
-
-ReceiveTaskExecution.prototype._onCatchMessage = function onCatchMessage(routingKey, message) {
-  const content = message.content;
-
-  const {id: signalId, executionId: signalExecutionId} = content.message || {};
-  const {message: referenceMessage, description} = this[kReferenceInfo];
-
-  if (!referenceMessage.id && signalId || signalExecutionId) {
-    if (this.loopCharacteristics && signalExecutionId !== this.executionId) return;
-    if (signalId !== this.id && signalExecutionId !== this.executionId) return;
-    this._debug('caught direct message');
-  } else if (referenceMessage.id !== signalId) return;
-  else {
-    this._debug(`caught ${description}`);
-  }
-
-  const {type: messageType, correlationId} = message.properties;
-  const broker = this.broker;
-  const executeContent = this[kExecuteMessage].content;
-
-  broker.publish('event', 'activity.consumed', cloneContent(executeContent, {message: {...message.content.message}}), {correlationId, type: messageType});
-  broker.publish('event', 'activity.catch', cloneContent(executeContent, {message: message.content.message}), {type: 'catch', correlationId});
-
-  this._complete(message.content.message, {correlationId});
-};
-
-ReceiveTaskExecution.prototype._onApiMessage = function onApiMessage(routingKey, message) {
-  const {type: messageType, correlationId} = message.properties;
-  switch (messageType) {
-    case 'message':
-    case 'signal': {
-      return this._complete(message.content.message, {correlationId});
-    }
-    case 'discard': {
-      this[kCompleted] = true;
-      this._stop();
-      return this.broker.publish('execution', 'execute.discard', cloneContent(this[kExecuteMessage].content), {correlationId});
-    }
-    case 'stop': {
-      return this._stop();
-    }
-  }
-};
-
-ReceiveTaskExecution.prototype._complete = function complete(output, options) {
-  this[kCompleted] = true;
-  this._stop();
-  return this.broker.publish('execution', 'execute.completed', cloneContent(this[kExecuteMessage].content, {output}), options);
-};
-
-ReceiveTaskExecution.prototype._stop = function stop() {
-  const broker = this.broker, executionId = this.executionId;
-  broker.cancel(`_onmessage-${executionId}`);
-  broker.cancel(`_api-${executionId}`);
-};
-
-ReceiveTaskExecution.prototype._setupMessageHandling = function setupMessageHandling(executionId) {
-  const broker = this.broker;
-  broker.subscribeTmp('api', '#.signal.*', this._onDelegateMessage.bind(this), {
-    noAck: true,
-    consumerTag: `_api-delegated-${executionId}`,
-  }, {
-    noAck: true,
-  });
-  broker.subscribeTmp('api', `activity.stop.${executionId}`, this._onStopApiMessage.bind(this), {
-    noAck: true,
-    consumerTag: `_api-stop-${executionId}`,
-    priority: 400,
-  });
-  broker.subscribeTmp('execution', 'execute.#', this._onExecutionComplete.bind(this), {
-    noAck: true,
-    consumerTag: `_execution-complete-${executionId}`,
-  }, {
-    noAck: true,
-  });
-};
-
-ReceiveTaskExecution.prototype._onDelegateMessage = function onDelegateMessage(_, message) {
-  if (!message.properties.delegate) return;
-  this.broker.sendToQueue('message', message.content, message.properties);
-};
-
-ReceiveTaskExecution.prototype._onStopApiMessage = function onStopApiMessage() {
-  this._stopMessageHandling(true);
-};
-
-ReceiveTaskExecution.prototype._onExecutionComplete = function onExecutionComplete(routingKey, {content}) {
-  if (!content.isRootScope) return;
-  switch (routingKey) {
-    case 'execute.completed':
-    case 'execute.error':
-    case 'execute.discard':
-      this._stopMessageHandling();
-      break;
-  }
-};
-
-ReceiveTaskExecution.prototype._stopMessageHandling = function stop(keepMessageQ) {
-  const broker = this.broker, executionId = this.executionId;
-  broker.cancel(`_api-delegated-${executionId}`);
-  broker.cancel(`_api-stop-${executionId}`);
-  broker.cancel(`_execution-complete-${executionId}`);
-  if (!keepMessageQ) broker.purgeQueue('message');
-};
-
-ReceiveTaskExecution.prototype._getReferenceInfo = function getReferenceInfo(message) {
-  const referenceElement = this.referenceElement;
-  if (!referenceElement) {
-    return {
-      message: {...this.reference},
-      description: 'anonymous message',
-    };
-  }
-
-  const result = {
-    message: referenceElement.resolve(message),
-  };
-
-  result.description = `${result.message.name} <${result.message.id}>`;
-
-  return result;
-};
-
-ReceiveTaskExecution.prototype._debug = function debug(msg) {
-  this.logger.debug(`<${this.executionId} (${this.id})> ${msg}`);
-};
+import Activity from '../activity/Activity.js';
+import {cloneContent} from '../messageHelper.js';
+
+const kCompleted = Symbol.for('completed');
+const kExecuteMessage = Symbol.for('executeMessage');
+const kReferenceElement = Symbol.for('referenceElement');
+const kReferenceInfo = Symbol.for('referenceInfo');
+
+export default function ReceiveTask(activityDef, context) {
+  const task = new Activity(ReceiveTaskBehaviour, activityDef, context);
+
+  task.broker.assertQueue('message', {autoDelete: false, durable: true});
+  task.broker.bindQueue('message', 'api', '*.message.#', {durable: true});
+
+  return task;
+}
+
+export function ReceiveTaskBehaviour(activity) {
+  const {id, type, behaviour} = activity;
+
+  this.id = id;
+  this.type = type;
+
+  const reference = this.reference = {
+    name: 'anonymous',
+    ...behaviour.messageRef,
+    referenceType: 'message',
+  };
+
+  this.loopCharacteristics = behaviour.loopCharacteristics && new behaviour.loopCharacteristics.Behaviour(activity, behaviour.loopCharacteristics);
+  this.activity = activity;
+  this.broker = activity.broker;
+
+  this[kReferenceElement] = reference.id && activity.getActivityById(reference.id);
+}
+
+ReceiveTaskBehaviour.prototype.execute = function execute(executeMessage) {
+  return new ReceiveTaskExecution(this).execute(executeMessage);
+};
+
+function ReceiveTaskExecution(parent) {
+  const {activity, broker, loopCharacteristics, reference} = parent;
+
+  this.id = activity.id;
+  this.logger = activity.logger;
+  this.reference = reference;
+  this.broker = broker;
+  this.loopCharacteristics = loopCharacteristics;
+  this.referenceElement = parent[kReferenceElement];
+
+  this[kCompleted] = false;
+}
+
+ReceiveTaskExecution.prototype.execute = function execute(executeMessage) {
+  this[kExecuteMessage] = executeMessage;
+
+  const executeContent = executeMessage.content;
+  const {executionId, isRootScope} = executeContent;
+  this.executionId = executionId;
+
+  const info = this[kReferenceInfo] = this._getReferenceInfo(executeMessage);
+
+  if (isRootScope) {
+    this._setupMessageHandling(executionId);
+  }
+
+  const loopCharacteristics = this.loopCharacteristics;
+  if (loopCharacteristics && executeMessage.content.isRootScope) {
+    return loopCharacteristics.execute(executeMessage);
+  }
+
+  const broker = this.broker;
+  broker.consume('message', this._onCatchMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_onmessage-${executionId}`,
+  });
+
+  if (this[kCompleted]) return;
+
+  broker.subscribeTmp('api', `activity.#.${executionId}`, this._onApiMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-${executionId}`,
+    priority: 400,
+  });
+
+  this._debug(`expect ${info.description}`);
+
+  broker.publish('event', 'activity.wait', cloneContent(executeContent, {message: {...info.message}}));
+};
+
+ReceiveTaskExecution.prototype._onCatchMessage = function onCatchMessage(routingKey, message) {
+  const content = message.content;
+
+  const {id: signalId, executionId: signalExecutionId} = content.message || {};
+  const {message: referenceMessage, description} = this[kReferenceInfo];
+
+  if (!referenceMessage.id && signalId || signalExecutionId) {
+    if (this.loopCharacteristics && signalExecutionId !== this.executionId) return;
+    if (signalId !== this.id && signalExecutionId !== this.executionId) return;
+    this._debug('caught direct message');
+  } else if (referenceMessage.id !== signalId) return;
+  else {
+    this._debug(`caught ${description}`);
+  }
+
+  const {type: messageType, correlationId} = message.properties;
+  const broker = this.broker;
+  const executeContent = this[kExecuteMessage].content;
+
+  broker.publish('event', 'activity.consumed', cloneContent(executeContent, {message: {...message.content.message}}), {correlationId, type: messageType});
+  broker.publish('event', 'activity.catch', cloneContent(executeContent, {message: message.content.message}), {type: 'catch', correlationId});
+
+  this._complete(message.content.message, {correlationId});
+};
+
+ReceiveTaskExecution.prototype._onApiMessage = function onApiMessage(routingKey, message) {
+  const {type: messageType, correlationId} = message.properties;
+  switch (messageType) {
+    case 'message':
+    case 'signal': {
+      return this._complete(message.content.message, {correlationId});
+    }
+    case 'discard': {
+      this[kCompleted] = true;
+      this._stop();
+      return this.broker.publish('execution', 'execute.discard', cloneContent(this[kExecuteMessage].content), {correlationId});
+    }
+    case 'stop': {
+      return this._stop();
+    }
+  }
+};
+
+ReceiveTaskExecution.prototype._complete = function complete(output, options) {
+  this[kCompleted] = true;
+  this._stop();
+  return this.broker.publish('execution', 'execute.completed', cloneContent(this[kExecuteMessage].content, {output}), options);
+};
+
+ReceiveTaskExecution.prototype._stop = function stop() {
+  const broker = this.broker, executionId = this.executionId;
+  broker.cancel(`_onmessage-${executionId}`);
+  broker.cancel(`_api-${executionId}`);
+};
+
+ReceiveTaskExecution.prototype._setupMessageHandling = function setupMessageHandling(executionId) {
+  const broker = this.broker;
+  broker.subscribeTmp('api', '#.signal.*', this._onDelegateMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-delegated-${executionId}`,
+  }, {
+    noAck: true,
+  });
+  broker.subscribeTmp('api', `activity.stop.${executionId}`, this._onStopApiMessage.bind(this), {
+    noAck: true,
+    consumerTag: `_api-stop-${executionId}`,
+    priority: 400,
+  });
+  broker.subscribeTmp('execution', 'execute.#', this._onExecutionComplete.bind(this), {
+    noAck: true,
+    consumerTag: `_execution-complete-${executionId}`,
+  }, {
+    noAck: true,
+  });
+};
+
+ReceiveTaskExecution.prototype._onDelegateMessage = function onDelegateMessage(_, message) {
+  if (!message.properties.delegate) return;
+  this.broker.sendToQueue('message', message.content, message.properties);
+};
+
+ReceiveTaskExecution.prototype._onStopApiMessage = function onStopApiMessage() {
+  this._stopMessageHandling(true);
+};
+
+ReceiveTaskExecution.prototype._onExecutionComplete = function onExecutionComplete(routingKey, {content}) {
+  if (!content.isRootScope) return;
+  switch (routingKey) {
+    case 'execute.completed':
+    case 'execute.error':
+    case 'execute.discard':
+      this._stopMessageHandling();
+      break;
+  }
+};
+
+ReceiveTaskExecution.prototype._stopMessageHandling = function stop(keepMessageQ) {
+  const broker = this.broker, executionId = this.executionId;
+  broker.cancel(`_api-delegated-${executionId}`);
+  broker.cancel(`_api-stop-${executionId}`);
+  broker.cancel(`_execution-complete-${executionId}`);
+  if (!keepMessageQ) broker.purgeQueue('message');
+};
+
+ReceiveTaskExecution.prototype._getReferenceInfo = function getReferenceInfo(message) {
+  const referenceElement = this.referenceElement;
+  if (!referenceElement) {
+    return {
+      message: {...this.reference},
+      description: 'anonymous message',
+    };
+  }
+
+  const result = {
+    message: referenceElement.resolve(message),
+  };
+
+  result.description = `${result.message.name} <${result.message.id}>`;
+
+  return result;
+};
+
+ReceiveTaskExecution.prototype._debug = function debug(msg) {
+  this.logger.debug(`<${this.executionId} (${this.id})> ${msg}`);
+};

package/types/index.d.ts

@@ -2,7 +2,7 @@ declare module 'bpmn-elements' {
   import { Broker } from 'smqp';
   import { BrokerState } from 'smqp/types/Broker';
   import { Consumer } from 'smqp/types/Queue';
-  import { MessageMessage } from 'smqp/types/Message';
+  import { MessageMessage, MessageFields, MessageProperties } from 'smqp/types/Message';
   import { SerializableContext, SerializableElement } from 'moddle-context-serializer';
 
   interface ElementBroker<T> extends Broker {
@@ -25,16 +25,16 @@ declare module 'bpmn-elements' {
     [x: string]: any,
   }
 
-  type elementContent = {
-    id?: string,
-    type?: string,
-    executionId?: string,
-    parent?: ElementParent,
-    [x: string]: any,
+  interface ElementMessageContent {
+    id?: string;
+    type?: string;
+    executionId?: string;
+    parent?: ElementParent;
+    [x: string]: any;
   }
 
   interface ElementBrokerMessage extends MessageMessage {
-    content: elementContent,
+    content: ElementMessageContent,
   }
 
   interface EventDefinition {
@@ -211,8 +211,31 @@ declare module 'bpmn-elements' {
     createMessage(content?: Record<string, any>): any;
   }
 
+  interface ExecutionScope {
+    /** Calling element id */
+    id: string;
+    /** Calling element type */
+    type: string;
+    /** Execution message fields */
+    fields: MessageFields;
+    /** Execution message content */
+    content: ElementMessageContent;
+    /** Execution message properties */
+    properties: MessageProperties;
+    environment: Environment;
+    /** Calling element logger instance */
+    logger?: ILogger;
+    /**
+     * Resolve expression with the current scope
+     * @param expression expression string
+     * @returns Whatever the expression returns
+     */
+    resolveExpression: (expression: string) => any;
+    ActivityError: ActivityError;
+  }
+
   interface Script {
-    execute(executionContext: any, callback: CallableFunction): void;
+    execute(executionContext: ExecutionScope, callback: CallableFunction): void;
   }
 
   abstract class MessageElement {
@@ -503,7 +526,7 @@ declare module 'bpmn-elements' {
   }
 
   interface IScripts {
-    register(activity: any): Script;
+    register(activity: any): Script | undefined;
     getScript(language: string, identifier: {id: string, [x: string]: any}): Script;
   }
 
@@ -601,12 +624,14 @@ declare module 'bpmn-elements' {
   class Signal extends MessageElement {}
   class Escalation extends MessageElement {}
 
-  interface ActivityError extends Error {
+  class ActivityError extends Error {
     type: string;
     description: string;
     /** Activity that threw error */
     source?: ElementBrokerMessage;
     /** Original error */
     inner?: Error;
+    code?: string;
+    constructor(description: string, sourceMessage: MessageMessage, inner?: Error);
   }
 }