@basthon/kernel-base 0.35.4 → 0.35.8

package/lib/kernel.d.ts

@@ -1,21 +1,13 @@
-/**
- * Fix window.
- */
-declare global {
-    interface Window {
-        BASTHON_KERNEL_SCRIPT?: string;
-    }
-}
 /**
  * API that any Basthon kernel should fill to be supported
  * in console/notebook.
  */
 export declare class KernelBase {
-    private _urlScript;
-    private _loaded;
-    private _pageLoad;
+    private _rootPath;
+    private readonly _loaded;
+    private readonly _pageLoad;
     execution_count: number;
-    constructor();
+    constructor(rootPath: string);
     /**
      * Kernel version number (string).
      */
@@ -56,29 +48,21 @@ export declare class KernelBase {
     /**
      * Initialize the kernel.
      */
-    init(): Promise<any>;
+    init(): Promise<void>;
     /**
      * Promise that resolve when the kernel is loaded.
      */
-    loaded(): Promise<any>;
-    /**
-     * The current script URL.
-     */
-    urlScript(): string;
-    /**
-     * An URL without it's basename.
-     */
-    dirname(url: string): string;
+    loaded(): Promise<void>;
     /**
      * Root for kernel files. This is always the versnion number
-     * directory inside the current script directory.
+     * directory inside the kernel directory.
      */
     basthonRoot(): string;
     /**
      * Downloading data (bytes array) as filename
      * (opening browser dialog).
      */
-    static download(data: Uint8Array, filename: string): void;
+    download(data: Uint8Array, filename: string): void;
     /**
      * Dynamically load a script asynchronously.
      */
@@ -86,7 +70,7 @@ export declare class KernelBase {
     /**
      * Returns a promise that resolves when page is loaded.
      */
-    pageLoad(): Promise<any>;
+    pageLoad(): Promise<void>;
     /**
      * Wraper around XMLHttpRequest.
      */

package/lib/kernel.js

@@ -1,3 +1,4 @@
+import { PromiseDelegate } from "promise-delegate";
 import { VERSION } from './version';
 /**
  * An error thrown by not implemented API functions.
@@ -5,6 +6,7 @@ import { VERSION } from './version';
 class NotImplementedError extends Error {
     constructor(funcName) {
         super(`Function ${funcName} not implemented!`);
+        this.name = "NotImplementedError";
     }
 }
 /**
@@ -21,29 +23,23 @@ class BasthonEvent extends Event {
  * in console/notebook.
  */
 export class KernelBase {
-    constructor() {
-        this._loaded = null;
-        this._pageLoad = null;
+    constructor(rootPath) {
+        this._loaded = new PromiseDelegate();
+        this._pageLoad = new PromiseDelegate();
         this.execution_count = 0;
-        /**
-         * Path to current script.
-         *
-         * Warning: this should not be postponed since
-         * document.currentScript will be undefined.
-         */
-        this._urlScript = (function () {
-            let url = window.location.origin + window.location.pathname;
-            url = url.substring(0, url.lastIndexOf('/')) + "/";
-            if (window.BASTHON_KERNEL_SCRIPT != null) {
-                return url + window.BASTHON_KERNEL_SCRIPT;
-                //} else if( module != null ) {
-                //    return url + module.uri;
-            }
-            else
-                return document.currentScript.src;
-        })();
+        // root path where kernel is installed
+        this._rootPath = rootPath;
+        if (document.readyState === 'complete') {
+            this._pageLoad.resolve();
+        }
+        else {
+            const callback = () => {
+                window.removeEventListener("load", callback);
+                this._pageLoad.resolve();
+            };
+            window.addEventListener("load", callback);
+        }
     }
-    ;
     /**
      * Kernel version number (string).
      */
@@ -111,43 +107,30 @@ export class KernelBase {
     /**
      * Initialize the kernel.
      */
-    init() {
-        return this._loaded = this.launch().then(() => {
-            // connecting eval to basthon.eval.request event.
-            this.addEventListener("eval.request", this.evalFromEvent.bind(this));
-        });
+    async init() {
+        await this.launch();
+        // connecting eval to basthon.eval.request event.
+        this.addEventListener("eval.request", this.evalFromEvent.bind(this));
+        this._loaded.resolve();
     }
     ;
     /**
      * Promise that resolve when the kernel is loaded.
      */
-    loaded() { var _a; return (_a = this._loaded) !== null && _a !== void 0 ? _a : this.init(); }
-    ;
-    /**
-     * The current script URL.
-     */
-    urlScript() { return this._urlScript; }
-    ;
-    /**
-     * An URL without it's basename.
-     */
-    dirname(url) {
-        return url.substring(0, url.lastIndexOf("/"));
-    }
-    ;
+    async loaded() { await this._loaded.promise; }
     /**
      * Root for kernel files. This is always the versnion number
-     * directory inside the current script directory.
+     * directory inside the kernel directory.
      */
     basthonRoot() {
-        return this.dirname(this.urlScript()) + "/" + this.version();
+        return this._rootPath + "/" + this.version();
     }
     ;
     /**
      * Downloading data (bytes array) as filename
      * (opening browser dialog).
      */
-    static download(data, filename) {
+    download(data, filename) {
         let blob = new Blob([data], { type: "application/octet-stream" });
         let anchor = document.createElement("a");
         anchor.download = filename;
@@ -175,21 +158,7 @@ export class KernelBase {
     /**
      * Returns a promise that resolves when page is loaded.
      */
-    pageLoad() {
-        var _a;
-        return (_a = this._pageLoad) !== null && _a !== void 0 ? _a : (this._pageLoad = new Promise(function (resolve, reject) {
-            if (document.readyState === 'complete') {
-                resolve();
-            }
-            else {
-                const callback = () => {
-                    window.removeEventListener("load", callback);
-                    resolve();
-                };
-                window.addEventListener("load", callback);
-            }
-        }));
-    }
+    async pageLoad() { await this._pageLoad.promise; }
     ;
     /**
      * Wraper around XMLHttpRequest.

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.35.4";
+export declare const VERSION = "0.35.8";

package/lib/version.js

@@ -1 +1 @@
-export const VERSION = "0.35.4";
+export const VERSION = "0.35.8";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/kernel-base",
-  "version": "0.35.4",
+  "version": "0.35.8",
   "description": "Basthon - Base Kernel",
   "homepage": "https://basthon.fr",
   "bugs": {
@@ -27,11 +27,12 @@
   "devDependencies": {
     "gulp": "^4.0.2",
     "gulp-typescript": "^6.0.0-alpha.1",
+    "promise-delegate": "^1.0.1",
     "typescript": "~4.4.4",
     "vinyl-buffer": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ebf66dd4f601ad1b975d2e82b384b47a07ae4255"
+  "gitHead": "81d8ed255bdf30248c9c6ad761b5a820386f5e91"
 }