sunrize 1.11.5 → 1.11.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.11.5",
+  "version": "1.11.7",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -88,10 +88,10 @@
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
-    "@vscode/codicons": "^0.0.41",
+    "@vscode/codicons": "^0.0.42",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^39.0.0",
+    "electron": "^39.1.2",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -100,7 +100,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.39.1",
+    "material-symbols": "^0.39.2",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
     "monaco-editor": "^0.54.0",
@@ -110,7 +110,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.1.5",
+    "x_ite": "^12.1.7",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Controls/ExportNodePopover.js

@@ -23,7 +23,7 @@ $.fn.exportNodePopover = function (node, oldExportedName)
 
    const nameInput = $("<input></input>")
       .attr ("placeholder", _("Enter exported name"))
-      .val (oldExportedName ?? scene .getUniqueExportName (node .getName ()))
+      .val (oldExportedName || scene .getUniqueExportName (node .getName ()))
       .appendTo (content);
 
    // Create tooltip.

package/src/Controls/ImportNodePopover.js

@@ -23,7 +23,7 @@ $.fn.importNodePopover = function (inlineNode, exportedName, oldImportedName)
 
    const nameInput = $("<input></input>")
       .attr ("placeholder", _("Enter imported name"))
-      .val (oldImportedName ?? executionContext .getUniqueImportName (exportedName))
+      .val (oldImportedName || executionContext .getUniqueImportName (exportedName))
       .appendTo (content);
 
    // Create tooltip.

package/src/Editors/OutlineEditor.js

@@ -1054,7 +1054,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
          this .deselectAll ();
 
-         for (const node of nodes)
+         for (const node of nodes .filter (node => node))
          {
             this .expandTo (node);
             this .selectNodeElement ($(`.node[node-id="${node .getId ()}"]`), { add: true });

package/src/Editors/OutlineView.js

@@ -2154,7 +2154,7 @@ module .exports = class OutlineView extends Interface
       let index = 0;
 
       for (const node of field)
-         ul .append (this .createNodeElement ("node", parent, node .getValue (), index ++));
+         ul .append (this .createNodeElement ("node", parent, node ?.getValue (), index ++));
 
       // Make jsTree.
 
@@ -2787,15 +2787,37 @@ module .exports = class OutlineView extends Interface
 
    nodeCloseClones (element)
    {
-      const opened = this .sceneGraph .find (`.node[node-id=${element .attr ("node-id")}],
-         .imported-node[node-id=${element .attr ("node-id")}],
-         .exported-node[node-id=${element .attr ("node-id")}]`);
+      const ids = [parseInt (element .attr ("node-id"))];
 
-      opened .each (function (key, value)
+      if (this .getNode (element) instanceof X3D .X3DImportedNodeProxy)
       {
-         if (value !== element .get (0))
-            $(value) .jstree ("close_node", value);
-      })
+         // Close nodes.
+
+         ids .push ($.try (() => this .getNode (element) .getInnerNode () .getId ()));
+      }
+      else
+      {
+         // Close imported nodes.
+
+         const executionContext = this .getNode (element) .getScene () ?.getScene ()
+            ?? this .executionContext;
+
+         const importedNode = executionContext .importedNodes
+            .find (importedNode => $.try (() => importedNode .getExportedNode () .getInnerNode () .getId ()) === ids [0]);
+
+         ids .push (importedNode ?.getExportedNode () .getId ());
+      }
+
+      for (const id of ids)
+      {
+         const opened = this .sceneGraph .find (`:is(.node, .imported-node, .exported-node)[node-id="${id}"]`);
+
+         opened .each (function (key, value)
+         {
+            if (value !== element .get (0))
+               $(value) .jstree ("close_node", value);
+         });
+      }
    }
 
    fieldBeforeOpen (event, leaf)

package/src/Tools/Core/X3DNodeTool.js

