bpmn-engine 20.0.0 → 20.0.2

package/README.md

@@ -2,7 +2,7 @@
 
 [![Project Status: Active - The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
 
-[![Build Status](https://app.travis-ci.com/paed01/bpmn-engine.svg?branch=master)](https://app.travis-ci.com/paed01/bpmn-engine)[![Build status](https://ci.appveyor.com/api/projects/status/670n39fivq1g3nu5?svg=true)](https://ci.appveyor.com/project/paed01/bpmn-engine)[![Coverage Status](https://coveralls.io/repos/github/paed01/bpmn-engine/badge.svg?branch=master)](https://coveralls.io/github/paed01/bpmn-engine?branch=master)
+[![Build](https://github.com/paed01/bpmn-engine/actions/workflows/build.yaml/badge.svg)](https://github.com/paed01/bpmn-engine/actions/workflows/build.yaml)[![Build status](https://ci.appveyor.com/api/projects/status/670n39fivq1g3nu5?svg=true)](https://ci.appveyor.com/project/paed01/bpmn-engine)[![Coverage Status](https://coveralls.io/repos/github/paed01/bpmn-engine/badge.svg?branch=master)](https://coveralls.io/github/paed01/bpmn-engine?branch=master)
 
 # Introduction
 

package/lib/index.cjs

@@ -613,30 +613,19 @@ Execution.prototype._onChildMessage = function onChildMessage(routingKey, messag
 
       newState = 'idle';
       break;
-    case 'definition.error':
+    case 'definition.error': {
+      this._saveOutput(owner.environment.output);
       this._teardownDefinition(owner);
       newState = 'error';
       break;
+    }
     case 'activity.wait': {
       if (listener) listener.emit('wait', owner.getApi(message), this);
       break;
     }
     case 'process.end': {
-      if (!message.content.output) break;
-      const environment = this.environment;
-
-      for (const key in message.content.output) {
-        switch (key) {
-          case 'data': {
-            environment.output.data = environment.output.data || {};
-            environment.output.data = { ...environment.output.data, ...message.content.output.data };
-            break;
-          }
-          default: {
-            environment.output[key] = message.content.output[key];
-          }
-        }
-      }
+      if (message.content.inbound) break;
+      this._saveOutput(message.content.output);
       break;
     }
   }
@@ -678,6 +667,21 @@ Execution.prototype._teardownDefinition = function teardownDefinition(definition
   definition.broker.cancel('_engine_definition');
 };
 
+Execution.prototype._saveOutput = function saveOutput(output) {
+  if (!output || typeof output !== 'object') return;
+
+  const environmentOutput = this.environment.output;
+
+  for (const key in output) {
+    if (key === 'data') {
+      const data = (environmentOutput.data = environmentOutput.data || {});
+      environmentOutput.data = { ...data, ...output.data };
+    } else {
+      environmentOutput[key] = output[key];
+    }
+  }
+};
+
 Execution.prototype.getState = function getState() {
   const definitions = [];
   for (const definition of this.definitions) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bpmn-engine",
   "description": "BPMN 2.0 execution engine. Open source javascript workflow engine.",
-  "version": "20.0.0",
+  "version": "20.0.2",
   "type": "module",
   "module": "./src/index.js",
   "main": "./lib/index.cjs",
@@ -54,13 +54,13 @@
     "@bonniernews/hot-bev": "^0.4.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@types/bpmn-moddle": "^5.1.6",
+    "@types/node": "^18.19.31",
     "bent": "^7.3.12",
     "c8": "^9.1.0",
     "camunda-bpmn-moddle": "^7.0.1",
     "chai": "^5.1.0",
     "chronokinesis": "^6.0.0",
-    "eslint": "^8.45.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint": "^9.0.0",
     "markdown-toc": "^1.2.0",
     "mocha": "^10.2.0",
     "mocha-cakes-2": "^3.3.0",
@@ -69,10 +69,10 @@
     "rollup": "^4.10.0"
   },
   "dependencies": {
-    "bpmn-elements": "^13.1.2",
-    "bpmn-moddle": "^8.0.1",
+    "bpmn-elements": "^13.2.0",
+    "bpmn-moddle": "^9.0.1",
     "debug": "^4.3.4",
-    "moddle-context-serializer": "^4.0.0",
-    "smqp": "^8.0.0"
+    "moddle-context-serializer": "^4.2.0",
+    "smqp": "^8.2.4"
   }
 }

package/src/index.js

@@ -467,30 +467,19 @@ Execution.prototype._onChildMessage = function onChildMessage(routingKey, messag
 
       newState = 'idle';
       break;
-    case 'definition.error':
+    case 'definition.error': {
+      this._saveOutput(owner.environment.output);
       this._teardownDefinition(owner);
       newState = 'error';
       break;
+    }
     case 'activity.wait': {
       if (listener) listener.emit('wait', owner.getApi(message), this);
       break;
     }
     case 'process.end': {
-      if (!message.content.output) break;
-      const environment = this.environment;
-
-      for (const key in message.content.output) {
-        switch (key) {
-          case 'data': {
-            environment.output.data = environment.output.data || {};
-            environment.output.data = { ...environment.output.data, ...message.content.output.data };
-            break;
-          }
-          default: {
-            environment.output[key] = message.content.output[key];
-          }
-        }
-      }
+      if (message.content.inbound) break;
+      this._saveOutput(message.content.output);
       break;
     }
   }
@@ -532,6 +521,21 @@ Execution.prototype._teardownDefinition = function teardownDefinition(definition
   definition.broker.cancel('_engine_definition');
 };
 
+Execution.prototype._saveOutput = function saveOutput(output) {
+  if (!output || typeof output !== 'object') return;
+
+  const environmentOutput = this.environment.output;
+
+  for (const key in output) {
+    if (key === 'data') {
+      const data = (environmentOutput.data = environmentOutput.data || {});
+      environmentOutput.data = { ...data, ...output.data };
+    } else {
+      environmentOutput[key] = output[key];
+    }
+  }
+};
+
 Execution.prototype.getState = function getState() {
   const definitions = [];
   for (const definition of this.definitions) {

package/types/bpmn-engine.d.ts

@@ -16,6 +16,7 @@ import {
   ILogger,
   EnvironmentState,
   IScripts,
+  Script,
 } from 'bpmn-elements';
 
 declare module 'bpmn-engine' {