bpmn-elements 12.0.0 → 13.1.0

package/src/process/Process.js

@@ -60,68 +60,54 @@ export function Process(processDef, context) {
   this[kExtensions] = context.loadExtensions(this);
 }
 
-Object.defineProperty(Process.prototype, 'counters', {
-  enumerable: true,
-  get() {
-    return {...this[kCounters]};
+Object.defineProperties(Process.prototype, {
+  counters: {
+    get() {
+      return {...this[kCounters]};
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'lanes', {
-  enumerable: true,
-  get() {
-    const lanes = this[kLanes];
-    return lanes && lanes.slice();
+  lanes: {
+    get() {
+      const lanes = this[kLanes];
+      return lanes && lanes.slice();
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'extensions', {
-  enumerable: true,
-  get() {
-    return this[kExtensions];
+  extensions: {
+    get() {
+      return this[kExtensions];
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'stopped', {
-  enumerable: true,
-  get() {
-    return this[kStopped];
+  stopped: {
+    get() {
+      return this[kStopped];
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'isRunning', {
-  enumerable: true,
-  get() {
-    if (!this[kConsuming]) return false;
-    return !!this.status;
+  isRunning: {
+    get() {
+      if (!this[kConsuming]) return false;
+      return !!this.status;
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'executionId', {
-  enumerable: true,
-  get() {
-    const {executionId, initExecutionId} = this[kExec];
-    return executionId || initExecutionId;
+  executionId: {
+    get() {
+      const {executionId, initExecutionId} = this[kExec];
+      return executionId || initExecutionId;
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'execution', {
-  enumerable: true,
-  get() {
-    return this[kExec].execution;
+  execution: {
+    get() {
+      return this[kExec].execution;
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'status', {
-  enumerable: true,
-  get() {
-    return this[kStatus];
+  status: {
+    get() {
+      return this[kStatus];
+    },
   },
-});
-
-Object.defineProperty(Process.prototype, 'activityStatus', {
-  get() {
-    return this[kExec].execution && this[kExec].execution.activityStatus || 'idle';
+  activityStatus: {
+    get() {
+      return this[kExec].execution && this[kExec].execution.activityStatus || 'idle';
+    },
   },
 });
 

package/src/process/ProcessExecution.js

@@ -58,42 +58,36 @@ function ProcessExecution(parentActivity, context) {
   };
 }
 
-Object.defineProperty(ProcessExecution.prototype, 'stopped', {
-  enumerable: true,
-  get() {
-    return this[kStopped];
+Object.defineProperties(ProcessExecution.prototype, {
+  stopped: {
+    get() {
+      return this[kStopped];
+    },
   },
-});
-
-Object.defineProperty(ProcessExecution.prototype, 'completed', {
-  enumerable: true,
-  get() {
-    return this[kCompleted];
+  completed: {
+    get() {
+      return this[kCompleted];
+    },
   },
-});
-
-Object.defineProperty(ProcessExecution.prototype, 'status', {
-  enumerable: true,
-  get() {
-    return this[kStatus];
+  status: {
+    get() {
+      return this[kStatus];
+    },
   },
-});
-
-Object.defineProperty(ProcessExecution.prototype, 'postponedCount', {
-  get() {
-    return this[kElements].postponed.length;
+  postponedCount: {
+    get() {
+      return this[kElements].postponed.length;
+    },
   },
-});
-
-Object.defineProperty(ProcessExecution.prototype, 'isRunning', {
-  get() {
-    return this[kActivated];
+  isRunning: {
+    get() {
+      return this[kActivated];
+    },
   },
-});
-
-Object.defineProperty(ProcessExecution.prototype, 'activityStatus', {
-  get() {
-    return this[kTracker].activityStatus;
+  activityStatus: {
+    get() {
+      return this[kTracker].activityStatus;
+    },
   },
 });
 
@@ -171,6 +165,13 @@ ProcessExecution.prototype.resume = function resume() {
 
 ProcessExecution.prototype.getState = function getState() {
   const {children, flows, outboundMessageFlows, associations} = this[kElements];
+
+  const flowStates = flows.reduce((result, flow) => {
+    const elmState = flow.getState();
+    if (elmState) result.push(elmState);
+    return result;
+  }, []);
+
   return {
     executionId: this.executionId,
     stopped: this[kStopped],
@@ -178,12 +179,13 @@ ProcessExecution.prototype.getState = function getState() {
     status: this.status,
     children: children.reduce((result, activity) => {
       if (activity.placeholder) return result;
-      result.push(activity.getState());
+      const elmState = activity.getState();
+      if (elmState) result.push(elmState);
       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())}),
+    ...(flows.length && { flows: flowStates }),
+    ...(outboundMessageFlows.length && { messageFlows: outboundMessageFlows.length && outboundMessageFlows.map((f) => f.getState()).filter(Boolean) }),
+    ...(associations.length && { associations: associations.map((f) => f.getState()).filter(Boolean) }),
   };
 };
 

package/src/tasks/SubProcess.js

@@ -44,12 +44,12 @@ export function SubProcessBehaviour(activity, context) {
 }
 
 Object.defineProperties(SubProcessBehaviour.prototype, {
-  'execution': {
+  execution: {
     get() {
       return this[kExecutions][0];
     },
   },
-  'executions': {
+  executions: {
     get() {
       return this[kExecutions].slice();
     },

package/src/tasks/index.js

@@ -0,0 +1,8 @@
+export * from './CallActivity.js';
+export * from './ReceiveTask.js';
+export * from './ScriptTask.js';
+export * from './ServiceTask.js';
+export * from './SignalTask.js';
+export * from './SubProcess.js';
+export * from './Task.js';
+export * from './Transaction.js';

package/tasks.d.ts

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