sunrize 1.7.33 → 1.7.35

package/bin/sunrize.js

@@ -4,11 +4,13 @@
 const os = require ("os");
 const path = require ("path");
 const { spawn } = require ("child_process");
+const cwd = process .cwd ();
 const cmd = os .platform () === "win32" ? "npm.cmd" : "npm";
+const args = [... process .argv .slice (2), cwd];
 
 process .chdir (path .resolve (__dirname, ".."));
 
-const p = spawn (cmd, ["start", "--silent", "--", ... process .argv .slice (2)], { shell: true });
+const p = spawn (cmd, ["start", "--silent", "--", btoa (JSON .stringify (args))], { shell: true });
 
 p .stdout .pipe (process .stdout);
 p .stderr .pipe (process .stderr);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.7.33",
+  "version": "1.7.35",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -78,19 +78,19 @@
     "url": "https://patreon.com/X_ITE"
   },
   "devDependencies": {
-    "@electron-forge/cli": "^7.5.0",
-    "@electron-forge/maker-deb": "^7.5.0",
-    "@electron-forge/maker-dmg": "^7.5.0",
-    "@electron-forge/maker-rpm": "^7.5.0",
-    "@electron-forge/maker-squirrel": "^7.5.0",
-    "@electron-forge/maker-zip": "^7.5.0",
-    "@electron-forge/publisher-github": "^7.5.0",
+    "@electron-forge/cli": "^7.6.0",
+    "@electron-forge/maker-deb": "^7.6.0",
+    "@electron-forge/maker-dmg": "^7.6.0",
+    "@electron-forge/maker-rpm": "^7.6.0",
+    "@electron-forge/maker-squirrel": "^7.6.0",
+    "@electron-forge/maker-zip": "^7.6.0",
+    "@electron-forge/publisher-github": "^7.6.0",
     "shell-tools": "^1.1.9"
   },
   "dependencies": {
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^33.2.0",
+    "electron": "^33.2.1",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -99,7 +99,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.12",
-    "material-symbols": "^0.27.0",
+    "material-symbols": "^0.27.1",
     "md5": "^2.3.0",
     "mime-types": "^2.1.35",
     "monaco-editor": "^0.50.0",
@@ -109,7 +109,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.0.0",
-    "x_ite": "^10.5.14",
-    "x3d-traverse": "^1.0.5"
+    "x_ite": "^10.5.15",
+    "x3d-traverse": "^1.0.6"
   }
 }

package/src/Editors/ScriptEditor.js

@@ -252,7 +252,7 @@ module .exports = class ScriptEditor extends Interface
          return;
 
       this .#declarations ??= fs .readFileSync (X3D .TYPE_SCRIPT_PATH, "utf8")
