bpmn-elements 7.0.0 → 8.0.0

package/src/flows/Association.js

@@ -3,7 +3,7 @@ import {EventBroker} from '../EventBroker';
 import {FlowApi} from '../Api';
 import {getUniqueId} from '../shared';
 
-const countersSymbol = Symbol.for('counters');
+const kCounters = Symbol.for('counters');
 
 export default function Association(associationDef, {environment}) {
   const {id, type = 'association', name, parent, targetId, sourceId, behaviour = {}} = associationDef;
@@ -19,7 +19,7 @@ export default function Association(associationDef, {environment}) {
   this.environment = environment;
   const logger = this.logger = environment.Logger(type.toLowerCase());
 
-  this[countersSymbol] = {
+  this[kCounters] = {
     complete: 0,
     take: 0,
     discard: 0,
@@ -39,13 +39,13 @@ const proto = Association.prototype;
 Object.defineProperty(proto, 'counters', {
   enumerable: true,
   get() {
-    return {...this[countersSymbol]};
+    return {...this[kCounters]};
   },
 });
 
 proto.take = function take(content = {}) {
   this.logger.debug(`<${this.id}> take target <${this.targetId}>`);
-  ++this[countersSymbol].take;
+  ++this[kCounters].take;
 
   this._publishEvent('take', content);
 
@@ -54,7 +54,7 @@ proto.take = function take(content = {}) {
 
 proto.discard = function discard(content = {}) {
   this.logger.debug(`<${this.id}> discard target <${this.targetId}>`);
-  ++this[countersSymbol].discard;
+  ++this[kCounters].discard;
 
   this._publishEvent('discard', content);
 
@@ -63,7 +63,7 @@ proto.discard = function discard(content = {}) {
 
 proto.complete = function complete(content = {}) {
   this.logger.debug(`<${this.id}> completed target <${this.targetId}>`);
-  ++this[countersSymbol].complete;
+  ++this[kCounters].complete;
 
   this._publishEvent('complete', content);
 
@@ -78,7 +78,7 @@ proto.getState = function getState() {
 };
 
 proto.recover = function recover(state) {
-  Object.assign(this[countersSymbol], state.counters);
+  Object.assign(this[kCounters], state.counters);
   this.broker.recover(state.broker);
 };
 

package/src/flows/MessageFlow.js

@@ -2,8 +2,8 @@ import {brokerSafeId} from '../shared';
 import {cloneParent} from '../messageHelper';
 import {MessageFlowBroker} from '../EventBroker';
 
-const countersSymbol = Symbol.for('counters');
-const sourceElementSymbol = Symbol.for('sourceElement');
+const kCounters = Symbol.for('counters');
+const kSourceElement = Symbol.for('sourceElement');
 
 export default function MessageFlow(flowDef, context) {
   const {id, type = 'messageflow', name, target, source, behaviour, parent} = flowDef;
@@ -18,7 +18,7 @@ export default function MessageFlow(flowDef, context) {
   this.environment = context.environment;
   this.context = context;
 
-  this[countersSymbol] = {
+  this[kCounters] = {
     messages: 0,
   };
 
@@ -29,7 +29,7 @@ export default function MessageFlow(flowDef, context) {
   this.emit = emit;
   this.waitFor = waitFor;
 
-  this[sourceElementSymbol] = context.getActivityById(source.id) || context.getProcessById(source.processId);
+  this[kSourceElement] = context.getActivityById(source.id) || context.getProcessById(source.processId);
   this.logger = context.environment.Logger(type.toLowerCase());
 }
 
@@ -38,7 +38,7 @@ const proto = MessageFlow.prototype;
 Object.defineProperty(proto, 'counters', {
   enumerable: true,
   get() {
-    return {...this[countersSymbol]};
+    return {...this[kCounters]};
   },
 });
 
@@ -51,7 +51,7 @@ proto.getState = function getState() {
 };
 
 proto.recover = function recover(state) {
-  Object.assign(this[countersSymbol], state.counters);
+  Object.assign(this[kCounters], state.counters);
 };
 
 proto.getApi = function getApi() {
@@ -59,21 +59,21 @@ proto.getApi = function getApi() {
 };
 
 proto.activate = function activate() {
-  const sourceElement = this[sourceElementSymbol];
+  const sourceElement = this[kSourceElement];
   const safeId = brokerSafeId(this.id);
   sourceElement.on('message', this.deactivate.bind(this), {consumerTag: `_message-on-message-${safeId}`});
   sourceElement.on('end', this._onSourceEnd.bind(this), {consumerTag: `_message-on-end-${safeId}`});
 };
 
 proto.deactivate = function deactivate() {
-  const sourceElement = this[sourceElementSymbol];
+  const sourceElement = this[kSourceElement];
   const safeId = brokerSafeId(this.id);
   sourceElement.broker.cancel(`_message-on-end-${safeId}`);
   sourceElement.broker.cancel(`_message-on-message-${safeId}`);
 };
 
 proto._onSourceEnd = function onSourceEnd({content}) {
-  ++this[countersSymbol].messages;
+  ++this[kCounters].messages;
   const source = this.source;
   const target = this.target;
   this.logger.debug(`<${this.id}> sending message from <${source.processId}.${source.id}> to <${target.id ? `${target.processId}.${target.id}` : target.processId}>`);

package/src/flows/SequenceFlow.js

@@ -4,7 +4,7 @@ import {getUniqueId} from '../shared';
 import {EventBroker} from '../EventBroker';
 import {FlowApi} from '../Api';
 
-const countersSymbol = Symbol.for('counters');
+const kCounters = Symbol.for('counters');
 
 export default SequenceFlow;
 
@@ -23,7 +23,7 @@ function SequenceFlow(flowDef, {environment}) {
   this.environment = environment;
   const logger = this.logger = environment.Logger(type.toLowerCase());
 
-  this[countersSymbol] = {
+  this[kCounters] = {
     looped: 0,
     take: 0,
     discard: 0,
@@ -45,7 +45,7 @@ const proto = SequenceFlow.prototype;
 Object.defineProperty(proto, 'counters', {
   enumerable: true,
   get() {
-    return {...this[countersSymbol]};
+    return {...this[kCounters]};
   },
 });
 
@@ -55,7 +55,7 @@ proto.take = function take(content = {}) {
   const {sequenceId} = content;
 
   this.logger.debug(`<${sequenceId} (${this.id})> take, target <${this.targetId}>`);
-  ++this[countersSymbol].take;
+  ++this[kCounters].take;
 
   this._publishEvent('take', content);
 
@@ -66,7 +66,7 @@ proto.discard = function discard(content = {}) {
   const {sequenceId = getUniqueId(this.id)} = content;
   const discardSequence = content.discardSequence = (content.discardSequence || []).slice();
   if (discardSequence.indexOf(this.targetId) > -1) {
-    ++this[countersSymbol].looped;
+    ++this[kCounters].looped;
     this.logger.debug(`<${this.id}> discard loop detected <${this.sourceId}> -> <${this.targetId}>. Stop.`);
     return this._publishEvent('looped', content);
   }
@@ -74,7 +74,7 @@ proto.discard = function discard(content = {}) {
   discardSequence.push(this.sourceId);
 
   this.logger.debug(`<${sequenceId} (${this.id})> discard, target <${this.targetId}>`);
-  ++this[countersSymbol].discard;
+  ++this[kCounters].discard;
   this._publishEvent('discard', content);
 };
 
@@ -86,7 +86,7 @@ proto.getState = function getState() {
 };
 
 proto.recover = function recover(state) {
-  Object.assign(this[countersSymbol], state.counters);
+  Object.assign(this[kCounters], state.counters);
   this.broker.recover(state.broker);
 };
 

package/src/gateways/EventBasedGateway.js

@@ -1,8 +1,8 @@
 import Activity from '../activity/Activity';
 import {cloneContent} from '../messageHelper';
 
-const completedSymbol = Symbol.for('completed');
-const targetsSymbol = Symbol.for('targets');
+const kCompleted = Symbol.for('completed');
+const kTargets = Symbol.for('targets');
 
 export default function EventBasedGateway(activityDef, context) {
   return new Activity(EventBasedGatewayBehaviour, activityDef, context);
@@ -14,27 +14,27 @@ export function EventBasedGatewayBehaviour(activity, context) {
   this.activity = activity;
   this.broker = activity.broker;
   this.context = context;
-  this[targetsSymbol] = activity.outbound.map((flow) => context.getActivityById(flow.targetId));
+  this[kTargets] = activity.outbound.map((flow) => context.getActivityById(flow.targetId));
 }
 
 EventBasedGatewayBehaviour.prototype.execute = function execute(executeMessage) {
   const executeContent = executeMessage.content;
   const {executionId, outbound = [], outboundTaken} = executeContent;
 
-  const targets = this[targetsSymbol];
-  this[completedSymbol] = false;
+  const targets = this[kTargets];
+  this[kCompleted] = false;
   if (!targets.length) return this._complete(executeContent);
 
   for (const flow of this.activity.outbound) {
     outbound.push({id: flow.id, action: 'take'});
   }
 
-  if (!this[completedSymbol] && outboundTaken) return;
+  if (!this[kCompleted] && outboundTaken) return;
 
   const targetConsumerTag = `_gateway-listener-${this.id}`;
 
   const onTargetCompleted = this._onTargetCompleted.bind(this, executeMessage);
-  for (const target of this[targetsSymbol]) {
+  for (const target of this[kTargets]) {
     target.broker.subscribeOnce('event', 'activity.end', onTargetCompleted, {consumerTag: targetConsumerTag});
   }
 
@@ -44,7 +44,7 @@ EventBasedGatewayBehaviour.prototype.execute = function execute(executeMessage)
     consumerTag: '_api-stop-execution',
   });
 
-  this[completedSymbol] = false;
+  this[kCompleted] = false;
   if (!executeMessage.fields.redelivered) return broker.publish('execution', 'execute.outbound.take', cloneContent(executeContent, {outboundTaken: true}));
 };
 
@@ -55,7 +55,7 @@ EventBasedGatewayBehaviour.prototype._onTargetCompleted = function onTargetCompl
   this.activity.logger.debug(`<${executionId} (${this.id})> <${targetExecutionId}> completed run, discarding the rest`);
 
   this._stop();
-  for (const target of this[targetsSymbol]) {
+  for (const target of this[kTargets]) {
     if (target === owner) continue;
     target.discard();
   }
@@ -72,13 +72,13 @@ EventBasedGatewayBehaviour.prototype._onTargetCompleted = function onTargetCompl
 };
 
 EventBasedGatewayBehaviour.prototype._complete = function complete(completedContent) {
-  this[completedSymbol] = true;
+  this[kCompleted] = true;
   this.broker.publish('execution', 'execute.completed', cloneContent(completedContent));
 };
 
 EventBasedGatewayBehaviour.prototype._stop = function stop() {
   const targetConsumerTag = `_gateway-listener-${this.id}`;
-  for (const target of this[targetsSymbol]) target.broker.cancel(targetConsumerTag);
+  for (const target of this[kTargets]) target.broker.cancel(targetConsumerTag);
   this.broker.cancel('_api-stop-execution');
 };
 

package/src/io/BpmnIO.js

@@ -2,7 +2,11 @@ export default function BpmnIO(activity, context) {
   this.activity = activity;
   this.context = context;
 
-  const {ioSpecification: ioSpecificationDef, properties: propertiesDef} = activity.behaviour;
+  const {
+    ioSpecification: ioSpecificationDef,
+    properties: propertiesDef,
+  } = activity.behaviour;
+
   this.specification = ioSpecificationDef && new ioSpecificationDef.Behaviour(activity, ioSpecificationDef, context);
   this.properties = propertiesDef && new propertiesDef.Behaviour(activity, propertiesDef, context);
 }

package/src/io/InputOutputSpecification.js

@@ -1,7 +1,7 @@
 import getPropertyValue from '../getPropertyValue';
 import {brokerSafeId} from '../shared';
 
-const consumingSymbol = Symbol.for('consuming');
+const kConsuming = Symbol.for('consuming');
 
 export default function IoSpecification(activity, ioSpecificationDef, context) {
   const {id, type = 'iospecification', behaviour = {}} = ioSpecificationDef;
@@ -16,12 +16,12 @@ export default function IoSpecification(activity, ioSpecificationDef, context) {
 const proto = IoSpecification.prototype;
 
 proto.activate = function activate() {
-  if (this[consumingSymbol]) return;
-  this[consumingSymbol] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {noAck: true});
+  if (this[kConsuming]) return;
+  this[kConsuming] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {noAck: true});
 };
 
 proto.deactivate = function deactivate() {
-  if (this[consumingSymbol]) this[consumingSymbol] = this[consumingSymbol].cancel();
+  if (this[kConsuming]) this[kConsuming] = this[kConsuming].cancel();
 };
 
 proto._onActivityEvent = function onActivityEvent(routingKey, message) {

package/src/io/Properties.js

@@ -1,13 +1,13 @@
 import getPropertyValue from '../getPropertyValue';
 
-const propertiesSymbol = Symbol.for('properties');
-const consumingSymbol = Symbol.for('consuming');
+const kProperties = Symbol.for('properties');
+const kConsuming = Symbol.for('consuming');
 
 export default function Properties(activity, propertiesDef, context) {
   this.activity = activity;
   this.broker = activity.broker;
 
-  const props = this[propertiesSymbol] = {
+  const props = this[kProperties] = {
     properties: [],
     dataInputObjects: [],
     dataOutputObjects: [],
@@ -61,17 +61,17 @@ export default function Properties(activity, propertiesDef, context) {
 const proto = Properties.prototype;
 
 proto.activate = function activate(message) {
-  if (this[consumingSymbol]) return;
+  if (this[kConsuming]) return;
 
   if (message.fields.redelivered && message.content.properties) {
     this._onActivityEvent('activity.extension.resume', message);
   }
 
-  this[consumingSymbol] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {noAck: true});
+  this[kConsuming] = this.broker.subscribeTmp('event', 'activity.#', this._onActivityEvent.bind(this), {noAck: true});
 };
 
 proto.deactivate = function deactivate() {
-  if (this[consumingSymbol]) this[consumingSymbol] = this[consumingSymbol].cancel();
+  if (this[kConsuming]) this[kConsuming] = this[kConsuming].cancel();
 };
 
 proto._onActivityEvent = function onActivityEvent(routingKey, message) {
@@ -91,7 +91,7 @@ proto._onActivityEvent = function onActivityEvent(routingKey, message) {
 proto._formatOnEnter = function formatOnEnter(message) {
   const startRoutingKey = 'run.enter.bpmn-properties';
 
-  const dataInputObjects = this[propertiesSymbol].dataInputObjects;
+  const dataInputObjects = this[kProperties].dataInputObjects;
   const broker = this.broker;
   if (!dataInputObjects.length) {
     return broker.getQueue('format-run-q').queueMessage({routingKey: startRoutingKey}, {
@@ -118,7 +118,7 @@ proto._formatOnComplete = function formatOnComplete(message) {
   const messageOutput = getPropertyValue(message, 'content.output.properties') || {};
   const outputProperties = this._getProperties(message, messageOutput);
 
-  const dataOutputObjects = this[propertiesSymbol].dataOutputObjects;
+  const dataOutputObjects = this[kProperties].dataOutputObjects;
   const broker = this.broker;
   if (!dataOutputObjects.length) {
     return broker.getQueue('format-run-q').queueMessage({routingKey: startRoutingKey}, {
@@ -146,7 +146,7 @@ proto._getProperties = function getProperties(message, values) {
     response = {...message.content.properties};
   }
 
-  for (const {id, type, name} of this[propertiesSymbol].properties) {
+  for (const {id, type, name} of this[kProperties].properties) {
     if (!(id in response)) {
       response[id] = {id, type, name};
     }