sunrize 1.3.2 → 1.3.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -14,15 +14,16 @@
   "scripts": {
     "start": "electron .",
     "development": "SUNRISE_ENVIRONMENT=DEVELOPMENT electron .",
-    "prepackage": "npm i -D electron",
-    "package": "electron-forge package",
-    "postpackage": "npm i -P electron",
+    "package": "node build/package.js",
     "premake": "npm i -D electron",
     "make": "electron-forge make",
     "postmake": "npm i -P electron",
     "release": "node build/release.js",
     "download": "node build/download.js",
-    "docs": "cd docs && bundle exec jekyll serve --incremental --host=192.168.0.18",
+    "predocs": "rm -r docs/_site/",
+    "docs": "cd docs && bundle exec jekyll serve --incremental --host=`ipconfig getifaddr en0`",
+    "docs-install": "cd docs && bundle install",
+    "docs-update": "cd docs && bundle update",
     "make-x_ite-for-sunrize": "sh build/make-x_ite-for-sunrize.sh"
   },
   "repository": {
@@ -69,12 +70,12 @@
     "@electron-forge/maker-rpm": "^7.2.0",
     "@electron-forge/maker-squirrel": "^7.2.0",
     "@electron-forge/maker-zip": "^7.2.0",
-    "shell-tools": "^1.1.5"
+    "shell-tools": "^1.1.7"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^27.1.3",
+    "electron": "^28.0.0",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.0",
     "electron-tabs": "^1.0.2",
@@ -83,15 +84,15 @@
     "jquery-ui-dist": "^1.13.2",
     "jstree": "^3.3.16",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.14.1",
+    "material-symbols": "^0.14.2",
     "md5": "^2.3.0",
-    "monaco-editor": "^0.44.0",
+    "monaco-editor": "^0.45.0",
     "node-clipboardy": "^1.0.3",
     "node-localstorage": "^3.0.5",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
-    "x_ite": "^9.1.8"
+    "x_ite": "^9.1.9"
   },
   "config": {
     "forge": {

package/src/Application/Template.js

@@ -1,12 +1,14 @@
+"use strict";
+
 const
    fs   = require ("fs"),
    path = require ("path"),
-   url  = require ("url")
+   url  = require ("url");
 
 class Template
 {
-   static #templates = new Set ()
-   static #stats     = new Map ()
+   static #templates = new Set ();
+   static #stats     = new Map ();
 
    static create (template)
    {
@@ -15,36 +17,36 @@ class Template
          dirname  = path .dirname (template),
          stats    = fs .statSync (dirname);
 
-      this .#templates .add (template)
-      this .#stats .set (dirname, stats)
+      this .#templates .add (template);
+      this .#stats .set (dirname, stats);
 
       const file = fs .readFileSync (template)
          .toString ()
          .replace (/(url\()(.*?)(\))/sg, Template .resolve .bind (null, template))
-         .replace (/(href=")(.*?)(")/sg, Template .resolve .bind (null, template))
+         .replace (/(href=")(.*?)(")/sg, Template .resolve .bind (null, template));
 
-      fs .writeFileSync (filename, file)
-      fs .utimesSync (dirname, stats .atime, stats .mtime)
+      fs .writeFileSync (filename, file);
+      fs .utimesSync (dirname, stats .atime, stats .mtime);
 
-      return filename
+      return filename;
    }
 
    static removeAll ()
    {
       for (const template of new Set (this .#templates))
-         this .remove (template)
+         this .remove (template);
    }
 
    static remove (template)
    {
       const
          dirname = path .dirname (template),
-         stats   = this .#stats .get (dirname)
+         stats   = this .#stats .get (dirname);
 
-      fs .unlinkSync (this .filename (template))
-      fs .utimesSync (dirname, stats .atime, stats .mtime)
+      fs .unlinkSync (this .filename (template));
+      fs .utimesSync (dirname, stats .atime, stats .mtime);
 
-      this .#templates .delete (template)
+      this .#templates .delete (template);
    }
 
    static filename (template)
@@ -52,25 +54,25 @@ class Template
       const
          dirname  = path .dirname (template),
          basename = path .basename (template),
-         filename = path .resolve (dirname, basename .replace (/-template/, ""))
+         filename = path .resolve (dirname, basename .replace (/-template/, ""));
 
-      return filename
+      return filename;
    }
 
    static resolve (template, all, begin, filename, end)
    {
-      const match = filename .match (/^.*?\/node_modules\/(.*?)$/)
+      const match = filename .match (/^.*?\/node_modules\/(.*?)$/);
 
       if (match)
-         return begin + url .pathToFileURL (require .resolve (match [1])) + end
+         return begin + url .pathToFileURL (require .resolve (match [1])) + end;
 
-      const resolved = new URL (filename, url .pathToFileURL (template))
+      const resolved = new URL (filename, url .pathToFileURL (template));
 
       if (resolved .protocol === "file:")
-         return begin + resolved + end
+         return begin + resolved + end;
 
-      return all
+      return all;
    }
 }
 
-module .exports = Template
+module .exports = Template;

package/src/Application/Window.js

@@ -1,13 +1,15 @@
-const Document = require ("./Document")
+"use strict";
+
+const Document = require ("./Document");
 
 module .exports = new class Window extends Document
 {
    constructor ()
    {
-      super ()
+      super ();
 
       // Setup
 
-      this .setup ()
+      this .setup ();
    }
-}
+};

package/src/Editors/Console.js

@@ -1,161 +1,165 @@
 
-"use strict"
+"use strict";
 
 const
    $         = require ("jquery"),
    electron  = require ("electron"),
-   X3D       = require ("../X3D"),
    Interface = require ("../Application/Interface"),
-   _         = require ("../Application/GetText")
+   _         = require ("../Application/GetText");
 
 module .exports = class Console extends Interface
 {
-   HISTORY_MAX = 100
+   HISTORY_MAX = 100;
+   CONSOLE_MAX = 1000;
 
    logLevels = [
       "debug",
       "log",
       "warn",
       "error",
-   ]
+   ];
 
-   logClasses = ["", "", "filled", "filled"]
+   logClasses = ["", "", "filled", "filled"];
 
    constructor (element)
    {
-      super (`Sunrize.Console.${element .attr ("id")}.`)
+      super (`Sunrize.Console.${element .attr ("id")}.`);
 
-      this .suspendConsole     = false
-      this .messageTime        = 0
-      this .historyIndex       = 0
-      this .history            = [ ]
-      this .addMessageCallback = this .addMessage .bind (this)
+      this .suspendConsole     = false;
+      this .messageTime        = 0;
+      this .historyIndex       = 0;
+      this .history            = [ ];
+      this .addMessageCallback = this .addMessage .bind (this);
 
-      this .console   = element
-      this .left      = $("<div></div>") .addClass ("console-left") .appendTo (this .console)
-      this .toolbar   = $("<div></div>") .addClass (["toolbar", "vertical-toolbar", "console-toolbar"]) .appendTo (this .console)
-      this .output    = $("<div></div>") .addClass (["console-output", "output"]) .attr ("tabindex", 0) .appendTo (this .left)
-      this .input     = $("<div></div>") .addClass ("console-input") .appendTo (this .left)
+      this .console   = element;
+      this .left      = $("<div></div>") .addClass ("console-left") .appendTo (this .console);
+      this .toolbar   = $("<div></div>") .addClass (["toolbar", "vertical-toolbar", "console-toolbar"]) .appendTo (this .console);
+      this .output    = $("<div></div>") .addClass (["console-output", "output"]) .attr ("tabindex", 0) .appendTo (this .left);
+      this .input     = $("<div></div>") .addClass ("console-input") .appendTo (this .left);
 
       this .suspendButton = $("<span></span>")
          .addClass ("material-icons")
          .attr ("title", _ ("Suspend console output."))
          .text ("cancel")
          .appendTo (this .toolbar)
-         .on ("click", () => this .setSuspendConsole (!this .suspendConsole))
+         .on ("click", () => this .setSuspendConsole (!this .suspendConsole));
 
       this .clearButton = $("<span></span>")
          .addClass ("material-icons")
          .attr ("title", _ ("Clear console."))
          .text ("delete_forever")
          .appendTo (this .toolbar)
-         .on ("click", () => this .clearConsole ())
+         .on ("click", () => this .clearConsole ());
 
-      $("<span></span>") .addClass ("separator") .appendTo (this .toolbar)
+      $("<span></span>") .addClass ("separator") .appendTo (this .toolbar);
 
       this .textarea = $("<textarea></textarea>")
          .attr ("placeholder", _ ("Evaluate JavaScript code here."))
          .attr ("tabindex", 0)
          .appendTo (this .input)
          .on ("keydown", event => this .onkeydown (event))
-         .on ("keyup", event => this .onkeyup (event))
+         .on ("keyup", event => this .onkeyup (event));
 
       if (this .console .attr ("id") !== "console")
       {
-         this .output .html ($("#console .console-output") .html ())
-         this .output .scrollTop (this .output .prop ("scrollHeight"))
+         this .output .html ($("#console .console-output") .html ());
+         this .output .scrollTop (this .output .prop ("scrollHeight"));
       }
       else
       {
-         this .addMessage (null, 1, "", "", this .browser .getWelcomeMessage ())
+         this .addMessage (null, 1, "", "", this .browser .getWelcomeMessage ());
       }
 
-      electron .ipcRenderer .on ("console-message", this .addMessageCallback)
+      electron .ipcRenderer .on ("console-message", this .addMessageCallback);
 
-      this .setup ()
+      this .setup ();
    }
 
    configure ()
    {
-      super .configure ()
+      super .configure ();
 
-      this .fileConfig .setDefaultValues ({ history: [ ] })
+      this .fileConfig .setDefaultValues ({ history: [ ] });
 
-      this .history      = this .fileConfig .history .slice (-this .HISTORY_MAX)
-      this .historyIndex = this .history .length
+      this .history      = this .fileConfig .history .slice (-this .HISTORY_MAX);
+      this .historyIndex = this .history .length;
    }
 
    async browserInitialized (event)
    {
-      super .browserInitialized (event)
+      super .browserInitialized (event);
 
-      await this .browser .loadComponents (this .browser .getComponent ("Scripting"))
+      await this .browser .loadComponents (this .browser .getComponent ("Scripting"));
 
-      const Script = this .browser .getConcreteNode ("Script")
+      const Script = this .browser .getConcreteNode ("Script");
 
-      this .scriptNode = new Script (this .browser .currentScene)
+      this .scriptNode = new Script (this .browser .currentScene);
 
-      this .scriptNode .setup ()
+      this .scriptNode .setup ();
    }
 
    excludes = new Set ([
       "The vm module of Node.js is deprecated in the renderer process and will be removed.",
       "Invalid asm.js: Invalid member of stdlib",
-   ])
+   ]);
 
    addMessage (event, level, sourceId, line, message)
    {
       if (this .excludes .has (message))
-         return
+         return;
 
       const
          classes = [this .logLevels [level] ?? "log", this .logClasses [level]],
          title   = sourceId ? `${sourceId}:${line}`: "",
-         text    = $("<p></p>") .addClass (classes) .attr ("title", title) .text (message)
+         text    = $("<p></p>") .addClass (classes) .attr ("title", title) .text (message);
 
       if (this .messageTime && performance .now () - this .messageTime > 1000)
-         this .output .append ($("<p></p>") .addClass ("splitter"))
+         this .output .append ($("<p></p>") .addClass ("splitter"));
 
-      this .messageTime = performance .now ()
+      this .messageTime = performance .now ();
 
-      const last = this .output .children () .last ()
+      const
+         children = this .output .children (),
+         last     = children .last ();
 
       if (last .hasClass (this .logLevels [level]))
       {
-         last .css ("margin-bottom", "0")
-         text .css ("margin-top",    "0")
-         last .css ("border-bottom", "none")
-         text .css ("border-top",    "none")
+         last .css ("margin-bottom", "0");
+         text .css ("margin-top",    "0");
+         last .css ("border-bottom", "none");
+         text .css ("border-top",    "none");
       }
 
-      this .output .append (text)
-      this .output .scrollTop (this .output .prop ("scrollHeight"))
+      children .slice (0, Math .max (children .length - this .CONSOLE_MAX, 0)) .remove ();
+
+      this .output .append (text);
+      this .output .scrollTop (this .output .prop ("scrollHeight"));
    }
 
    setSuspendConsole (value)
    {
-      this .suspendConsole = value
+      this .suspendConsole = value;
 
       if (value)
       {
-         electron .ipcRenderer .off ("console-message", this .addMessageCallback)
-         this .addMessage (null, "info", __filename, 0, `Console output suspended at ${new Date () .toLocaleTimeString ()}.`)
-         this .suspendButton .addClass ("active")
+         electron .ipcRenderer .off ("console-message", this .addMessageCallback);
+         this .addMessage (null, "info", __filename, 0, `Console output suspended at ${new Date () .toLocaleTimeString ()}.`);
+         this .suspendButton .addClass ("active");
       }
       else
       {
-         electron .ipcRenderer .on ("console-message", this .addMessageCallback)
-         this .addMessage (null, "info", __filename, 0, `Console output enabled at ${new Date () .toLocaleTimeString ()}.`)
-         this .suspendButton .removeClass ("active")
+         electron .ipcRenderer .on ("console-message", this .addMessageCallback);
+         this .addMessage (null, "info", __filename, 0, `Console output enabled at ${new Date () .toLocaleTimeString ()}.`);
+         this .suspendButton .removeClass ("active");
       }
    }
 
    clearConsole ()
    {
-      this .messageTime = 0
+      this .messageTime = 0;
 
-      this .output .empty ()
-      this .addMessage (null, "info", __filename, 0, `Console cleared at ${new Date () .toLocaleTimeString ()}.`)
+      this .output .empty ();
+      this .addMessage (null, "info", __filename, 0, `Console cleared at ${new Date () .toLocaleTimeString ()}.`);
    }
 
    onkeydown (event)
