sunrize 1.9.1 → 1.10.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.9.1",
+  "version": "1.10.0",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -20,9 +20,7 @@
     "premake": "npm i -D electron",
     "make": "electron-forge make",
     "postmake": "npm i -P electron",
-    "pregithub": "npm i -D electron",
-    "github": "electron-forge publish",
-    "postgithub": "npm i -P electron",
+    "publish-to-github": "node build/publish-to-github.js",
     "predocs": "rm -f -r docs/_site/",
     "docs": "cd docs && bundle exec jekyll serve --ssl-key ssl/server.key --ssl-cert ssl/server.crt --incremental --host=`ipconfig getifaddr en0`",
     "predocs-install": "cd docs && ln -s -f ../../ssl ./",
@@ -103,14 +101,14 @@
     "material-symbols": "^0.35.0",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
-    "monaco-editor": "^0.50.0",
+    "monaco-editor": "^0.53.0",
     "node-localstorage": "^3.0.5",
     "qtip2": "^3.0.3",
     "spectrum-colorpicker2": "^2.0.10",
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.0.7",
+    "x_ite": "^12.0.8",
     "x3d-traverse": "^1.0.13"
   }
 }

package/src/Application/Application.js

@@ -384,9 +384,14 @@ module .exports = class Application
                   },
                   { type: "separator" },
                   {
-                     label: _("Close"),
+                     label: _("Close Tab"),
                      accelerator: "CmdOrCtrl+W",
-                     click: () => this .mainWindow .webContents .send ("close"),
+                     click: () => this .mainWindow .webContents .send ("close-tab"),
+                  },
+                  {
+                     label: _("Close All Tabs"),
+                     accelerator: "Option+CmdOrCtrl+W",
+                     click: () => this .mainWindow .webContents .send ("close-all-tabs"),
                   },
                   ... process .platform === "darwin" ?
                   [ ]
@@ -424,22 +429,49 @@ module .exports = class Application
                      { type: "separator" },
                      { role: "selectAll" },
                   ],
+               ]
+            }
+            : this .menuOptions .monacoEditor ?
+            {
+               role: "editMenu",
+               submenu: [
+                  {
+                     label: _("Undo"),
+                     accelerator: "CmdOrCtrl+Z",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "triggerEvent", "keyboard", "undo", null),
+                  },
+                  {
+                     label: _("Redo"),
+                     accelerator: "CmdOrCtrl+Shift+Z",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "triggerEvent", "keyboard", "redo", null),
+                  },
+                  { type: "separator" },
+                  {
+                     role: "cut",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "cutOrCopy", "cut"),
+                  },
+                  {
+                     role: "copy",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "cutOrCopy", "copy"),
+                  },
+                  {
+                     role: "paste",
+                     click: () => this .mainWindow .webContents .send ("script-editor", "paste"),
+                  },
                   { type: "separator" },
                   {
                      label: _("Toggle Line Comment"),
                      accelerator: process .platform === "darwin" ? "CmdOrCtrl+Shift+7" : "CmdOrCtrl+#",
-                     enabled: this .menuOptions .monacoEditor,
                      click: () => this .mainWindow .webContents .send ("script-editor", "runAction", "editor.action.commentLine"),
                   },
                   {
                      label: _("Toggle Block Comment"),
                      accelerator: "Alt+Shift+A",
-                     enabled: this .menuOptions .monacoEditor,
                      click: () => this .mainWindow .webContents .send ("script-editor", "runAction", "editor.action.blockComment"),
                   },
                ]
             }
