x3d-tidy 1.0.37 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "x3d-tidy",
-   "version": "1.0.37",
+   "version": "1.0.38",
    "description": "X3D Converter, Beautifier and Minimizer",
    "bin": {
       "x3d-tidy": "bin/x3d-tidy.js"
@@ -40,8 +40,8 @@
    },
    "homepage": "https://www.npmjs.com/package/x3d-tidy",
    "dependencies": {
-      "electron": "^24.4.0",
-      "x_ite": "^8.7.9",
+      "electron": "^25.1.0",
+      "x_ite": "^8.8.0",
       "yargs": "^17.7.2"
    }
 }

package/src/infer.js

@@ -38,7 +38,7 @@ function getProfileAndComponentsFromUsedComponents (browser, usedComponents)
    const profiles = ["Interactive", "Interchange", "Immersive"] .map (name =>
    {
       return { profile: browser .getProfile (name), components: new Set (usedComponents) }
-   });
+   })
 
    profiles .forEach (object =>
    {
@@ -58,7 +58,7 @@ function getProfileAndComponentsFromUsedComponents (browser, usedComponents)
    { count: Number .POSITIVE_INFINITY })
 
    return {
-      profile:  min .object .profile,
+      profile: min .object .profile,
       components: Array .from (min .object .components) .sort () .map (name => browser .getSupportedComponents () .get (name)),
    }
 }

package/src/traverse.js

@@ -85,30 +85,17 @@ module .exports = class Traverse
 
       seen .add (node)
 
-      for (const field of node .getFields ())
-      {
-         switch (field .getType ())
-         {
-            case X3D .X3DConstants .SFNode:
-            {
-               if (this .traverseNode (field .getValue (), flags, callback, seen) === false)
-                  return false
+      if (this .traverseFields (node .getUserDefinedFields (), flags, callback, seen) === false)
+         return false
 
-               break
-            }
-            case X3D .X3DConstants .MFNode:
-            {
-               if (this .traverseNodes (field, flags, callback, seen) === false)
-                  return false
+      if (this .traverseFields (node .getPredefinedFields (), flags, callback, seen) === false)
+         return false
 
-               break
-            }
-         }
-      }
+      const type = node .getType ()
 
-      for (const type of node .getType () .slice () .reverse ())
+      for (let t = type .length - 1; t >= 0; -- t)
       {
-         switch (type)
+         switch (type [t])
          {
             case X3D .X3DConstants .X3DProtoDeclaration:
             {
@@ -141,4 +128,30 @@ module .exports = class Traverse
 
       return callback (node) !== false
    }
+
+   static traverseFields (fields, flags, callback, seen)
+   {
+      for (const field of fields)
+      {
+         switch (field .getType ())
+         {
+            case X3D .X3DConstants .SFNode:
+            {
+               if (this .traverseNode (field .getValue (), flags, callback, seen) === false)
+                  return false
+
+               break
+            }
+            case X3D .X3DConstants .MFNode:
+            {
+               if (this .traverseNodes (field, flags, callback, seen) === false)
+                  return false
+
+               break
+            }
+         }
+      }
+
+      return true
+   }
 }