@@ -164,45 +168,45 @@ module .exports = class Console extends Interface
       {
          case "Enter":
          {
-            this .evaluateSourceCode (event)
-            return
+            this .evaluateSourceCode (event);
+            return;
          }
          case "ArrowUp":
          {
             if (this .historyIndex === this .history .length)
             {
-               const text = this .textarea .val () .trim ()
+               const text = this .textarea .val () .trim ();
 
                if (text && text !== this .history .at (-1))
-                  this .history .push (text)
+                  this .history .push (text);
             }
 
-            this .fileConfig .history = this .history
+            this .fileConfig .history = this .history;
 
-            this .historyIndex = Math .max (this .historyIndex - 1, 0)
+            this .historyIndex = Math .max (this .historyIndex - 1, 0);
 
             if (this .historyIndex < this .history .length)
-               this .textarea .val (this .history [this .historyIndex])
+               this .textarea .val (this .history [this .historyIndex]);
 
-            this .adjustTextAreaHeight ()
-            return
+            this .adjustTextAreaHeight ();
+            return;
          }
          case "ArrowDown":
          {
-            this .historyIndex = Math .min (this .historyIndex + 1, this .history .length - 1)
+            this .historyIndex = Math .min (this .historyIndex + 1, this .history .length - 1);
 
             if (this .historyIndex < this .history .length)
-               this .textarea .val (this .history [this .historyIndex])
+               this .textarea .val (this .history [this .historyIndex]);
 
-            this .adjustTextAreaHeight ()
-            return
+            this .adjustTextAreaHeight ();
+            return;
          }
       }
    }
 
    onkeyup (event)
    {
-      this .adjustTextAreaHeight ()
+      this .adjustTextAreaHeight ();
    }
 
    adjustTextAreaHeight ()
