@basthon/kernel-base 0.40.4 → 0.40.8

package/lib/kernel.js

@@ -237,35 +237,35 @@ export class KernelBase {
     /**
      * Internal. Code evaluation after an eval.request event.
      */
-    evalFromEvent(data) {
-        const that = this;
-        let stdCallback = function (std) {
-            return function (text) {
-                let dataEvent = that.clone(data);
-                dataEvent.stream = std;
-                dataEvent.content = text;
-                that.dispatchEvent("eval.output", dataEvent);
-            };
+    async evalFromEvent(data) {
+        const stdCallback = (std) => (text) => {
+            let dataEvent = this.clone(data);
+            dataEvent.stream = std;
+            dataEvent.content = text;
+            this.dispatchEvent("eval.output", dataEvent);
         };
-        let outCallback = stdCallback("stdout");
-        let errCallback = stdCallback("stderr");
-        return that.evalAsync(data.code, outCallback, errCallback, data)
-            .then(function (args) {
-            const result = args[0];
-            const executionCount = args[1];
-            let dataEvent = that.clone(data);
-            dataEvent.execution_count = executionCount;
-            if (typeof result !== 'undefined') {
-                dataEvent.result = result;
-            }
-            that.dispatchEvent("eval.finished", dataEvent);
-        }, function (error) {
+        const outCallback = stdCallback("stdout");
+        const errCallback = stdCallback("stderr");
+        let args;
+        try {
+            args = await this.evalAsync(data.code, outCallback, errCallback, data);
+        }
+        catch (error) {
             errCallback(error.toString());
-            let dataEvent = that.clone(data);
+            const dataEvent = this.clone(data);
             dataEvent.error = error;
-            dataEvent.execution_count = that.execution_count;
-            that.dispatchEvent("eval.error", dataEvent);
-        });
+            dataEvent.execution_count = this.execution_count;
+            this.dispatchEvent("eval.error", dataEvent);
+            return;
+        }
+        if (args == null)
+            return; // this should not happend
+        const result = args[0];
+        const executionCount = args[1];
+        let dataEvent = this.clone(data);
+        dataEvent.execution_count = executionCount;
+        if (result != null)
+            dataEvent.result = result;
+        this.dispatchEvent("eval.finished", dataEvent);
     }
-    ;
 }

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.40.4";
+export declare const VERSION = "0.40.8";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "0.40.4";
+export const VERSION = "0.40.8";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/kernel-base",
-  "version": "0.40.4",
+  "version": "0.40.8",
   "description": "Basthon - Base Kernel",
   "homepage": "https://basthon.fr",
   "bugs": {
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6ce25215bda1f6dca84c3d5b2a11335f4180b521"
+  "gitHead": "6bcfcc37743982cd7ed31d94d35ec2df2588ac0b"
 }