@@ -220,6 +220,9 @@ class X3DNodeTool extends X3DBaseTool
 
       for (const tool of this .#tools)
       {
+         if (!this [tool])
+            continue;
+         
          for (const node of Traverse .traverse (this [tool], Traverse .ROOT_NODES | Traverse .INLINE_SCENE | Traverse .PROTOTYPE_INSTANCES))
          {
             nodesToDispose .push (node instanceof X3D .SFNode ? node .getValue () : node);

package/src/Undo/Editor.js

@@ -1986,98 +1986,126 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
    {
       node = node .valueOf ();
 
+      undoManager .beginUndo (_("Update Field %s of Node %s"), field .getName (), node .getTypeName ());
+
+      if (name !== field .getName ())
+         this .#renameField (executionContext, node, field, name, undoManager);
+
+      if (accessType !== field .getAccessType ())
+         this .#changeAccessType (executionContext, node, field, accessType, undoManager);
+
+      undoManager .endUndo ();
+   }
+
+   static #renameField (executionContext, node, field, name, undoManager = UndoManager .shared)
+   {
+      node = node .valueOf ();
+
       const
-         oldAccessType = field .getAccessType (),
-         oldName       = field .getName (),
-         fields        = Array .from (node .getUserDefinedFields ());
+         oldName      = field .getName (),
+         fields       = Array .from (node .getUserDefinedFields ()),
+         inputRoutes  = Array .from (field .getInputRoutes ()),
+         outputRoutes = Array .from (field .getOutputRoutes ());
 
-      undoManager .beginUndo (_("Update Fields of Node %s"), node .getTypeName ());
+      undoManager .beginUndo (_("Rename Field"));
+
+      for (const route of inputRoutes)
+         route .getExecutionContext () .deleteRoute (route);
+
+      for (const route of outputRoutes)
+         route .getExecutionContext () .deleteRoute (route);
 
       for (const field of fields)
          node .removeUserDefinedField (field .getName ());
 
-      field .setAccessType (accessType);
       field .setName (name);
 
       for (const field of fields)
          node .addUserDefinedField (field .getAccessType (), field .getName (), field);
 
-      if (accessType !== oldAccessType)
+      if (field .isInput ())
       {
-         if (node instanceof X3D .X3DProtoDeclaration)
-         {
-            const
-               proto        = node,
-               updatedField = field;
+         for (const route of inputRoutes)
+            route .getExecutionContext () .addRoute (route .sourceNode, route .sourceField, route .destinationNode, name);
+      }
 
-            for (const object of proto .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
-            {
-               if (!(object instanceof X3D .SFNode))
-                  continue;
+      if (field .isOutput ())
+      {
+         for (const route of outputRoutes)
+            route .getExecutionContext () .addRoute (route .sourceNode, name, route .destinationNode, route .destinationField);
+      }
 
-               const node = object .getValue ();
+      undoManager .registerUndo (() =>
+      {
+         this .#renameField (executionContext, node, field, oldName, undoManager);
+      });
 
-               for (const field of node .getFields ())
-               {
-                  // Remove references.
+      this .requestUpdateInstances (node, undoManager);
 
-                  if (field .getReferences () .has (updatedField))
-                  {
-                     if (!updatedField .isReference (field .getAccessType ()))
-                        this .removeReference (proto, updatedField, node, field, undoManager);
-                  }
-               }
-            }
+      undoManager .endUndo ();
+   }
 
-            // Remove routes.
+   static #changeAccessType (executionContext, node, field, accessType, undoManager = UndoManager .shared)
+   {
+      node = node .valueOf ();
 
-            for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
-            {
-               if (!(object instanceof X3D .SFNode))
-                  continue;
+      const
+         oldAccessType = field .getAccessType (),
+         fields        = Array .from (node .getUserDefinedFields ());
 
-               const node = object .getValue ();
+      undoManager .beginUndo (_("Change AccessType"));
 
-               if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
-                  continue;
+      for (const field of fields)
+         node .removeUserDefinedField (field .getName ());
 
-               if (node .getProtoNode () !== proto)
-                  continue;
+      field .setAccessType (accessType);
 
-               const field = node .getField (oldName);
+      for (const field of fields)
+         node .addUserDefinedField (field .getAccessType (), field .getName (), field);
 
-               if (!updatedField .isInput ())
-               {
-                  for (const route of field .getInputRoutes ())
-                  {
-                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                  }
-               }
+      if (node instanceof X3D .X3DProtoDeclaration)
+      {
+         const
+            proto        = node,
+            updatedField = field;
 
-               if (!updatedField .isOutput ())
+         for (const object of proto .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
+         {
+            if (!(object instanceof X3D .SFNode))
+               continue;
+
+            const node = object .getValue ();
+
+            for (const field of node .getFields ())
+            {
+               // Remove references.
+
+               if (field .getReferences () .has (updatedField))
                {
-                  for (const route of field .getOutputRoutes ())
-                  {
-                     this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
-                  }
+                  if (!updatedField .isReference (field .getAccessType ()))
+                     this .removeReference (proto, updatedField, node, field, undoManager);
                }
             }
-
-            this .updateInstances (proto, undoManager);
          }
-         else
+
+         // Remove routes.
+
+         for (const object of executionContext .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES))
          {
-            // Remove References.
+            if (!(object instanceof X3D .SFNode))
+               continue;
 
-            for (const reference of field .getReferences ())
-            {
-               if (!reference .isReference (field .getAccessType ()))
-                  this .removeReference (proto, reference, node, field, undoManager);
-            }
+            const node = object .getValue ();
 
-            // Remove routes.
+            if (!node .getType () .includes (X3D .X3DConstants .X3DPrototypeInstance))
+               continue;
+
+            if (node .getProtoNode () !== proto)
+               continue;
+
+            const field = node .getField (oldName);
 
-            if (!field .isInput ())
+            if (!updatedField .isInput ())
             {
                for (const route of field .getInputRoutes ())
                {
@@ -2085,7 +2113,7 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                }
             }
 
-            if (!field .isOutput ())
+            if (!updatedField .isOutput ())
             {
                for (const route of field .getOutputRoutes ())
                {
@@ -2093,11 +2121,46 @@ ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
                }
             }
          }
+
+         this .updateInstances (proto, undoManager);
+      }
+      else
+      {
+         const
+            references   = Array .from (field .getReferences ()),
+            inputRoutes  = Array .from (field .getInputRoutes ()),
+            outputRoutes = Array .from (field .getOutputRoutes ());
+
+         // Remove References.
+
+         for (const reference of references)
+         {
+            if (!reference .isReference (field .getAccessType ()))
+               this .removeReference (proto, reference, node, field, undoManager);
+         }
+
+         // Remove routes.
+
+         if (!field .isInput ())
+         {
+            for (const route of inputRoutes)
+            {
+               this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
+            }
+         }
+
+         if (!field .isOutput ())
+         {
+            for (const route of outputRoutes)
+            {
+               this .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField, undoManager);
+            }
+         }
       }
 
       undoManager .registerUndo (() =>
       {
-         this .updateUserDefinedField (executionContext, node, field, oldAccessType, oldName, undoManager);
+         this .#changeAccessType (executionContext, node, field, oldAccessType, undoManager);
       });
 
       this .requestUpdateInstances (node, undoManager);