-         .replace (/^.*?(?:export = X3D;)/s, "");
+         .replace (/^.*?(?:export.*?;)/s, "");
 
       const fields = Array .from (this .node .getUserDefinedFields (), field =>
       {
@@ -267,7 +267,7 @@ module .exports = class ScriptEditor extends Interface
                   case X3D .X3DConstants .SFNode:
                   {
                      if (field .getValue ())
-                        return `declare let ${field .getName ()}: X3D .${field .getValue () .getTypeName ()}Proxy;`;
+                        return `declare let ${field .getName ()}: X3D .${field .getNodeTypeName ()}Proxy;`;
                      else
                         return `declare let ${field .getName ()}: X3D .SFNode | null;`;
                   }
@@ -284,10 +284,12 @@ module .exports = class ScriptEditor extends Interface
                   {
                      return `declare let ${field .getName ()}: ${
                         this .#internalTypes .get (field .getType ()) ?? "X3D ." + field .getTypeName ()
-                     };`
+                     };`;
                   }
                }
             }
+            default:
+               return "";
          }
       });
 
@@ -297,6 +299,36 @@ module .exports = class ScriptEditor extends Interface
             ${this .#declarations};
             declare const Browser: X3D .X3DBrowser;
             declare const X3DConstants: X3D .X3DConstants;
+            declare const X3DBrowser: typeof X3D. X3DBrowser;
+            declare const X3DExecutionContext: typeof X3D. X3DExecutionContext;
+            declare const X3DScene: typeof X3D. X3DScene;
+            declare const ComponentInfo: typeof X3D. ComponentInfo;
+            declare const ComponentInfoArray: typeof X3D. ComponentInfoArray;
+            declare const ProfileInfo: typeof X3D. ProfileInfo;
+            declare const ProfileInfoArray: typeof X3D. ProfileInfoArray;
+            declare const ConcreteNodesArray: typeof X3D. ConcreteNodesArray;
+            declare const AbstractNodesArray: typeof X3D. AbstractNodesArray;
+            declare const UnitInfo: typeof X3D. UnitInfo;
+            declare const UnitInfoArray: typeof X3D. UnitInfoArray;
+            declare const NamedNodesArray: typeof X3D. NamedNodesArray;
+            declare const ImportedNodesArray: typeof X3D. ImportedNodesArray;
+            declare const X3DImportedNode: typeof X3D. X3DImportedNode;
+            declare const ExportedNodesArray: typeof X3D. ExportedNodesArray;
+            declare const X3DExportedNode: typeof X3D. X3DExportedNode;
+            declare const ExternProtoDeclarationArray: typeof X3D. ExternProtoDeclarationArray;
+            declare const ProtoDeclarationArray: typeof X3D. ProtoDeclarationArray;
+            declare const X3DExternProtoDeclaration: typeof X3D. X3DExternProtoDeclaration;
+            declare const X3DProtoDeclaration: typeof X3D. X3DProtoDeclaration;
+            declare const X3DProtoDeclarationNode: typeof X3D. X3DProtoDeclarationNode;
+            declare const RouteArray: typeof X3D. RouteArray;
+            declare const X3DRoute: typeof X3D. X3DRoute;
+            declare const X3DFieldDefinition: typeof X3D. X3DFieldDefinition;
+            declare const FieldDefinitionArray: typeof X3D. FieldDefinitionArray;
+            declare const X3DField: typeof X3D. X3DField;
+            declare const X3DArrayField: typeof X3D. X3DArrayField;
+            ${Array .from (this .browser .fieldTypes)
+               .map (type => `declare const ${type .typeName}: typeof X3D .${type .typeName};`)
+               .join ("\n")}
             declare const TRUE: true;
             declare const FALSE: false;
             declare const NULL: null;

package/src/main.js

@@ -1,3 +1,9 @@
 "use strict";
 
+if (process .argv .length > 2)
+{
+   process .argv = process .argv .concat (JSON .parse (atob (process .argv .pop ())));
+   process .chdir (process .argv .pop ());
+}
+
 const app = require ("./Application/Application") .run ();

package/src/assets/html/application.html

@@ -1,77 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <!-- Theme -->
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/src/assets/themes/default.css"/>
-  </head>
-  <body>
-    <tab-group sortable="true">
-      <style>
-.etabs .nav {
-  height: var(--window-tabs-height);
-  background: var(--background-color);
-  box-shadow: none;
-  border: none;
-  overflow: auto;
-  white-space: nowrap;
-}
-
-.etabs .tab {
-  background: var(--window-tabs-background-color);
-  border-color: var(--border-color) !important;
-  padding: 4px 3px !important;
-  color: var(--window-tabs-text-color);
-  font-family: var(--sans-serif);
-  box-shadow: none;
-}
-
-.etabs .tab:first-child {
-  border-left: 0;
-}
-
-.etabs .tab.active {
-  z-index: 1100;
-  background: var(--background-color);
-  color: var(--window-tabs-highlight-color);
-}
-
-.etabs::before {
-  z-index: 1000;
-  content: "";
-  position: relative;
-  display: block;
-  height: 1px;
-  width: 100%;
-  box-shadow: var(--tabs-shadow);
-}
-
-.etabs .buttons {
-  border-color: var(--border-color);
-}
-
-.etabs .buttons:hover button,
-.etabs .tab-close button:hover {
-  background: none;
-}
-
-.etabs .buttons button:hover,
-.etabs .tab-close:hover button {
-  color: var(--system-gray0);
-}
-
-.etabs .tab-close button {
-  visibility: hidden;
-}
-
-.etabs .tab.active .tab-close button,
-.etabs .tab:hover .tab-close button {
-  visibility: visible;
-}
-
-.etabs .tab-close {
-  margin-left: 4px;
-}
-      </style>
-    </tab-group>
-  </body>
-</html>

package/src/assets/html/window.html

@@ -1,38 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/jquery-ui-dist/jquery-ui.min.css"/>
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/qtip2/dist/jquery.qtip.min.css"/>
-    <link rel="stylesheet" type="text/css" href="file:///Users/holger/Desktop/X_ITE/sunrize/src/assets/themes/default.css"/>
-    <link rel="stylesheet" data-name="vs/editor/editor.main" href="file:///Users/holger/Desktop/X_ITE/sunrize/node_modules/monaco-editor/min/vs/editor/editor.main.css">
-  </head>
-  <body>
-    <div id="vertical-splitter" class="vertical-splitter">
-      <div class="vertical-splitter-left">
-        <div id="horizontal-splitter" class="horizontal-splitter">
-          <div class="horizontal-splitter-top">
-            <div id="browser-pane">
-              <div id="browser-frame">
-                <x3d-canvas
-                    id="browser"
-                    debug="false"
-                    cache="false"
-                    preserveDrawingBuffer="true"
-                    splashScreen="false"
-                    contextMenu="false"
-                    xrSessionMode="NONE"></x3d-canvas>
-              </div>
-              <div id="secondary-toolbar" class="toolbar vertical-toolbar large-toolbar secondary-toolbar"></div>
-            </div>
-          </div>
-          <div class="horizontal-splitter-bottom">
-            <div id="footer"></div>
-          </div>
-        </div>
-      </div>
-      <div class="vertical-splitter-right">
-        <div id="sidebar" class="sidebar"></div>
-      </div>
-    </div>
-  </body>
-</html>