@basthon/gui-base 0.62.20 → 0.62.22

package/lib/main.js

@@ -6,7 +6,6 @@ import { KernelLoader } from "@basthon/kernel-loader";
  */
 export class GUIBase {
     constructor(options) {
-        var _a;
         this._loaded = new PromiseDelegate();
         this._maxCheckpoints = 10;
         this._contentFilename = "content.txt";
@@ -14,7 +13,7 @@ export class GUIBase {
         this._extensions = new Map();
         /* console errors redirected to notification system */
         this._console_error = console.error;
-        this._language = (_a = options === null || options === void 0 ? void 0 : options.kernelOptions) === null || _a === void 0 ? void 0 : _a.language;
+        this._language = options?.kernelOptions?.language;
         this._loader = new KernelLoader(options.kernelOptions);
         // loading Basthon (errors are fatal)
         this._loader.showLoader("Chargement de Basthon...", false, false);
@@ -84,14 +83,19 @@ export class GUIBase {
      * The error notification system.
      */
     notifyError(error) {
-        var _a, _b;
         this._console_error(error);
         let message = error.message;
         if (message == null)
-            message = (_b = (_a = error) === null || _a === void 0 ? void 0 : _a.reason) === null || _b === void 0 ? void 0 : _b.message;
+            message = error?.reason?.message;
         if (message == null)
             message = error.toString();
-        message = message.split("\n").join("<br>");
+        // avoid html/js injection on errors
+        const encodeHTMLEntities = (text) => {
+            var textArea = document.createElement("textarea");
+            textArea.innerText = text;
+            return textArea.innerHTML;
+        };
+        message = encodeHTMLEntities(message).split("\n").join("<br>");
         this.error("Erreur", `Erreur : ${message}`);
         // In case of error, force loader hiding.
         try {
@@ -125,7 +129,6 @@ 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;
@@ -156,7 +159,7 @@ export class GUIBase {
                     content = await response.text();
                 }
                 catch (error) {
-                    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()}`);
+                    throw new Error(`Le chargement de ${fileURL} a échoué : ${error?.message ?? error.toString()}`);
                 }
             }
         }
@@ -169,10 +172,9 @@ export class GUIBase {
      * (call submited callback).
      */
     async _loadExtensions() {
-        var _a, _b;
         /* get requested extensions from URL */
         const url = new URL(window.location.href);
-        const extensions = (_b = (_a = url.searchParams.get("extensions")) === null || _a === void 0 ? void 0 : _a.split(",")) !== null && _b !== void 0 ? _b : [];
+        const extensions = url.searchParams.get("extensions")?.split(",") ?? [];
         // call callbacks for requested extensions
         const promises = [];
         for (const ext of extensions) {
@@ -212,8 +214,7 @@ export class GUIBase {
      * Get state from strorage.
      */
     async getState(state, def) {
-        var _a;
-        return (_a = (await this._stateStorage.get(state))) !== null && _a !== void 0 ? _a : def;
+        return (await this._stateStorage.get(state)) ?? def;
     }
     /**
      * Set state in storage.
@@ -235,14 +236,13 @@ export class GUIBase {
      * Load content from local forage.
      */
     async loadFromStorage(setContent = true) {
-        var _a;
         const approved = await this.lastBackupValid();
         let content = null;
         if (approved == null) {
             content = null;
         }
         else if (approved) {
-            content = (await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.getLast()));
+            content = (await this._checkpoints?.getLast());
         }
         else {
             const promise = new PromiseDelegate();
@@ -261,28 +261,24 @@ export class GUIBase {
      * Tag last backup as "approved".
      */
     async validateBackup() {
-        var _a;
-        await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.tagLast("approved"));
+        await this._checkpoints?.tagLast("approved");
     }
     /**
      * Is last backup tagged as "approved"?
      */
     async lastBackupValid() {
-        var _a;
-        return await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.lastHasTag("approved"));
+        return await this._checkpoints?.lastHasTag("approved");
     }
     /**
      * Select a checkpoint to load in the script.
      */
     async selectCheckpoint() {
-        var _a;
-        const times = await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.times());
+        const times = await this._checkpoints?.times();
         const promise = new PromiseDelegate();
-        const choices = times === null || times === void 0 ? void 0 : times.map((t, i) => ({
+        const choices = times?.map((t, i) => ({
             text: CheckpointsManager.toHumanDate(parseInt(t, 10)),
             handler: async () => {
-                var _a, _b;
-                promise.resolve((_b = (await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.getIndex(i)))) !== null && _b !== void 0 ? _b : null);
+                promise.resolve((await this._checkpoints?.getIndex(i)) ?? null);
             },
         }));
         if (choices == null)
@@ -302,25 +298,23 @@ export class GUIBase {
      * Backup to checkpoints.
      */
     async backup(approved = true) {
-        var _a;
-        return await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.push(this.content(), approved ? ["approved"] : []));
+        return await this._checkpoints?.push(this.content(), approved ? ["approved"] : []);
     }
     /**
      * Internal GUI init.
      * It calls setupUI then loadInitialContent.
      */
     async _init(options = null) {
-        var _a;
         /* all errors redirected to notification system */
         const onerror = this.notifyError.bind(this);
         window.addEventListener("error", onerror);
         window.addEventListener("unhandledrejection", onerror);
         console.error = (message) => onerror(new Error(message));
         await this._loadExtensions();
-        await ((_a = this._checkpoints) === null || _a === void 0 ? void 0 : _a.ready());
+        await this._checkpoints?.ready();
         await this.setupUI(options);
         await this.loadInitialContent(options);
-        await this.kernelLoader.kernelLoaded();
+        await this.kernelLoader.kernelStarted();
         const init = this.initCaller.bind(this);
         // loading aux files from URL
         await init(this.loadURLAux.bind(this), "Chargement des fichiers auxiliaires...", true);
@@ -355,10 +349,8 @@ export class GUIBase {
      * Restart the kernel.
      */
     kernelRestart() {
-        var _a, _b;
-        if ((_a = this.kernelSafe) === null || _a === void 0 ? void 0 : _a.pendingInput())
-            throw new Error("pending input");
-        (_b = this.kernelSafe) === null || _b === void 0 ? void 0 : _b.restart();
+        this.kernelSafe?.resolvePendingInput();
+        this.kernelSafe?.restart();
     }
     /**
      * Load ressources from URL (common part to files and modules).
@@ -370,7 +362,6 @@ export class GUIBase {
             fileURL = decodeURIComponent(fileURL);
             const filename = fileURL.split("/").pop() || "";
             promises.push((async () => {
-                var _a;
                 let data;
                 try {
                     const response = await fetch(fileURL);
@@ -380,7 +371,7 @@ export class GUIBase {
                     await put(filename, data);
                 }
                 catch (error) {
-                    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()}`);
+                    throw new Error(`Impossible de charger le fichier ${filename} : ${error?.message ?? error.toString()}`);
                 }
             })());
         }