@@ -214,41 +218,41 @@ module .exports = class Console extends Interface
             "word-wrap": "break-word",
          })
          .text (this .textarea .val ())
-         .appendTo ($("body"))
+         .appendTo ($("body"));
 
-      this .input .css ("height", `${div .height () + 5}px`)
-      this .output .css ("height", `calc(100% - ${this .input .height ()}px)`)
+      this .input .css ("height", `${div .height () + 5}px`);
+      this .output .css ("height", `calc(100% - ${this .input .height ()}px)`);
 
-      div .remove ()
+      div .remove ();
    }
 
    evaluateSourceCode (event)
    {
-      event .preventDefault ()
+      event .preventDefault ();
 
-      const text = this .textarea .val () .trim ()
+      const text = this .textarea .val () .trim ();
 
       if (!text)
-         return
+         return;
 
       if (text !== this .history .at (-1))
-         this .history .push (text)
+         this .history .push (text);
 
-      this .fileConfig .history = this .history
+      this .fileConfig .history = this .history;
 
-      this .historyIndex = this .history .length
+      this .historyIndex = this .history .length;
 
-      console .info (text)
+      console .info (text);
 
       try
       {
-         console .debug (String (this .scriptNode .evaluate (text)))
+         console .debug (String (this .scriptNode .evaluate (text)));
       }
       catch (error)
       {
-         console .error (`${error .name}: ${error .message}`)
+         console .error (`${error .name}: ${error .message}`);
       }
 
-      this .textarea .val ("")
+      this .textarea .val ("");
    }
-}
+};

package/src/X3D.js

@@ -1,8 +1,5 @@
 "use strict";
 
-/**
- * @type {{ SFBool: SFBool, SFColor: SFColor, }}
- */
 const X3D = process .env .SUNRISE_ENVIRONMENT === "DEVELOPMENT" ? require ("../x_ite/x_ite.js") : require ("x_ite");
 
 module .exports = X3D;

package/src/assets/html/application.js

@@ -1,6 +1,6 @@
-"use strict"
+"use strict";
 
 window .addEventListener ("DOMContentLoaded", () =>
 {
-   require ("../../Application/Tabs")
-})
+   require ("../../Application/Tabs");
+});

package/src/assets/html/window.js

@@ -1,8 +1,8 @@
-"use strict"
+"use strict";
 
 window .addEventListener ("DOMContentLoaded", () =>
 {
-   const electron = require ("electron")
+   const electron = require ("electron");
 
-   electron .ipcRenderer .on ("activate", () => require ("../../Application/Window"))
-})
+   electron .ipcRenderer .on ("activate", () => require ("../../Application/Window"));
+});