@basthon/gui-base 0.36.0 → 0.36.4

package/lib/main.d.ts

@@ -1,20 +1,14 @@
 import { KernelBase } from "@basthon/kernel-base";
 import { KernelLoader } from "@basthon/kernel-loader";
-declare global {
-    interface Window {
-        Basthon?: any;
-    }
-}
 /**
  * Base class for console and notebook GUI.
  */
 export declare class GUIBase {
     private readonly _language;
     private readonly _loaded;
-    private _kernel;
     private _loader;
     private _console_error;
-    constructor(language: string);
+    constructor(kernelRootPath: string, language: string);
     /**
      * Language getter.
      */
@@ -106,4 +100,8 @@ export declare class GUIBase {
      * Copy a text to clipboard.
      */
     static copyToClipboard: (text: string) => void;
+    /**
+     * Binding to kernel's XHR.
+     */
+    static xhr(params: any): Promise<unknown>;
 }

package/lib/main.js

@@ -5,19 +5,14 @@ import { KernelLoader } from "@basthon/kernel-loader";
  * Base class for console and notebook GUI.
  */
 export class GUIBase {
-    constructor(language) {
+    constructor(kernelRootPath, language) {
         this._loaded = new PromiseDelegate();
-        this._kernel = null;
         /* console errors redirected to notification system */
         this._console_error = console.error;
         this._language = language;
-        this._loader = new KernelLoader(language);
+        this._loader = new KernelLoader(kernelRootPath, language);
         // loading Basthon (errors are fatal)
         this._loader.showLoader("Chargement de Basthon...", false);
-        this._loader.kernelAvailable().then(() => {
-            this._kernel = this._loader.kernel;
-            window.Basthon = this._kernel;
-        });
     }
     /**
      * Language getter.
@@ -26,7 +21,7 @@ export class GUIBase {
     /**
      * Kernel getter.
      */
-    get kernel() { return this._kernel; }
+    get kernel() { return this._loader.kernel; }
     /**
      * KernelLoader getter.
      */
@@ -108,7 +103,7 @@ export class GUIBase {
     /**
      * Restart the kernel.
      */
-    kernelRestart() { var _a; (_a = this._kernel) === null || _a === void 0 ? void 0 : _a.restart(); }
+    kernelRestart() { var _a; (_a = this.kernel) === null || _a === void 0 ? void 0 : _a.restart(); }
     /**
      * Load ressources from URL (common part to files and modules).
      */
@@ -118,7 +113,7 @@ export class GUIBase {
         for (let fileURL of url.searchParams.getAll(key)) {
             fileURL = decodeURIComponent(fileURL);
             const filename = fileURL.split('/').pop() || "";
-            let promise = KernelBase.xhr({
+            let promise = GUIBase.xhr({
                 method: "GET",
                 url: fileURL,
                 responseType: "arraybuffer"
@@ -143,7 +138,7 @@ export class GUIBase {
             reader.onload = async (event) => {
                 var _a, _b;
                 (_a = this.kernel) === null || _a === void 0 ? void 0 : _a.putRessource(file.name, reader.result);
-                this.info("Fichier utilisable depuis Python", `${file.name} est maintenant utilisable depuis ${(_b = this._kernel) === null || _b === void 0 ? void 0 : _b.languageName()}`);
+                this.info("Fichier utilisable depuis Python", `${file.name} est maintenant utilisable depuis ${(_b = this.kernel) === null || _b === void 0 ? void 0 : _b.languageName()}`);
                 resolve();
             };
             reader.onerror = reject;
@@ -153,17 +148,17 @@ export class GUIBase {
      * Load auxiliary files submited via URL (aux= parameter) (async).
      */
     async loadURLAux() {
-        if (this._kernel == null)
+        if (this.kernel == null)
             return;
-        await this._loadFromURL('aux', this._kernel.putFile.bind(this._kernel));
+        await this._loadFromURL('aux', this.kernel.putFile.bind(this.kernel));
     }
     /**
      * Load modules submited via URL (module= parameter) (async).
      */
     async loadURLModules() {
-        if (this._kernel == null)
+        if (this.kernel == null)
             return;
-        await this._loadFromURL('module', this._kernel.putModule.bind(this._kernel));
+        await this._loadFromURL('module', this.kernel.putModule.bind(this.kernel));
     }
     /**
      * Opening file: If it has ext as extension, loading it in
@@ -217,6 +212,12 @@ export class GUIBase {
     async _share(url, message) {
         this.confirm("Partager ce notebook", message, "Copier dans le presse-papier", () => GUIBase.copyToClipboard(url), "Tester le lien", () => GUIBase.openURL(url));
     }
+    /**
+     * Binding to kernel's XHR.
+     */
+    static async xhr(params) {
+        return await KernelBase.xhr(params);
+    }
 }
 /**
  * Copy a text to clipboard.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/gui-base",
-  "version": "0.36.0",
+  "version": "0.36.4",
   "description": "Basthon - Base GUI",
   "homepage": "https://basthon.fr",
   "bugs": {
@@ -25,8 +25,8 @@
     "clean": "rm -rf lib/"
   },
   "dependencies": {
-    "@basthon/kernel-base": "^0.36.0",
-    "@basthon/kernel-loader": "^0.36.0",
+    "@basthon/kernel-base": "^0.36.4",
+    "@basthon/kernel-loader": "^0.36.4",
     "promise-delegate": "^1.0.1"
   },
   "devDependencies": {
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1b7d7fe5eccb791eb4b78c650facd39c84061d4b"
+  "gitHead": "edcb6d1d099440e2fadbeb12acf34b5cc77486a2"
 }