@@ -394,9 +385,8 @@ export class GUIBase {
             const reader = new FileReader();
             reader.readAsArrayBuffer(file);
             reader.onload = async (event) => {
-                var _a, _b, _c;
-                await ((_a = this.kernelSafe) === null || _a === void 0 ? void 0 : _a.putRessource(file.name, reader.result));
-                this.info(`Fichier utilisable depuis ${(_b = this.kernel) === null || _b === void 0 ? void 0 : _b.languageName()}`, `${file.name} est maintenant utilisable depuis ${(_c = this.kernel) === null || _c === void 0 ? void 0 : _c.languageName()}`);
+                await this.kernelSafe?.putRessource(file.name, reader.result);
+                this.info(`Fichier utilisable depuis ${this.kernel?.languageName()}`, `${file.name} est maintenant utilisable depuis ${this.kernel?.languageName()}`);
                 resolve();
             };
             reader.onerror = reject;
@@ -440,7 +430,7 @@ export class GUIBase {
                     return;
                 for (let file of input.files) {
                     const ext = file.name.split(".").pop();
-                    const callback = callbacks[ext !== null && ext !== void 0 ? ext : ""];
+                    const callback = callbacks[ext ?? ""];
                     if (callback != null) {
                         await callback(file);
                     }
@@ -510,8 +500,7 @@ Un lien permanant vers le contenu actuel a été créé.
             const reader = new FileReader();
             reader.readAsText(file);
             reader.onload = (event) => {
-                var _a;
-                this.setContent((_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.result);
+                this.setContent(event?.target?.result);
                 resolve();
             };
             reader.onerror = reject;
@@ -524,7 +513,7 @@ Un lien permanant vers le contenu actuel a été créé.
         this.backup();
         const content = this.content().replace(/\r\n|\r|\n/g, "\r\n"); // To retain the Line breaks.
         let blob = new Blob([content], { type: "text/plain" });
-        GUIBase.openURL(window.URL.createObjectURL(blob), filename !== null && filename !== void 0 ? filename : this._contentFilename);
+        GUIBase.openURL(window.URL.createObjectURL(blob), filename ?? this._contentFilename);
     }
     /**
      * Compress a string to another string (URL safe).

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@basthon/gui-base",
-  "version": "0.62.20",
+  "version": "0.62.22",
   "description": "Basthon - Base GUI",
   "homepage": "https://basthon.fr",
   "bugs": {
-    "url": "https://framagit.org/basthon/basthon-kernel/issues"
+    "url": "https://forge.apps.education.fr/basthon/basthon-kernel/issues"
   },
   "repository": {
     "type": "git",
-    "url": "https://framagit.org/basthon/basthon-kernel.git"
+    "url": "https://forge.apps.education.fr/basthon/basthon-kernel.git"
   },
   "license": "GPL-3.0-or-later",
   "author": "Romain Casati",
@@ -21,25 +21,23 @@
     "lib"
   ],
   "scripts": {
-    "build": "gulp all",
+    "build": "tsc",
     "clean": "rm -rf lib/"
   },
   "dependencies": {
-    "@basthon/checkpoints": "0.62.20",
-    "@basthon/kernel-base": "0.62.20",
-    "@basthon/kernel-loader": "0.62.20",
-    "js-base64": "^3.7.2",
-    "pako": "^2.0.4",
+    "@basthon/checkpoints": "0.62.22",
+    "@basthon/kernel-base": "0.62.22",
+    "@basthon/kernel-loader": "0.62.22",
+    "js-base64": "^3.7.7",
+    "pako": "^2.1.0",
     "promise-delegate": "^1.0.1"
   },
   "devDependencies": {
-    "@types/pako": "^1.0.2",
-    "gulp": "^4.0.2",
-    "gulp-typescript": "^6.0.0-alpha.1",
-    "typescript": "~4.4.4"
+    "@types/pako": "^2.0.3",
+    "typescript": "~5.4.5"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fdaa2ed08c687a4b4e44f07ff28de1ad4cffeb38"
+  "gitHead": "1dd6225a7caf14cbee203687cac611495f5b18d4"
 }