bpmn-elements 10.0.0 → 11.0.0

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 Changelog
 =========
 
+# 11.0.0
+
+- slim activity state by removing properties not needed for recover, might be breaking if state is inspected
+- slim process state by removing properties not needed for recover, might be breaking if state is inspected
+
+# 10.1.0
+
+- introduce Lane behaviour
+- add process `lanes` property with Lane instances
+- add activity `lane` property containing a reference to the process lane instance
+- add activity `parentElement` property referencing parent process or sub process
+
 # 10.0.0
 
 - drop iso8601-duration dependency and copy source (with licence). Export as `ISODuration`. Extend with repeat pattern parsing, e.g. `R3/PT1H` that corresponds to three repetitions every one hour

package/dist/Context.js

@@ -9,11 +9,12 @@ var _Environment = _interopRequireDefault(require("./Environment.js"));
 var _ExtensionsMapper = _interopRequireDefault(require("./ExtensionsMapper.js"));
 var _shared = require("./shared.js");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const kOwner = Symbol.for('owner');
 function Context(definitionContext, environment) {
   environment = environment ? environment.clone() : new _Environment.default();
   return new ContextInstance(definitionContext, environment);
 }
-function ContextInstance(definitionContext, environment) {
+function ContextInstance(definitionContext, environment, owner) {
   const {
     id = 'Def',
     name,
@@ -38,7 +39,13 @@ function ContextInstance(definitionContext, environment) {
     sequenceFlowRefs: {},
     sequenceFlows: []
   };
+  this[kOwner] = owner;
 }
+Object.defineProperty(ContextInstance.prototype, 'owner', {
+  get() {
+    return this[kOwner];
+  }
+});
 ContextInstance.prototype.getActivityById = function getActivityById(activityId) {
   const activityInstance = this.refs.activityRefs[activityId];
   if (activityInstance) return activityInstance;
@@ -95,8 +102,8 @@ ContextInstance.prototype.upsertAssociation = function upsertAssociation(associa
   instance = refs[associationDefinition.id] = new associationDefinition.Behaviour(associationDefinition, this);
   return instance;
 };
-ContextInstance.prototype.clone = function clone(newEnvironment) {
-  return new ContextInstance(this.definitionContext, newEnvironment || this.environment);
+ContextInstance.prototype.clone = function clone(newEnvironment, newOwner) {
+  return new ContextInstance(this.definitionContext, newEnvironment || this.environment, newOwner);
 };
 ContextInstance.prototype.getProcessById = function getProcessById(processId) {
   const refs = this.refs.processRefs;
@@ -106,13 +113,16 @@ ContextInstance.prototype.getProcessById = function getProcessById(processId) {
   if (!processDefinition) return null;
   const bpContext = this.clone(this.environment.clone());
   bp = refs[processId] = new processDefinition.Behaviour(processDefinition, bpContext);
+  bpContext[kOwner] = bp;
   this.refs.processes.push(bp);
   return bp;
 };
 ContextInstance.prototype.getNewProcessById = function getNewProcessById(processId) {
   if (!this.getProcessById(processId)) return null;
   const bpDef = this.definitionContext.getProcessById(processId);
-  const bp = new bpDef.Behaviour(bpDef, this.clone(this.environment.clone()));
+  const bpContext = this.clone(this.environment.clone());
+  const bp = new bpDef.Behaviour(bpDef, bpContext);
+  bpContext[kOwner] = bp;
   return bp;
 };
 ContextInstance.prototype.getProcesses = function getProcesses() {
@@ -175,4 +185,11 @@ ContextInstance.prototype.loadExtensions = function loadExtensions(activity) {
   if (io.hasIo) extensions.extensions.push(io);
   if (!extensions.extensions.length) return;
   return extensions;
+};
+ContextInstance.prototype.getActivityParentById = function getActivityParentById(activityId) {
+  const owner = this[kOwner];
+  if (owner) return owner;
+  const activity = this.getActivityById(activityId);
+  const parentId = activity.parent.id;
+  return this.getProcessById(parentId) || this.getActivityById(parentId);
 };

package/dist/activity/Activity.js

@@ -102,7 +102,8 @@ function Activity(Behaviour, activityDef, context) {
     attachedTo,
     isTransaction: activityDef.isTransaction,
     isParallelJoin,
-    isThrowing: activityDef.isThrowing
+    isThrowing: activityDef.isThrowing,
+    lane: activityDef.lane && activityDef.lane.id
   };
   this[kExec] = {};
   this[kMessageHandlers] = {
@@ -236,12 +237,27 @@ Object.defineProperty(Activity.prototype, 'attachedTo', {
     return this.getActivityById(attachedToId);
   }
 });
+Object.defineProperty(Activity.prototype, 'lane', {
+  enumerable: true,
+  get() {
+    const laneId = this[kFlags].lane;
+    if (!laneId) return undefined;
+    const parent = this.parentElement;
+    return parent.getLaneById && parent.getLaneById(laneId);
+  }
+});
 Object.defineProperty(Activity.prototype, 'eventDefinitions', {
   enumerable: true,
   get() {
     return this[kEventDefinitions];
   }
 });
+Object.defineProperty(Activity.prototype, 'parentElement', {
+  enumerable: true,
+  get() {
+    return this.context.getActivityParentById(this.id);
+  }
+});
 Activity.prototype.activate = function activate() {
   this[kActivated] = true;
   this.addInboundListeners();
@@ -280,6 +296,22 @@ Activity.prototype.run = function run(runContent) {
   broker.publish('run', 'run.start', (0, _messageHelper.cloneContent)(content));
   this._consumeRunQ();
 };
+Activity.prototype.getState = function getState() {
+  const status = this.status;
+  const exec = this[kExec];
+  return {
+    id: this.id,
+    type: this.type,
+    ...(status && {
+      status
+    }),
+    executionId: exec.executionId,
+    stopped: this.stopped,
+    counters: this.counters,
+    broker: this.broker.getState(true),
+    execution: exec.execution && exec.execution.getState()
+  };
+};
 Activity.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error(`cannot recover running activity <${this.id}>`);
   if (!state) return;
@@ -364,21 +396,6 @@ Activity.prototype.shake = function shake() {
 Activity.prototype.evaluateOutbound = function evaluateOutbound(fromMessage, discardRestAtTake, callback) {
   return this[kFlows].outboundEvaluator.evaluate(fromMessage, discardRestAtTake, callback);
 };
-Activity.prototype.getState = function getState() {
-  const msg = this._createMessage();
-  const exec = this[kExec];
-  return {
-    ...msg,
-    executionId: exec.executionId,
-    stopped: this.stopped,
-    behaviour: {
-      ...this.behaviour
-    },
-    counters: this.counters,
-    broker: this.broker.getState(true),
-    execution: exec.execution && exec.execution.getState()
-  };
-};
 Activity.prototype.getApi = function getApi(message) {
   const execution = this[kExec].execution;
   if (execution && !execution.completed) return execution.getApi(message);

package/dist/definition/Definition.js

@@ -156,6 +156,16 @@ Definition.prototype.resume = function resume(callback) {
   this._activateRunConsumers();
   return this;
 };
+Definition.prototype.getState = function getState() {
+  return this._createMessage({
+    status: this.status,
+    stopped: this.stopped,
+    counters: this.counters,
+    environment: this.environment.getState(),
+    execution: this.execution && this.execution.getState(),
+    broker: this.broker.getState(true)
+  });
+};
 Definition.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error('cannot recover running definition');
   if (!state) return this;
@@ -209,16 +219,6 @@ Definition.prototype._shakeProcess = function shakeProcess(shakeBp, startId) {
   if (shovel) shakeBp.broker.closeShovel('shaker');
   return shakeResult;
 };
-Definition.prototype.getState = function getState() {
-  return this._createMessage({
-    status: this.status,
-    stopped: this.stopped,
-    counters: this.counters,
-    environment: this.environment.getState(),
-    execution: this.execution && this.execution.getState(),
-    broker: this.broker.getState(true)
-  });
-};
 Definition.prototype.getProcesses = function getProcesses() {
   const execution = this.execution;
   if (execution) return execution.getProcesses();

package/dist/definition/DefinitionExecution.js

@@ -294,31 +294,36 @@ DefinitionExecution.prototype._activate = function activate(processList) {
 };
 DefinitionExecution.prototype._activateProcess = function activateProcess(bp) {
   const handlers = this[kMessageHandlers];
-  bp.broker.subscribeTmp('message', 'message.outbound', handlers.onMessageOutbound, {
+  const broker = bp.broker;
+  broker.subscribeTmp('message', 'message.outbound', handlers.onMessageOutbound, {
     noAck: true,
     consumerTag: '_definition-outbound-message-consumer'
   });
-  bp.broker.subscribeTmp('event', 'activity.signal', handlers.onDelegateMessage, {
+  const delegateEventQ = broker.assertQueue('_delegate-event-q', {
+    autoDelete: false,
+    durable: false
+  });
+  delegateEventQ.consume(handlers.onDelegateMessage, {
     noAck: true,
-    consumerTag: '_definition-signal-consumer',
+    consumerTag: '_definition-signal-consumer'
+  });
+  broker.bindQueue('_delegate-event-q', 'event', 'activity.signal', {
     priority: 200
   });
-  bp.broker.subscribeTmp('event', 'activity.message', handlers.onDelegateMessage, {
-    noAck: true,
-    consumerTag: '_definition-message-consumer',
+  broker.bindQueue('_delegate-event-q', 'event', 'activity.message', {
     priority: 200
   });
-  bp.broker.subscribeTmp('event', 'activity.call', handlers.onCallActivity, {
+  broker.subscribeTmp('event', 'activity.call', handlers.onCallActivity, {
     noAck: true,
     consumerTag: '_definition-call-consumer',
     priority: 200
   });
-  bp.broker.subscribeTmp('event', 'activity.call.cancel', handlers.onCancelCallActivity, {
+  broker.subscribeTmp('event', 'activity.call.cancel', handlers.onCancelCallActivity, {
     noAck: true,
     consumerTag: '_definition-call-cancel-consumer',
     priority: 200
   });
-  bp.broker.subscribeTmp('event', '#', handlers.onChildEvent, {
+  broker.subscribeTmp('event', '#', handlers.onChildEvent, {
     noAck: true,
     consumerTag: '_definition-activity-consumer',
     priority: 100
@@ -351,7 +356,6 @@ DefinitionExecution.prototype._deactivateProcess = function deactivateProcess(bp
   bp.broker.cancel('_definition-outbound-message-consumer');
   bp.broker.cancel('_definition-activity-consumer');
   bp.broker.cancel('_definition-signal-consumer');
-  bp.broker.cancel('_definition-message-consumer');
   bp.broker.cancel('_definition-call-consumer');
   bp.broker.cancel('_definition-call-cancel-consumer');
 };

package/dist/flows/Association.js

@@ -72,10 +72,12 @@ Association.prototype.discard = function discard(content = {}) {
   return true;
 };
 Association.prototype.getState = function getState() {
-  return this._createMessageContent({
+  return {
+    id: this.id,
+    type: this.type,
     counters: this.counters,
     broker: this.broker.getState(true)
-  });
+  };
 };
 Association.prototype.recover = function recover(state) {
   Object.assign(this[kCounters], state.counters);

package/dist/flows/MessageFlow.js

@@ -59,11 +59,13 @@ MessageFlow.prototype.getState = function getState() {
   return {
     id: this.id,
     type: this.type,
-    counters: this.counters
+    counters: this.counters,
+    broker: this.broker.getState(true)
   };
 };
 MessageFlow.prototype.recover = function recover(state) {
   Object.assign(this[kCounters], state.counters);
+  this.broker.recover(state.broker);
 };
 MessageFlow.prototype.getApi = function getApi(message) {
   return new _Api.Api('message', this.broker, message || {

package/dist/flows/SequenceFlow.js

@@ -94,10 +94,12 @@ SequenceFlow.prototype.discard = function discard(content = {}) {
   this._publishEvent('discard', content);
 };
 SequenceFlow.prototype.getState = function getState() {
-  return this.createMessage({
+  return {
+    id: this.id,
+    type: this.type,
     counters: this.counters,
     broker: this.broker.getState(true)
-  });
+  };
 };
 SequenceFlow.prototype.recover = function recover(state) {
   Object.assign(this[kCounters], state.counters);

package/dist/index.js

@@ -172,6 +172,12 @@ Object.defineProperty(exports, "IntermediateThrowEvent", {
     return _IntermediateThrowEvent.default;
   }
 });
+Object.defineProperty(exports, "Lane", {
+  enumerable: true,
+  get: function () {
+    return _Lane.default;
+  }
+});
 Object.defineProperty(exports, "LinkEventDefinition", {
   enumerable: true,
   get: function () {
@@ -365,6 +371,7 @@ var _InclusiveGateway = _interopRequireDefault(require("./gateways/InclusiveGate
 var _InputOutputSpecification = _interopRequireDefault(require("./io/InputOutputSpecification.js"));
 var _IntermediateCatchEvent = _interopRequireDefault(require("./events/IntermediateCatchEvent.js"));
 var _IntermediateThrowEvent = _interopRequireDefault(require("./events/IntermediateThrowEvent.js"));
+var _Lane = _interopRequireDefault(require("./process/Lane.js"));
 var _LinkEventDefinition = _interopRequireDefault(require("./eventDefinitions/LinkEventDefinition.js"));
 var _LoopCharacteristics = _interopRequireDefault(require("./tasks/LoopCharacteristics.js"));
 var _Message = _interopRequireDefault(require("./activity/Message.js"));

package/dist/process/Lane.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = Lane;
+const kProcess = Symbol.for('process');
+function Lane(process, laneDefinition) {
+  const {
+    broker,
+    environment
+  } = process;
+  const {
+    id,
+    type,
+    behaviour
+  } = laneDefinition;
+  this[kProcess] = process;
+  this.id = id;
+  this.type = type;
+  this.name = behaviour.name;
+  this.parent = {
+    id: process.id,
+    type: process.type
+  };
+  this.behaviour = {
+    ...behaviour
+  };
+  this.environment = environment;
+  this.broker = broker;
+  this.context = process.context;
+  this.logger = environment.Logger(type.toLowerCase());
+}
+Object.defineProperty(Lane.prototype, 'process', {
+  get() {
+    return this[kProcess];
+  }
+});

package/dist/process/Process.js

@@ -17,6 +17,7 @@ const kCounters = Symbol.for('counters');
 const kExec = Symbol.for('execution');
 const kExecuteMessage = Symbol.for('executeMessage');
 const kExtensions = Symbol.for('extensions');
+const kLanes = Symbol.for('lanes');
 const kMessageHandlers = Symbol.for('messageHandlers');
 const kStateMessage = Symbol.for('stateMessage');
 const kStatus = Symbol.for('status');
@@ -66,6 +67,9 @@ function Process(processDef, context) {
     onExecutionMessage: this._onExecutionMessage.bind(this)
   };
   this.logger = environment.Logger(type.toLowerCase());
+  if (behaviour.lanes) {
+    this[kLanes] = behaviour.lanes.map(lane => new lane.Behaviour(this, lane));
+  }
   this[kExtensions] = context.loadExtensions(this);
 }
 Object.defineProperty(Process.prototype, 'counters', {
@@ -76,6 +80,13 @@ Object.defineProperty(Process.prototype, 'counters', {
     };
   }
 });
+Object.defineProperty(Process.prototype, 'lanes', {
+  enumerable: true,
+  get() {
+    const lanes = this[kLanes];
+    return lanes && lanes.slice();
+  }
+});
 Object.defineProperty(Process.prototype, 'extensions', {
   enumerable: true,
   get() {
@@ -156,6 +167,19 @@ Process.prototype.resume = function resume() {
   this._activateRunConsumers();
   return this;
 };
+Process.prototype.getState = function getState() {
+  return {
+    id: this.id,
+    type: this.type,
+    executionId: this.executionId,
+    environment: this.environment.getState(),
+    status: this.status,
+    stopped: this.stopped,
+    counters: this.counters,
+    broker: this.broker.getState(true),
+    execution: this.execution && this.execution.getState()
+  };
+};
 Process.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error(`cannot recover running process <${this.id}>`);
   if (!state) return this;
@@ -192,16 +216,6 @@ Process.prototype.signal = function signal(message) {
     delegate: true
   });
 };
-Process.prototype.getState = function getState() {
-  return this._createMessage({
-    environment: this.environment.getState(),
-    status: this.status,
-    stopped: this.stopped,
-    counters: this.counters,
-    broker: this.broker.getState(true),
-    execution: this.execution && this.execution.getState()
-  });
-};
 Process.prototype.cancelActivity = function cancelActivity(message) {
   return this.getApi().cancel(message, {
     delegate: true
@@ -404,6 +418,11 @@ Process.prototype.getSequenceFlows = function getSequenceFlows() {
   if (execution) return execution.getSequenceFlows();
   return this.context.getSequenceFlows();
 };
+Process.prototype.getLaneById = function getLaneById(laneId) {
+  const lanes = this[kLanes];
+  if (!lanes) return;
+  return lanes.find(lane => lane.id === laneId);
+};
 Process.prototype.getPostponed = function getPostponed(...args) {
   const execution = this.execution;
   if (!execution) return [];

package/dist/process/ProcessExecution.js

@@ -157,6 +157,34 @@ ProcessExecution.prototype.resume = function resume() {
   if (this[kCompleted]) return;
   if (!postponed.length && status === 'executing') return this._complete('completed');
 };
+ProcessExecution.prototype.getState = function getState() {
+  const {
+    children,
+    flows,
+    outboundMessageFlows,
+    associations
+  } = this[kElements];
+  return {
+    executionId: this.executionId,
+    stopped: this[kStopped],
+    completed: this[kCompleted],
+    status: this.status,
+    children: children.reduce((result, activity) => {
+      if (activity.placeholder) return result;
+      result.push(activity.getState());
+      return result;
+    }, []),
+    ...(flows.length && {
+      flows: flows.map(f => f.getState())
+    }),
+    ...(outboundMessageFlows.length && {
+      messageFlows: outboundMessageFlows.length && outboundMessageFlows.map(f => f.getState())
+    }),
+    ...(associations.length && {
+      associations: associations.map(f => f.getState())
+    })
+  };
+};
 ProcessExecution.prototype.recover = function recover(state) {
   if (!state) return this;
   this.executionId = state.executionId;
@@ -271,34 +299,6 @@ ProcessExecution.prototype.cancel = function discard() {
     type: 'cancel'
   });
 };
-ProcessExecution.prototype.getState = function getState() {
-  const {
-    children,
-    flows,
-    outboundMessageFlows,
-    associations
-  } = this[kElements];
-  return {
-    executionId: this.executionId,
-    stopped: this[kStopped],
-    completed: this[kCompleted],
-    status: this.status,
-    children: children.reduce((result, activity) => {
-      if (activity.placeholder) return result;
-      result.push(activity.getState());
-      return result;
-    }, []),
-    ...(flows.length && {
-      flows: flows.map(f => f.getState())
-    }),
-    ...(outboundMessageFlows.length && {
-      messageFlows: outboundMessageFlows.length && outboundMessageFlows.map(f => f.getState())
-    }),
-    ...(associations.length && {
-      associations: associations.map(f => f.getState())
-    })
-  };
-};
 ProcessExecution.prototype.getActivities = function getActivities() {
   return this[kElements].children.slice();
 };

package/dist/tasks/SubProcess.js

@@ -86,7 +86,6 @@ SubProcessBehaviour.prototype.execute = function execute(executeMessage) {
     return loopCharacteristics.execute(executeMessage);
   }
   const processExecution = this._upsertExecution(executeMessage);
-  if (!processExecution) return;
   return processExecution.execute(executeMessage);
 };
 SubProcessBehaviour.prototype.stop = function stop() {
@@ -135,7 +134,7 @@ SubProcessBehaviour.prototype.recover = function recover(state) {
     executions.splice(0);
   }
   const subEnvironment = this.environment.clone().recover(state.environment);
-  const subContext = this.context.clone(subEnvironment);
+  const subContext = this.context.clone(subEnvironment, this.activity);
   const execution = new _ProcessExecution.default(this.activity, subContext).recover(state);
   executions.push(execution);
   return execution;
@@ -168,7 +167,7 @@ SubProcessBehaviour.prototype._upsertExecution = function upsertExecution(execut
     return execution;
   }
   const subEnvironment = this.environment.clone();
-  const subContext = this.context.clone(subEnvironment);
+  const subContext = this.context.clone(subEnvironment, this.activity);
   execution = new _ProcessExecution.default(this.activity, subContext);
   this[kExecutions].push(execution);
   this._addListeners(execution, executionId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bpmn-elements",
-  "version": "10.0.0",
+  "version": "11.0.0",
   "description": "Executable workflow elements based on BPMN 2.0",
   "type": "module",
   "main": "dist/index.js",
@@ -13,11 +13,11 @@
   },
   "sideEffects": false,
   "scripts": {
-    "test": "mocha -R dot",
+    "test": "mocha -R @bonniernews/hot-bev -p -t 3000",
     "posttest": "npm run lint && npm run dist",
     "lint": "eslint . --cache",
     "prepack": "npm run dist",
-    "cov:html": "c8 -r html -r text mocha -R dot",
+    "cov:html": "c8 -r html -r text mocha -R @bonniernews/hot-bev -p -t 3000",
     "test:lcov": "c8 -r lcov mocha && npm run lint",
     "dist": "babel src -d dist/"
   },
@@ -45,22 +45,23 @@
   ],
   "devDependencies": {
     "@aircall/expression-parser": "^1.0.4",
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.21.8",
-    "@babel/preset-env": "^7.21.5",
-    "@babel/register": "^7.21.0",
+    "@babel/cli": "^7.22.5",
+    "@babel/core": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
+    "@babel/register": "^7.22.5",
+    "@bonniernews/hot-bev": "^0.4.0",
     "bpmn-moddle": "^8.0.1",
-    "c8": "^7.13.0",
+    "c8": "^8.0.0",
     "camunda-bpmn-moddle": "^7.0.1",
     "chai": "^4.3.7",
     "chronokinesis": "^5.0.2",
     "debug": "^4.3.4",
-    "eslint": "^8.41.0",
+    "eslint": "^8.43.0",
     "eslint-plugin-import": "^2.27.5",
-    "got": "^12.6.0",
+    "got": "^12.6.1",
     "mocha": "^10.1.0",
     "mocha-cakes-2": "^3.3.0",
-    "moddle-context-serializer": "^3.2.2",
+    "moddle-context-serializer": "^4.0.0",
     "nock": "^13.3.1"
   },
   "dependencies": {

package/src/Context.js

@@ -3,12 +3,14 @@ import Environment from './Environment.js';
 import ExtensionsMapper from './ExtensionsMapper.js';
 import {getUniqueId} from './shared.js';
 
+const kOwner = Symbol.for('owner');
+
 export default function Context(definitionContext, environment) {
   environment = environment ? environment.clone() : new Environment();
   return new ContextInstance(definitionContext, environment);
 }
 
-function ContextInstance(definitionContext, environment) {
+function ContextInstance(definitionContext, environment, owner) {
   const {id = 'Def', name, type = 'context'} = definitionContext;
   const sid = getUniqueId(id);
   this.id = id;
@@ -29,8 +31,15 @@ function ContextInstance(definitionContext, environment) {
     sequenceFlowRefs: {},
     sequenceFlows: [],
   };
+  this[kOwner] = owner;
 }
 
+Object.defineProperty(ContextInstance.prototype, 'owner', {
+  get() {
+    return this[kOwner];
+  },
+});
+
 ContextInstance.prototype.getActivityById = function getActivityById(activityId) {
   const activityInstance = this.refs.activityRefs[activityId];
   if (activityInstance) return activityInstance;
@@ -106,8 +115,8 @@ ContextInstance.prototype.upsertAssociation = function upsertAssociation(associa
   return instance;
 };
 
-ContextInstance.prototype.clone = function clone(newEnvironment) {
-  return new ContextInstance(this.definitionContext, newEnvironment || this.environment);
+ContextInstance.prototype.clone = function clone(newEnvironment, newOwner) {
+  return new ContextInstance(this.definitionContext, newEnvironment || this.environment, newOwner);
 };
 
 ContextInstance.prototype.getProcessById = function getProcessById(processId) {
@@ -120,6 +129,8 @@ ContextInstance.prototype.getProcessById = function getProcessById(processId) {
 
   const bpContext = this.clone(this.environment.clone());
   bp = refs[processId] = new processDefinition.Behaviour(processDefinition, bpContext);
+  bpContext[kOwner] = bp;
+
   this.refs.processes.push(bp);
 
   return bp;
@@ -128,7 +139,11 @@ ContextInstance.prototype.getProcessById = function getProcessById(processId) {
 ContextInstance.prototype.getNewProcessById = function getNewProcessById(processId) {
   if (!this.getProcessById(processId)) return null;
   const bpDef = this.definitionContext.getProcessById(processId);
-  const bp = new bpDef.Behaviour(bpDef, this.clone(this.environment.clone()));
+
+  const bpContext = this.clone(this.environment.clone());
+  const bp = new bpDef.Behaviour(bpDef, bpContext);
+  bpContext[kOwner] = bp;
+
   return bp;
 };
 
@@ -201,3 +216,11 @@ ContextInstance.prototype.loadExtensions = function loadExtensions(activity) {
   if (!extensions.extensions.length) return;
   return extensions;
 };
+
+ContextInstance.prototype.getActivityParentById = function getActivityParentById(activityId) {
+  const owner = this[kOwner];
+  if (owner) return owner;
+  const activity = this.getActivityById(activityId);
+  const parentId = activity.parent.id;
+  return this.getProcessById(parentId) || this.getActivityById(parentId);
+};

package/src/activity/Activity.js

@@ -87,6 +87,7 @@ function Activity(Behaviour, activityDef, context) {
     isTransaction: activityDef.isTransaction,
     isParallelJoin,
     isThrowing: activityDef.isThrowing,
+    lane: activityDef.lane && activityDef.lane.id,
   };
   this[kExec] = {};
 
@@ -235,6 +236,16 @@ Object.defineProperty(Activity.prototype, 'attachedTo', {
   },
 });
 
+Object.defineProperty(Activity.prototype, 'lane', {
+  enumerable: true,
+  get() {
+    const laneId = this[kFlags].lane;
+    if (!laneId) return undefined;
+    const parent = this.parentElement;
+    return parent.getLaneById && parent.getLaneById(laneId);
+  },
+});
+
 Object.defineProperty(Activity.prototype, 'eventDefinitions', {
   enumerable: true,
   get() {
@@ -242,6 +253,13 @@ Object.defineProperty(Activity.prototype, 'eventDefinitions', {
   },
 });
 
+Object.defineProperty(Activity.prototype, 'parentElement', {
+  enumerable: true,
+  get() {
+    return this.context.getActivityParentById(this.id);
+  },
+});
+
 Activity.prototype.activate = function activate() {
   this[kActivated] = true;
   this.addInboundListeners();
@@ -283,6 +301,21 @@ Activity.prototype.run = function run(runContent) {
   this._consumeRunQ();
 };
 
+Activity.prototype.getState = function getState() {
+  const status = this.status;
+  const exec = this[kExec];
+  return {
+    id: this.id,
+    type: this.type,
+    ...(status && {status}),
+    executionId: exec.executionId,
+    stopped: this.stopped,
+    counters: this.counters,
+    broker: this.broker.getState(true),
+    execution: exec.execution && exec.execution.getState(),
+  };
+};
+
 Activity.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error(`cannot recover running activity <${this.id}>`);
   if (!state) return;
@@ -371,21 +404,6 @@ Activity.prototype.evaluateOutbound = function evaluateOutbound(fromMessage, dis
   return this[kFlows].outboundEvaluator.evaluate(fromMessage, discardRestAtTake, callback);
 };
 
-Activity.prototype.getState = function getState() {
-  const msg = this._createMessage();
-
-  const exec = this[kExec];
-  return {
-    ...msg,
-    executionId: exec.executionId,
-    stopped: this.stopped,
-    behaviour: {...this.behaviour},
-    counters: this.counters,
-    broker: this.broker.getState(true),
-    execution: exec.execution && exec.execution.getState(),
-  };
-};
-
 Activity.prototype.getApi = function getApi(message) {
   const execution = this[kExec].execution;
   if (execution && !execution.completed) return execution.getApi(message);

package/src/definition/Definition.js

@@ -162,6 +162,17 @@ Definition.prototype.resume = function resume(callback) {
   return this;
 };
 
+Definition.prototype.getState = function getState() {
+  return this._createMessage({
+    status: this.status,
+    stopped: this.stopped,
+    counters: this.counters,
+    environment: this.environment.getState(),
+    execution: this.execution && this.execution.getState(),
+    broker: this.broker.getState(true),
+  });
+};
+
 Definition.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error('cannot recover running definition');
   if (!state) return this;
@@ -222,17 +233,6 @@ Definition.prototype._shakeProcess = function shakeProcess(shakeBp, startId) {
   return shakeResult;
 };
 
-Definition.prototype.getState = function getState() {
-  return this._createMessage({
-    status: this.status,
-    stopped: this.stopped,
-    counters: this.counters,
-    environment: this.environment.getState(),
-    execution: this.execution && this.execution.getState(),
-    broker: this.broker.getState(true),
-  });
-};
-
 Definition.prototype.getProcesses = function getProcesses() {
   const execution = this.execution;
   if (execution) return execution.getProcesses();

package/src/definition/DefinitionExecution.js

@@ -322,32 +322,29 @@ DefinitionExecution.prototype._activate = function activate(processList) {
 
 DefinitionExecution.prototype._activateProcess = function activateProcess(bp) {
   const handlers = this[kMessageHandlers];
+  const broker = bp.broker;
 
-  bp.broker.subscribeTmp('message', 'message.outbound', handlers.onMessageOutbound, {
+  broker.subscribeTmp('message', 'message.outbound', handlers.onMessageOutbound, {
     noAck: true,
     consumerTag: '_definition-outbound-message-consumer',
   });
-  bp.broker.subscribeTmp('event', 'activity.signal', handlers.onDelegateMessage, {
-    noAck: true,
-    consumerTag: '_definition-signal-consumer',
-    priority: 200,
-  });
-  bp.broker.subscribeTmp('event', 'activity.message', handlers.onDelegateMessage, {
-    noAck: true,
-    consumerTag: '_definition-message-consumer',
-    priority: 200,
-  });
-  bp.broker.subscribeTmp('event', 'activity.call', handlers.onCallActivity, {
+
+  const delegateEventQ = broker.assertQueue('_delegate-event-q', {autoDelete: false, durable: false});
+  delegateEventQ.consume(handlers.onDelegateMessage, {noAck: true, consumerTag: '_definition-signal-consumer'});
+  broker.bindQueue('_delegate-event-q', 'event', 'activity.signal', {priority: 200});
+  broker.bindQueue('_delegate-event-q', 'event', 'activity.message', {priority: 200});
+
+  broker.subscribeTmp('event', 'activity.call', handlers.onCallActivity, {
     noAck: true,
     consumerTag: '_definition-call-consumer',
     priority: 200,
   });
-  bp.broker.subscribeTmp('event', 'activity.call.cancel', handlers.onCancelCallActivity, {
+  broker.subscribeTmp('event', 'activity.call.cancel', handlers.onCancelCallActivity, {
     noAck: true,
     consumerTag: '_definition-call-cancel-consumer',
     priority: 200,
   });
-  bp.broker.subscribeTmp('event', '#', handlers.onChildEvent, {
+  broker.subscribeTmp('event', '#', handlers.onChildEvent, {
     noAck: true,
     consumerTag: '_definition-activity-consumer',
     priority: 100,
@@ -383,7 +380,6 @@ DefinitionExecution.prototype._deactivateProcess = function deactivateProcess(bp
   bp.broker.cancel('_definition-outbound-message-consumer');
   bp.broker.cancel('_definition-activity-consumer');
   bp.broker.cancel('_definition-signal-consumer');
-  bp.broker.cancel('_definition-message-consumer');
   bp.broker.cancel('_definition-call-consumer');
   bp.broker.cancel('_definition-call-cancel-consumer');
 };

package/src/flows/Association.js

@@ -59,10 +59,12 @@ Association.prototype.discard = function discard(content = {}) {
 };
 
 Association.prototype.getState = function getState() {
-  return this._createMessageContent({
+  return {
+    id: this.id,
+    type: this.type,
     counters: this.counters,
     broker: this.broker.getState(true),
-  });
+  };
 };
 
 Association.prototype.recover = function recover(state) {

package/src/flows/MessageFlow.js

@@ -46,11 +46,13 @@ MessageFlow.prototype.getState = function getState() {
     id: this.id,
     type: this.type,
     counters: this.counters,
+    broker: this.broker.getState(true),
   };
 };
 
 MessageFlow.prototype.recover = function recover(state) {
   Object.assign(this[kCounters], state.counters);
+  this.broker.recover(state.broker);
 };
 
 MessageFlow.prototype.getApi = function getApi(message) {

package/src/flows/SequenceFlow.js

@@ -75,10 +75,12 @@ SequenceFlow.prototype.discard = function discard(content = {}) {
 };
 
 SequenceFlow.prototype.getState = function getState() {
-  return this.createMessage({
+  return {
+    id: this.id,
+    type: this.type,
     counters: this.counters,
     broker: this.broker.getState(true),
-  });
+  };
 };
 
 SequenceFlow.prototype.recover = function recover(state) {

package/src/index.js

@@ -23,6 +23,7 @@ import InclusiveGateway from './gateways/InclusiveGateway.js';
 import InputOutputSpecification from './io/InputOutputSpecification.js';
 import IntermediateCatchEvent from './events/IntermediateCatchEvent.js';
 import IntermediateThrowEvent from './events/IntermediateThrowEvent.js';
+import Lane from './process/Lane.js';
 import LinkEventDefinition from './eventDefinitions/LinkEventDefinition.js';
 import LoopCharacteristics from './tasks/LoopCharacteristics.js';
 import Message from './activity/Message.js';
@@ -82,6 +83,7 @@ export {
   Message,
   MessageEventDefinition,
   MessageFlow,
+  Lane,
   LoopCharacteristics as MultiInstanceLoopCharacteristics,
   ParallelGateway,
   Process,

package/src/process/Lane.js

@@ -0,0 +1,27 @@
+const kProcess = Symbol.for('process');
+
+export default function Lane(process, laneDefinition) {
+  const {broker, environment} = process;
+  const {id, type, behaviour} = laneDefinition;
+
+  this[kProcess] = process;
+
+  this.id = id;
+  this.type = type;
+  this.name = behaviour.name;
+  this.parent = {
+    id: process.id,
+    type: process.type,
+  };
+  this.behaviour = {...behaviour};
+  this.environment = environment;
+  this.broker = broker;
+  this.context = process.context;
+  this.logger = environment.Logger(type.toLowerCase());
+}
+
+Object.defineProperty(Lane.prototype, 'process', {
+  get() {
+    return this[kProcess];
+  },
+});

package/src/process/Process.js

@@ -10,6 +10,7 @@ const kCounters = Symbol.for('counters');
 const kExec = Symbol.for('execution');
 const kExecuteMessage = Symbol.for('executeMessage');
 const kExtensions = Symbol.for('extensions');
+const kLanes = Symbol.for('lanes');
 const kMessageHandlers = Symbol.for('messageHandlers');
 const kStateMessage = Symbol.for('stateMessage');
 const kStatus = Symbol.for('status');
@@ -53,6 +54,9 @@ export function Process(processDef, context) {
 
   this.logger = environment.Logger(type.toLowerCase());
 
+  if (behaviour.lanes) {
+    this[kLanes] = behaviour.lanes.map((lane) => new lane.Behaviour(this, lane));
+  }
   this[kExtensions] = context.loadExtensions(this);
 }
 
@@ -63,6 +67,14 @@ Object.defineProperty(Process.prototype, 'counters', {
   },
 });
 
+Object.defineProperty(Process.prototype, 'lanes', {
+  enumerable: true,
+  get() {
+    const lanes = this[kLanes];
+    return lanes && lanes.slice();
+  },
+});
+
 Object.defineProperty(Process.prototype, 'extensions', {
   enumerable: true,
   get() {
@@ -149,6 +161,20 @@ Process.prototype.resume = function resume() {
   return this;
 };
 
+Process.prototype.getState = function getState() {
+  return {
+    id: this.id,
+    type: this.type,
+    executionId: this.executionId,
+    environment: this.environment.getState(),
+    status: this.status,
+    stopped: this.stopped,
+    counters: this.counters,
+    broker: this.broker.getState(true),
+    execution: this.execution && this.execution.getState(),
+  };
+};
+
 Process.prototype.recover = function recover(state) {
   if (this.isRunning) throw new Error(`cannot recover running process <${this.id}>`);
   if (!state) return this;
@@ -189,17 +215,6 @@ Process.prototype.signal = function signal(message) {
   return this.getApi().signal(message, {delegate: true});
 };
 
-Process.prototype.getState = function getState() {
-  return this._createMessage({
-    environment: this.environment.getState(),
-    status: this.status,
-    stopped: this.stopped,
-    counters: this.counters,
-    broker: this.broker.getState(true),
-    execution: this.execution && this.execution.getState(),
-  });
-};
-
 Process.prototype.cancelActivity = function cancelActivity(message) {
   return this.getApi().cancel(message, {delegate: true});
 };
@@ -399,6 +414,12 @@ Process.prototype.getSequenceFlows = function getSequenceFlows() {
   return this.context.getSequenceFlows();
 };
 
+Process.prototype.getLaneById = function getLaneById(laneId) {
+  const lanes = this[kLanes];
+  if (!lanes) return;
+  return lanes.find((lane) => lane.id === laneId);
+};
+
 Process.prototype.getPostponed = function getPostponed(...args) {
   const execution = this.execution;
   if (!execution) return [];

package/src/process/ProcessExecution.js

@@ -169,6 +169,24 @@ ProcessExecution.prototype.resume = function resume() {
   if (!postponed.length && status === 'executing') return this._complete('completed');
 };
 
+ProcessExecution.prototype.getState = function getState() {
+  const {children, flows, outboundMessageFlows, associations} = this[kElements];
+  return {
+    executionId: this.executionId,
+    stopped: this[kStopped],
+    completed: this[kCompleted],
+    status: this.status,
+    children: children.reduce((result, activity) => {
+      if (activity.placeholder) return result;
+      result.push(activity.getState());
+      return result;
+    }, []),
+    ...(flows.length && {flows: flows.map((f) => f.getState())}),
+    ...(outboundMessageFlows.length && {messageFlows: outboundMessageFlows.length && outboundMessageFlows.map((f) => f.getState())}),
+    ...(associations.length && {associations: associations.map((f) => f.getState())}),
+  };
+};
+
 ProcessExecution.prototype.recover = function recover(state) {
   if (!state) return this;
   this.executionId = state.executionId;
@@ -282,24 +300,6 @@ ProcessExecution.prototype.cancel = function discard() {
   }, { type: 'cancel' });
 };
 
-ProcessExecution.prototype.getState = function getState() {
-  const {children, flows, outboundMessageFlows, associations} = this[kElements];
-  return {
-    executionId: this.executionId,
-    stopped: this[kStopped],
-    completed: this[kCompleted],
-    status: this.status,
-    children: children.reduce((result, activity) => {
-      if (activity.placeholder) return result;
-      result.push(activity.getState());
-      return result;
-    }, []),
-    ...(flows.length && {flows: flows.map((f) => f.getState())}),
-    ...(outboundMessageFlows.length && {messageFlows: outboundMessageFlows.length && outboundMessageFlows.map((f) => f.getState())}),
-    ...(associations.length && {associations: associations.map((f) => f.getState())}),
-  };
-};
-
 ProcessExecution.prototype.getActivities = function getActivities() {
   return this[kElements].children.slice();
 };

package/src/tasks/SubProcess.js

@@ -76,8 +76,6 @@ SubProcessBehaviour.prototype.execute = function execute(executeMessage) {
   }
 
   const processExecution = this._upsertExecution(executeMessage);
-  if (!processExecution) return;
-
   return processExecution.execute(executeMessage);
 };
 
@@ -135,7 +133,7 @@ SubProcessBehaviour.prototype.recover = function recover(state) {
   }
 
   const subEnvironment = this.environment.clone().recover(state.environment);
-  const subContext = this.context.clone(subEnvironment);
+  const subContext = this.context.clone(subEnvironment, this.activity);
 
   const execution = new ProcessExecution(this.activity, subContext).recover(state);
 
@@ -176,7 +174,7 @@ SubProcessBehaviour.prototype._upsertExecution = function upsertExecution(execut
   }
 
   const subEnvironment = this.environment.clone();
-  const subContext = this.context.clone(subEnvironment);
+  const subContext = this.context.clone(subEnvironment, this.activity);
 
   execution = new ProcessExecution(this.activity, subContext);
   this[kExecutions].push(execution);

package/types/index.d.ts

@@ -288,6 +288,8 @@ declare module 'bpmn-elements' {
     get sid(): string;
     get definitionContext(): SerializableContext;
     get environment(): Environment;
+    /** Context owner, Process or SubProcess activity */
+    get owner(): Process | Activity | undefined;
     getActivityById<T>(activityId: string): T;
     getSequenceFlowById(sequenceFlowId: string): SequenceFlow;
     getInboundSequenceFlows(activityId: string): SequenceFlow[];
@@ -429,6 +431,7 @@ declare module 'bpmn-elements' {
     constructor(processDef: SerializableElement, context: Context);
     get isExecutable(): boolean;
     get counters(): completedCounters;
+    get lanes(): Lane[] | undefined;
     get extensions(): IExtension;
     get stopped(): boolean;
     get isRunning(): boolean;
@@ -448,6 +451,7 @@ declare module 'bpmn-elements' {
     getActivities(): Activity[];
     getStartActivities(filterOptions?: startActivityFilterOptions): Activity[];
     getSequenceFlows(): SequenceFlow[];
+    getLaneById(laneId: string): Lane | undefined;
     getPostponed(filterFn: filterPostponed): Api<ElementBase>[];
   }
 
@@ -471,6 +475,24 @@ declare module 'bpmn-elements' {
     getApi(message?: ElementBrokerMessage): Api<ElementBase>;
   }
 
+  class Lane extends ElementBase {
+    constructor(process: Process, laneDefinition: SerializableElement);
+    /** Process broker */
+    get broker(): Broker;
+    get process(): Process;
+  }
+
+  interface ISequenceFlowCondition {
+    /** Condition type, e.g. script or expression */
+    get type(): string;
+    /**
+     * Execute sequence flow condition
+     * @param message Source element execution message
+     * @param callback Callback with truthy result if flow should be taken
+     */
+    execute(message: ElementBrokerMessage, callback: (err: Error, result: any) => void): void;
+  }
+
   class SequenceFlow extends Element<SequenceFlow> {
     get sourceId(): string;
     get targetId(): string;
@@ -480,7 +502,7 @@ declare module 'bpmn-elements' {
     take(content?: any): boolean;
     discard(content?: any): void;
     shake(message: any): number;
-    getCondition(): any;
+    getCondition(): ISequenceFlowCondition | null;
     createMessage(override?: any): object;
     /**
      * Evaluate flow
@@ -496,6 +518,7 @@ declare module 'bpmn-elements' {
     get id(): string;
     get processId(): string;
   }
+
   class MessageFlow extends Element<MessageFlow> {
     get source(): MessageFlowReference;
     get target(): MessageFlowReference;
@@ -596,6 +619,8 @@ declare module 'bpmn-elements' {
     get triggeredByEvent(): boolean;
     get attachedTo(): Activity;
     get eventDefinitions(): EventDefinition[];
+    /** Parent element process or sub process reference */
+    get parentElement(): Process | Activity;
     activate(): void;
     deactivate(): void;
     init(initContent?: any): void;