-            :
+            : // Outline Editor, Browser
             {
                role: "editMenu",
                submenu: [
@@ -456,15 +488,9 @@ module .exports = class Application
                      click: () => this .mainWindow .webContents .send ("redo"),
                   },
                   { type: "separator" },
-                  {
-                     role: "cut",
-                  },
-                  {
-                     role: "copy",
-                  },
-                  {
-                     role: "paste",
-                  },
+                  { role: "cut" },
+                  { role: "copy" },
+                  { role: "paste" },
                   {
                      label: _("Delete"),
                      accelerator: "CmdOrCtrl+Backspace",
@@ -932,7 +958,7 @@ module .exports = class Application
       {
          if (menuItem .submenu)
             this .addMenuItemHandlers (id, menuItem .submenu);
-         else
+         else if (menuItem .args)
             menuItem .click = () => this .mainWindow .webContents .send (id, ... menuItem .args);
       }
 

package/src/Application/Dashboard.js

@@ -92,7 +92,7 @@ module .exports = class Dashboard extends Interface
 
       this .showPanelsButton = $("<span></span>")
          .addClass (["material-symbols-outlined"])
-         .attr ("title", _("Toggle visibility of Panel."))
+         .attr ("title", _("Show Node Panel."))
          .text ("edit_note")
          .appendTo (this .toolbar)
          .on ("click", () => this .togglePanel (!this .config .file .panel));

package/src/Application/Document.js

@@ -272,9 +272,37 @@ module .exports = class Document extends Interface
    {
       this .activeElement = document .activeElement ? $(document .activeElement) : null;
 
+      if (this .activeElement ?.is ("input, textarea"))
+      {
+         this .activeElement
+            .off ("contextmenu.Document")
+            .on ("contextmenu.Document", () => this .showContextMenu ());
+      }
+
       electron .ipcRenderer .send ("update-menu", this .updateEditMenu ({ }));
    }
 
+   async showContextMenu ()
+   {
+      await $.sleep ();
+
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
+      const menu = [
+         { role: "undo", accelerator: "CmdOrCtrl+Z" },
+         { role: "redo", accelerator: "Shift+CmdOrCtrl+Z" },
+         { type: "separator" },
+         { role: "cut", accelerator: "CmdOrCtrl+X" },
+         { role: "copy", accelerator: "CmdOrCtrl+C" },
+         { role: "paste", accelerator: "CmdOrCtrl+P" },
+         { type: "separator" },
+         { role: "selectAll", accelerator: "CmdOrCtrl+A" },
+      ];
+
+      electron .ipcRenderer .send ("context-menu", "default-context-menu", menu);
+   }
+
    updateEditMenu (menu)
    {
       return Object .assign (menu,
@@ -314,6 +342,9 @@ module .exports = class Document extends Interface
       if (!this .activeElement .closest (".monaco-editor") .length)
          return false;
 
+      if (this .activeElement .closest (".ibwrapper") .length)
+         return false;
+
       return true;
    }
 
@@ -586,6 +617,9 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
       this .sidebar .outlineEditor .cutNodes ();
       return false;
    }
@@ -595,6 +629,9 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
       this .sidebar .outlineEditor .copyNodes (true);
       return false;
    }
@@ -604,6 +641,9 @@ Viewpoint {
       if (this .activeElementIsInputOrOutput ())
          return;
 
+      if (this .activeElementIsMonacoEditor ())
+         return;
+
       this .sidebar .outlineEditor .pasteNodes ();
       return false;
    }

package/src/Application/Tabs.js

@@ -54,7 +54,8 @@ module .exports = new class Tabs
       electron .ipcRenderer .on ("save-file",      (event)           => this .saveFile ());
       electron .ipcRenderer .on ("save-file-as",   (event, filePath) => this .saveFileAs (filePath));
       electron .ipcRenderer .on ("save-all-files", (event)           => this .saveAllFiles ());
-      electron .ipcRenderer .on ("close",          (event)           => this .tabs .getActiveTab () ?.close (true));
+      electron .ipcRenderer .on ("close-tab",      (event)           => this .tabs .getActiveTab () ?.close (true));
+      electron .ipcRenderer .on ("close-all-tabs", (event)           => this .closeAllTabs ());
       electron .ipcRenderer .on ("quit",           (event)           => this .quit ());
 
       electron .ipcRenderer .on ("toggle-developer-tools", (event) => this .tabs .getActiveTab () .webview .openDevTools ());
@@ -336,6 +337,12 @@ module .exports = new class Tabs
          tab .webview .send ("save-file");
    }
 
