@basthon/gui-base 0.41.6 → 0.41.9

package/lib/main.d.ts

@@ -73,7 +73,7 @@ export declare class GUIBase {
     /**
      * The error notification system.
      */
-    notifyError(error: ErrorEvent | PromiseRejectionEvent): void;
+    notifyError(error: Error | ErrorEvent | PromiseRejectionEvent): void;
     /**
      * Initialize the GUI.
      */
@@ -101,7 +101,7 @@ export declare class GUIBase {
     /**
      * Load content from local forage.
      */
-    loadFromStorage(): Promise<string | null>;
+    loadFromStorage(setContent?: boolean): Promise<string | null>;
     /**
      * Tag last backup as "approved".
      */
@@ -186,10 +186,6 @@ 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>;
     /**
      * Compress a string to another string (URL safe).
      */

package/lib/main.js

@@ -1,6 +1,5 @@
 import { PromiseDelegate } from "promise-delegate";
 import { CheckpointsManager } from "@basthon/checkpoints";
-import { KernelBase } from "@basthon/kernel-base";
 import { KernelLoader } from "@basthon/kernel-loader";
 /**
  * Base class for console and notebook GUI.
@@ -108,6 +107,7 @@ export class GUIBase {
      * Loading the content from query string (ipynb=/script= or from=).
      */
     async loadFromQS(key) {
+        var _a;
         const url = new URL(window.location.href);
         const from_key = 'from';
         let content = null;
@@ -127,14 +127,13 @@ export class GUIBase {
             if (fileURL != null)
                 fileURL = decodeURIComponent(fileURL);
             try {
-                content = await GUIBase.xhr({
-                    url: fileURL,
-                    method: 'GET'
-                });
+                const response = await fetch(fileURL);
+                if (!response.ok)
+                    throw new Error(response.statusText);
+                content = await response.text();
             }
             catch (error) {
-                const message = `Le chargement de ${fileURL} a échoué.`;
-                throw new ErrorEvent(message, { message: message });
+                throw new Error(`Le chargement de ${fileURL} a échoué : ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error.toString()}`);
             }
         }
         if (content != null)
@@ -176,7 +175,7 @@ export class GUIBase {
     /**
      * Load content from local forage.
      */
-    async loadFromStorage() {
+    async loadFromStorage(setContent = true) {
         var _a;
         const approved = await this.lastBackupValid();
         let content = null;
@@ -190,10 +189,10 @@ export class GUIBase {
             const promise = new PromiseDelegate();
             this.confirm("Récupération", "Il semble que Basthon ait rencontré un problème à sa dernière utilisation. Que voulez-vous faire ?", "Choisir une sauvegarde", async () => {
                 promise.resolve(await this.selectCheckpoint());
-            }, "Laisser le document vide", () => { promise.resolve(null); });
+            }, "Annuler", () => { promise.resolve(null); });
             content = await promise.promise;
         }
-        if (content != null)
+        if (setContent && content != null)
             this.setContent(content);
         return content;
     }
@@ -250,7 +249,7 @@ export class GUIBase {
         const onerror = this.notifyError.bind(this);
         window.addEventListener('error', onerror);
         window.addEventListener("unhandledrejection", onerror);
-        console.error = (message) => onerror(new ErrorEvent(message, { message: message }));
+        console.error = (message) => onerror(new Error(message));
         await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.ready());
         await this.setupUI(options);
         await this.loadInitialContent(options);
@@ -296,18 +295,16 @@ export class GUIBase {
         for (let fileURL of url.searchParams.getAll(key)) {
             fileURL = decodeURIComponent(fileURL);
             const filename = fileURL.split('/').pop() || "";
-            let promise = GUIBase.xhr({
-                method: "GET",
-                url: fileURL,
-                responseType: "arraybuffer"
-            });
-            promise = promise.then(function (data) {
+            promises.push(fetch(fileURL).then((response) => {
+                if (!response.ok)
+                    throw new Error(response.statusText);
+                return response.arrayBuffer();
+            }).then((data) => {
                 return put(filename, data);
-            }).catch(function () {
-                const message = `Impossible de charger le fichier ${filename}.`;
-                throw new ErrorEvent(message, { message: message });
-            });
-            promises.push(promise);
+            }).catch((error) => {
+                var _a;
+                throw new Error(`Impossible de charger le fichier ${filename} : ${(_a = error === null || error === void 0 ? void 0 : error.message) !== null && _a !== void 0 ? _a : error.toString()}`);
+            }));
         }
         await Promise.all(promises);
     }
@@ -442,12 +439,6 @@ Un lien permanant vers le contenu actuel a été créé.
         let blob = new Blob([content], { type: "text/plain" });
         GUIBase.openURL(window.URL.createObjectURL(blob), filename !== null && filename !== void 0 ? filename : this._contentFilename);
     }
-    /**
-     * Binding to kernel's XHR.
-     */
-    static async xhr(params) {
-        return await KernelBase.xhr(params);
-    }
     /**
      * Compress a string to another string (URL safe).
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/gui-base",
-  "version": "0.41.6",
+  "version": "0.41.9",
   "description": "Basthon - Base GUI",
   "homepage": "https://basthon.fr",
   "bugs": {
@@ -25,9 +25,9 @@
     "clean": "rm -rf lib/"
   },
   "dependencies": {
-    "@basthon/checkpoints": "^0.41.6",
-    "@basthon/kernel-base": "^0.41.6",
-    "@basthon/kernel-loader": "^0.41.6",
+    "@basthon/checkpoints": "^0.41.9",
+    "@basthon/kernel-base": "^0.41.9",
+    "@basthon/kernel-loader": "^0.41.9",
     "js-base64": "^3.7.2",
     "pako": "^2.0.4",
     "promise-delegate": "^1.0.1"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "65c171a20b16334c757d4f801d94c7bc68d0efec"
+  "gitHead": "7063ce35c8205ef6894405e49fbf1b0eb05d0630"
 }