x3d-tidy 3.0.2 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "x3d-tidy",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "X3D Converter, Beautifier and Minimizer",
   "main": "src/main.js",
   "bin": {
@@ -58,8 +58,8 @@
   },
   "dependencies": {
     "colors": "^1.4.0",
-    "x_ite": "^14.0.2",
-    "x_ite-node": "^2.0.2",
+    "x_ite": "^14.0.4",
+    "x_ite-node": "^2.0.4",
     "x3d-traverse": "^1.0.22",
     "yargs": "^18.0.0"
   },

package/src/infer.js

@@ -17,16 +17,19 @@ module .exports = function inferProfileAndComponents (scene)
 
 function getUsedComponents (scene)
 {
-   const components = new Set ();
+   const components = new Map ();
 
    for (const object of scene .traverse (Traverse .PROTO_DECLARATIONS | Traverse .PROTO_DECLARATION_BODY | Traverse .ROOT_NODES | Traverse .PROTOTYPE_INSTANCES))
    {
       if (!(object instanceof X3D .SFNode))
          continue;
 
-      const node = object .getValue ();
+      const
+         node          = object .getValue (),
+         componentInfo = node .getComponentInfo ();
 
-      components .add (node .getComponentInfo () .name);
+      if (components .get (componentInfo .name) ?? 0 < componentInfo .level)
+         components .set (componentInfo .name, componentInfo .level);
    }
 
    return components;
@@ -34,31 +37,46 @@ function getUsedComponents (scene)
 
 function getProfileAndComponentsFromUsedComponents (browser, usedComponents)
 {
-   const profiles = ["Interactive", "Interchange", "Immersive"] .map (name =>
+   const profiles = ["Interchange", "Interactive", "Immersive", "Full"] .map (name =>
    {
-      return { profile: browser .getProfile (name), components: new Set (usedComponents) };
+      return { profile: browser .getProfile (name), components: new Map (usedComponents) };
    });
 
-   profiles .forEach (object =>
+   profiles .forEach (({ profile, components }) =>
    {
-      for (const component of object .profile .components)
-         object .components .delete (component .name);
+      for (const component of profile .components)
+      {
+         const level = components .get (component .name);
+
+         if (level === undefined)
+            continue;
+
+         if (level > component .level)
+            continue;
+
+         components .delete (component .name);
+      }
    });
 
    const min = profiles .reduce ((min, object) =>
    {
-      const count = object .profile .components .length + object .components .size;
+      const count = new Set ([
+         ... [... object .profile .components] .map (component => component .name),
+         ... object .components .keys ()
+      ]) .size;
 
       return min .count < count ? min : {
-         count: count,
-         object: object,
+         count,
+         object,
       };
    },
    { count: Number .POSITIVE_INFINITY });
 
    return {
       profile: min .object .profile,
-      components: Array .from (min .object .components) .sort () .map (name => browser .getSupportedComponents () .get (name)),
+      components: Array .from (min .object .components .keys ())
+         .sort ()
+         .map (name => browser .getComponent (name)),
    };
 }