+   closeAllTabs ()
+   {
+      for (const tab of this .tabs .getTabs ())
+         tab .close (true);
+   }
+
    close ()
    {
       this .saveTabs ();

package/src/Editors/OutlineEditor.js

@@ -151,6 +151,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             { type: "separator" },
             {
                label: _("Paste"),
+               accelerator: "CmdOrCtrl+V",
                visible: field .getType () === X3D .X3DConstants .SFNode || field .getType () === X3D .X3DConstants .MFNode,
                args: ["pasteNodes", element .attr ("id"), executionContext .getId (), node .getId (), field .getId ()],
             },
@@ -223,18 +224,22 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                { type: "separator" },
                {
                   label: _("Cut"),
+                  accelerator: "CmdOrCtrl+X",
                   args: ["cutNodes"],
                },
                {
                   label: _("Copy"),
+                  accelerator: "CmdOrCtrl+C",
                   args: ["copyNodes"],
                },
                {
                   label: _("Paste"),
+                  accelerator: "CmdOrCtrl+V",
                   args: ["pasteNodes", element .attr ("id"), executionContext .getId (), node .getId ()],
                },
                {
                   label: _("Delete"),
+                  accelerator: "CmdOrCtrl+Backspace",
                   args: ["deleteNodes"],
                },
                {
@@ -537,14 +542,17 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             var menu = [
                {
                   label: _("Cut"),
+                  accelerator: "CmdOrCtrl+X",
                   args: ["cutNodes"],
                },
                {
                   label: _("Copy"),
+                  accelerator: "CmdOrCtrl+C",
                   args: ["copyNodes"],
                },
                {
                   label: _("Delete"),
+                  accelerator: "CmdOrCtrl+Backspace",
                   args: ["deleteNodes"],
                },
             ];
@@ -670,6 +678,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             },
             {
                label: _("Paste"),
+               accelerator: "CmdOrCtrl+V",
                args: ["pasteNodes", element .attr ("id"), executionContext .getId ()],
             },
          ];

package/src/Editors/OutlineView.js

@@ -1716,7 +1716,7 @@ module .exports = class OutlineView extends Interface
                   .addClass ("input-selector") .appendTo (map);
 
                const inputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .attr ("coords", "20,0,28,7")
                   .addClass ("input-routes-selector") .appendTo (map);
@@ -1736,7 +1736,7 @@ module .exports = class OutlineView extends Interface
                   .addClass ("output-selector") .appendTo (map);
 
                const outputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .attr ("coords", "20,5,28,12")
                   .addClass ("output-routes-selector")
@@ -1765,7 +1765,7 @@ module .exports = class OutlineView extends Interface
                   .appendTo (map);
 
                const inputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .attr ("coords", "34,0,42,7")
                   .addClass ("input-routes-selector")
@@ -1775,7 +1775,7 @@ module .exports = class OutlineView extends Interface
                   inputRoutesSelector .attr ("href", "#");
 
                const outputRoutesSelector = $("<area></area>")
-                  .attr ("title", _("Select routes."))
+                  .attr ("title", _("Select route(s)."))
                   .attr ("shape", "rect")
                   .addClass ("output-routes-selector")
                   .appendTo (map);
@@ -2359,7 +2359,7 @@ module .exports = class OutlineView extends Interface
 
       $("<div></div>")
          .addClass (type + "-value-container")
-         .append ($("<input></input>") .attr ("type", "text"))
+         .append ($("<input></input>") .attr ("type", "text") .attr ("lang", "en"))
          .appendTo (li);
 
       // Make jsTree.
@@ -2467,7 +2467,7 @@ module .exports = class OutlineView extends Interface
 
       $("<div></div>")
          .addClass (type + "-value-container")
-         .append ($("<textarea></textarea>"))
+         .append ($("<textarea></textarea>") .attr ("lang", "en"))
          .appendTo (li)
 
       // Make jsTree.
@@ -3827,7 +3827,7 @@ module .exports = class OutlineView extends Interface
 
    selectRoutes (type, event)
    {
-      // Select routes.
+      // Select route(s).
    }
 
    selectSingleRoute (type, event)

package/src/Editors/Panel.js

@@ -120,7 +120,7 @@ module .exports = new class Panel extends Interface
 
       this .container .css ({
          "overflow": "visible",
-         "max-height": "auto",
+         "max-height": "unset",
       });
 
       // Create folders.

package/src/Editors/SceneProperties.js

@@ -227,9 +227,9 @@ module .exports = new class SceneProperties extends Dialog
 
       this .executionContext .getWorldInfos () .addInterest ("updateWorldInfo", this);
 
-      const window = require ("../Application/Window");
+      const app = require ("../Application/Window");
 
-      this .profileAndComponents .inputs .checkbox .prop ("checked", window .config .file .inferProfileAndComponents);
+      this .profileAndComponents .inputs .checkbox .prop ("checked", app .config .file .inferProfileAndComponents);
 
       this .toggleInferProfileAndComponents ();
       this .updateProfile ();
@@ -251,9 +251,9 @@ module .exports = new class SceneProperties extends Dialog
 
    toggleInferProfileAndComponents ()
    {
-      const window = require ("../Application/Window");
+      const app = require ("../Application/Window");
 
-      window .config .file .inferProfileAndComponents = this .profileAndComponents .inputs .checkbox .prop ("checked");
+      app .config .file .inferProfileAndComponents = this .profileAndComponents .inputs .checkbox .prop ("checked");
 
       if (this .profileAndComponents .inputs .checkbox .prop ("checked"))
          this .profileAndComponents .checkboxRow .addClass ("disabled");

package/src/Editors/ScriptEditor.js

@@ -1,22 +1,22 @@
 "use strict";
 
 const
-   $           = require ("jquery"),
-   electron    = require ("electron"),
-   path        = require ("path"),
-   url         = require ("url"),
-   fs          = require ("fs"),
-   X3D         = require ("../X3D"),
-   Interface   = require ("../Application/Interface"),
-   Splitter    = require ("../Controls/Splitter"),
-   NodeList    = require ("./NodeList"),
-   Console     = require ("./Console"),
-   Editor      = require ("../Undo/Editor"),
-   UndoManager = require ("../Undo/UndoManager"),
-   monaco      = require ("monaco-editor/min/vs/loader.js"),
-   _           = require ("../Application/GetText");
-
-monaco .require .config ({
+   $            = require ("jquery"),
+   electron     = require ("electron"),
+   path         = require ("path"),
+   url          = require ("url"),
+   fs           = require ("fs"),
+   X3D          = require ("../X3D"),
+   Interface    = require ("../Application/Interface"),
+   Splitter     = require ("../Controls/Splitter"),
+   NodeList     = require ("./NodeList"),
+   Console      = require ("./Console"),
+   Editor       = require ("../Undo/Editor"),
+   UndoManager  = require ("../Undo/UndoManager"),
+   monacoLoader = require ("monaco-editor/min/vs/loader.js"),
+   _            = require ("../Application/GetText");
+
+monacoLoader .require .config ({
    baseUrl: url .pathToFileURL (path .resolve (path .dirname (require .resolve ("monaco-editor/package.json")), "min")) + "/",
 });
 
@@ -137,14 +137,21 @@ module .exports = class ScriptEditor extends Interface
       this .setup ();
    }
 
-   colorScheme (shouldUseDarkColors)
+   getMonaco ()
    {
-      monaco .require (["vs/editor/editor.main"], monaco =>
+      return new Promise (resolve =>
       {
-         monaco .editor .setTheme (shouldUseDarkColors ? "vs-dark" : "vs-light");
+         monacoLoader .require (["vs/editor/editor.main"], ({ m: monaco }) => resolve (monaco));
       });
    }
 
+   async colorScheme (shouldUseDarkColors)
+   {
+      const monaco = await this .getMonaco ();
+
+      monaco .editor .setTheme (shouldUseDarkColors ? "vs-dark" : "vs-light");
+   }
+
    async setNode (node)
    {
       this .directOutputButton .hide ();
@@ -368,74 +375,92 @@ module .exports = class ScriptEditor extends Interface
       "ShaderPart": "c",
    };
 
-   getEditor (node)
+   async getEditor (node)
+   {
+      if (!this .editors .has (node))
+         this .editors .set (node, await this .createEditor (node));
+
+      return this .editors .get (node);
+   }
+
+   async createEditor (node)
+   {
+      const
+         monaco  = await this .getMonaco (),
+         element = $("<div></div>") .addClass ("script-editor-monaco");
+
+      const editor = monaco .editor .create (element .get (0),
+      {
+         language: this .languages [node .getTypeName ()],
+         contextmenu: false,
+         automaticLayout: true,
+         wordWrap: "on",
+         wrappingIndent: "indent",
+         minimap: { enabled: false },
+         bracketPairColorization: { enabled: true },
+      });
+
+      editor .viewState = editor .saveViewState ();
+
+      editor .onDidFocusEditorWidget (() => this .setDeclarations (monaco));
+      editor .onDidBlurEditorWidget (() => this .apply ());
+      editor .onKeyDown (event => this .onKeyDown (event));
+
+      element .on ("mouseenter", () => this .setDeclarations (monaco));
+      element .on ("contextmenu", () => this .showContextMenu ());
+
+      // this .debugFindActions (editor)
+      return { element, editor, monaco };
+   }
+
+   onKeyDown (event)
    {
-      return new Promise ((resolve, reject) =>
+      const { keyCode, ctrlKey, metaKey } = event;
+
+      switch (keyCode)
       {
-         if (this .editors .has (node))
+         case 33: // c
          {
-            resolve (this .editors .get (node));
+            if (!(metaKey || ctrlKey))
+               break;
+
+            event .preventDefault ();
+            event .stopPropagation ();
+            this .cutOrCopy ("copy");
+            break;
          }
-         else
+         case 52: // v
          {
-            monaco .require (["vs/editor/editor.main"], monaco =>
-            {
-               const element = $("<div></div>")
-                  .addClass ("script-editor-monaco")
-                  .appendTo (this .verticalSplitterRight);
-
-               self .MonacoEnvironment =
-               {
-                  getWorkerUrl (moduleId, label)
-                  {
-                     return url .pathToFileURL (require .resolve ("monaco-editor/min/vs/base/worker/workerMain.js"));
-                  },
-               };
-
-               const editor = monaco .editor .create (element .get (0),
-               {
-                  language: this .languages [node .getTypeName ()],
-                  contextmenu: false,
-                  automaticLayout: true,
-                  wordWrap: "on",
-                  wrappingIndent: "indent",
-                  minimap: { enabled: false },
-                  bracketPairColorization: { enabled: true },
-               });
-
-               editor .onDidFocusEditorWidget (() => this .setDeclarations (monaco));
-               editor .onDidBlurEditorWidget (() => this .apply ());
-
-               editor .onKeyDown ((event) =>
-               {
-                  const { keyCode, ctrlKey, metaKey } = event;
-
-                  if (keyCode === 52 && (metaKey || ctrlKey))
-                  {
-                     event .preventDefault ();
-                     this .paste ();
-                  }
-               });
-
-               editor .viewState = editor .saveViewState ();
-
-               element .on ("mouseenter", () => this .setDeclarations (monaco))
-               element .on ("contextmenu", () => this .showContextMenu ());
-               element .detach ();
-
-               // this .debugFindActions (editor)
-               this .editors .set (node, { element, editor, monaco });
-
-               // Return editor.
-
-               resolve (this .editors .get (node));
-            });
+            if (!(metaKey || ctrlKey))
+               break;
+
+            event .preventDefault ();
+            event .stopPropagation ();
+            this .paste ();
+            break;
          }
-      });
+         case 54: // x
+         {
+            if (!(metaKey || ctrlKey))
+               break;
+
+            event .preventDefault ();
+            event .stopPropagation ();
+            this .cutOrCopy ("cut");
+            break;
+         }
+      }
    }
 
-   showContextMenu ()
+   async showContextMenu ()
    {
+      await $.sleep ();
+
+      const app = require ("../Application/Window");
+
+      if (!app .activeElementIsMonacoEditor ())
+         return;
+
       const menu = [
          // {
          //    label: _("Go to Definition"),
@@ -478,14 +503,17 @@ module .exports = class ScriptEditor extends Interface
          { type: "separator" },
          {
             label: _("Cut"),
-            args: ["cutOrCopy", true],
+            accelerator: "CmdOrCtrl+X",
+            args: ["cutOrCopy", "cut"],
          },
          {
             label: _("Copy"),
-            args: ["cutOrCopy", false],
+            accelerator: "CmdOrCtrl+C",
+            args: ["cutOrCopy", "copy"],
          },
          {
             label: _("Paste"),
+            accelerator: "CmdOrCtrl+V",
             args: ["paste"],
          },
          { type: "separator" },
@@ -503,6 +531,16 @@ module .exports = class ScriptEditor extends Interface
       this .editor .getAction (id) .run ();
    }
 
+   triggerEvent (... args)
+   {
+      this .editor .trigger (... args);
+   }
+
+   // execCommand (command)
+   // {
+   //    document .execCommand (command);
+   // }
+
    debugFindActions (editor = this .editor)
    {
       for (const action of editor .getSupportedActions ())
@@ -552,12 +590,7 @@ module .exports = class ScriptEditor extends Interface
       }
    }
 
-   // execCommand (command)
-   // {
-   //    document .execCommand (command);
-   // }
-
-   cutOrCopy (cut)
+   cutOrCopy (type)
    {
       this .editor .focus ();
 
@@ -576,7 +609,7 @@ module .exports = class ScriptEditor extends Interface
       // Set the clipboard contents.
       navigator .clipboard .writeText (data || "");
 
-      if (!cut)
+      if (type === "copy")
          return;
 
       // This is a cut operation, so replace the selection with an empty string.