x_ite 8.6.8 → 8.6.9

package/src/x_ite/Execution/NamedNodesHandling.js

@@ -0,0 +1,84 @@
+/*******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011 - 2022.
+ *
+ * All rights reserved. Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * The copyright notice above does not evidence any actual of intended
+ * publication of such source code, and is an unpublished work by create3000.
+ * This material contains CONFIDENTIAL INFORMATION that is the property of
+ * create3000.
+ *
+ * No permission is granted to copy, distribute, or create derivative works from
+ * the contents of this software, in whole or in part, without the prior written
+ * permission of create3000.
+ *
+ * NON-MILITARY USE ONLY
+ *
+ * All create3000 software are effectively free software with a non-military use
+ * restriction. It is free. Well commented source is provided. You may reuse the
+ * source in any way you please with the exception anything that uses it must be
+ * marked to indicate is contains 'non-military use only' components.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2011 - 2022, Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * This file is part of the X_ITE Project.
+ *
+ * X_ITE is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License version 3 only, as published by the
+ * Free Software Foundation.
+ *
+ * X_ITE is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License version 3 for more
+ * details (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version 3
+ * along with X_ITE.  If not, see <https://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+export const getUniqueName = function (array, name = "", number = false)
+{
+   name = String (name) .replace (/_\d+$/, "");
+
+   let
+      newName = number ? `${name}_1` : name,
+      lo      = 1,
+      hi      = 1;
+
+   while (array .has (newName) || newName .length === 0)
+   {
+      lo   = hi;
+      hi <<= 1;
+
+      newName = `${name}_${lo}`;
+   }
+
+   lo >>>= 1;
+   hi >>>= 1;
+
+   if (lo && hi)
+   {
+      while (lo < hi)
+      {
+         const m = (lo + hi) >>> 1;
+
+         if (array .has (`${name}_${m}`))
+            lo = m + 1;
+         else
+            hi = m;
+      }
+
+      newName = `${name}_${lo}`;
+   }
+
+   return newName;
+};

package/src/x_ite/Execution/X3DExecutionContext.js

@@ -48,6 +48,7 @@
 import SupportedNodes              from "../Configuration/SupportedNodes.js";
 import Fields                      from "../Fields.js";
 import X3DBaseNode                 from "../Base/X3DBaseNode.js";
+import { getUniqueName }           from "./NamedNodesHandling.js";
 import NamedNodesArray             from "./NamedNodesArray.js";
 import X3DImportedNode             from "./X3DImportedNode.js";
 import ImportedNodesArray          from "./ImportedNodesArray.js";
@@ -60,7 +61,6 @@ import X3DRoute                    from "../Routing/X3DRoute.js";
 import X3DCast                     from "../Base/X3DCast.js";
 import X3DConstants                from "../Base/X3DConstants.js";
 import SFNodeCache                 from "../Fields/SFNodeCache.js";
-import Algorithm                   from "../../standard/Math/Algorithm.js";
 
 SupportedNodes .addAbstractType ("X3DExecutionContext", X3DExecutionContext);
 
@@ -281,9 +281,9 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this [_namedNodes];
    },
-   getUniqueName: function (name = "")
+   getUniqueName: function (name)
    {
-      return getUniqueName .call (this, _namedNodes, name);
+      return getUniqueName (this [_namedNodes], name);
    },
    addImportedNode: function (inlineNode, exportedName, importedName)
    {
@@ -464,9 +464,9 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this [_protos];
    },
-   getUniqueProtoName: function (name = "")
+   getUniqueProtoName: function (name)
    {
-      return getUniqueName .call (this, _protos, name);
+      return getUniqueName (this [_protos], name);
    },
    getExternProtoDeclaration: function (name)
    {
@@ -528,9 +528,9 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    {
       return this [_externprotos];
    },
-   getUniqueExternProtoName: function (name = "")
+   getUniqueExternProtoName: function (name)
    {
-      return getUniqueName .call (this, _externprotos, name);
+      return getUniqueName (this [_externprotos], name);
    },
    addRoute: function (sourceNode, sourceField, destinationNode, destinationField)
    {
@@ -917,36 +917,6 @@ X3DExecutionContext .prototype = Object .assign (Object .create (X3DBaseNode .pr
    },
 });
 
-const getUniqueName = (function ()
-{
-   const _TrailingNumbers = /_\d+$/;
-
-   return function (array, name = "")
-   {
-      name = String (name) .replace (_TrailingNumbers, "");
-
-      let
-         newName = name,
-         i       = 64;
-
-      for (; i;)
-      {
-         if (! (this [array] .has (newName) || newName .length === 0))
-            break;
-
-         const
-            min = i,
-            max = i <<= 1;
-
-         newName  = name;
-         newName += '_';
-         newName += Math .round (Algorithm .random (min, max));
-      }
-
-      return newName;
-   };
-})();
-
 for (const key of Reflect .ownKeys (X3DExecutionContext .prototype))
    Object .defineProperty (X3DExecutionContext .prototype, key, { enumerable: false });
 

package/src/x_ite/Execution/X3DScene.js

@@ -48,6 +48,7 @@
 import SupportedNodes      from "../Configuration/SupportedNodes.js";
 import Fields              from "../Fields.js";
 import X3DExecutionContext from "./X3DExecutionContext.js";
+import { getUniqueName }   from "./NamedNodesHandling.js";
 import ComponentInfoArray  from "../Configuration/ComponentInfoArray.js";
 import UnitInfo            from "../Configuration/UnitInfo.js";
 import UnitInfoArray       from "../Configuration/UnitInfoArray.js";
@@ -357,6 +358,10 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
    {
       return this [_exportedNodes];
    },
+   getUniqueExportName: function (name)
+   {
+      return getUniqueName (this [_exportedNodes], name);
+   },
    addRootNode: function (node)
    {
       node = SFNodeCache .get (X3DCast (X3DConstants .X3DNode, node, false));

package/src/x_ite/InputOutput/FileLoader.js

@@ -132,7 +132,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
          else
             scene .setExecutionContext (this .executionContext);
 
-         scene .setWorldURL (decodeURI (new URL (worldURL, this .getReferer ()) .href));
+         scene .setWorldURL (new URL (worldURL, this .getReferer ()) .href);
 
          if (success)
             success = this .setScene .bind (this, scene, success, error);

package/src/x_ite/InputOutput/Generator.js

@@ -45,7 +45,8 @@
  *
  ******************************************************************************/
 
-import X3DConstants from "../Base/X3DConstants.js";
+import X3DConstants      from "../Base/X3DConstants.js";
+import { getUniqueName } from "../Execution/NamedNodesHandling.js";
 
 function Generator ({ style = "TIDY", precision = 7, doublePrecision = 15 })
 {
@@ -67,12 +68,11 @@ function Generator ({ style = "TIDY", precision = 7, doublePrecision = 15 })
    this .importedNames         = new Map ();
    this .routeNodes            = new Set ();
    this .level                 = 0;
-   this .newName               = 0;
    this .containerFields       = [ ];
    this .units                 = true;
    this .unitCategories        = [ ];
 
-   this .names .set (null, new Map ());
+   this .names .set (null, new Set ());
 }
 
 Generator .prototype =
@@ -212,7 +212,7 @@ Generator .prototype =
       this .executionContextStack .push (executionContext);
 
       if (! this .names .has (executionContext))
-         this .names .set (executionContext, new Map ());
+         this .names .set (executionContext, Object .assign (new Set (), { index: 0 }));
 
       if (! this .importedNodesIndex .has (executionContext))
          this .importedNodesIndex .set (executionContext, new Set ());
@@ -236,9 +236,6 @@ Generator .prototype =
    },
    EnterScope: function ()
    {
-      if (this .level === 0)
-         this .newName = 0;
-
       ++ this .level;
    },
    LeaveScope: function ()
@@ -306,79 +303,47 @@ Generator .prototype =
    {
       return this .nodes .has (baseNode);
    },
-   Name: (function ()
+   Name: function (baseNode)
    {
-      const _TrailingNumbers = /_\d+$/;
+      // Is the node already in index.
 
-      return function (baseNode)
-      {
-         // Is the node already in index
+      const name = this .namesByNode .get (baseNode);
 
-         const name = this .namesByNode .get (baseNode);
+      if (name !== undefined)
+      {
+         return name;
+      }
+      else
+      {
+         const
+            name  = baseNode .getName (),
+            match = name .match (/^(.*?)(_\d+)?$/),
+            names = this .names .get (this .ExecutionContext ());
 
-         if (name !== undefined)
+         if (match [1])
          {
-            return name;
+            // The node has a name.
+
+            var newName = getUniqueName (names, name, !! match [2]);
          }
          else
          {
-            const names = this .names .get (this .ExecutionContext ());
-
-            // The node has no name
-
-            if (baseNode .getName () .length === 0)
-            {
-               if (this .NeedsName (baseNode))
-               {
-                  const name = this .UniqueName ();
-
-                  names .set (name, baseNode);
-                  this .namesByNode .set (baseNode, name);
-
-                  return name;
-               }
-
-               // The node doesn't need a name
-
-               return baseNode .getName ();
-            }
-
-            // The node has a name
-
-            let   name      = baseNode .getName ();
-            const hasNumber = name .match (_TrailingNumbers) !== null;
+            // The node has no name.
 
-            name = name .replace (_TrailingNumbers, "");
+            if (!this .NeedsName (baseNode))
+               return "";
 
-            if (name .length === 0)
-            {
-               if (this .NeedsName (baseNode))
-                  name = this .UniqueName ();
-
-               else
-                  return "";
-            }
-            else
-            {
-               let
-                  i       = 0,
-                  newName = hasNumber ? name + '_' + (++ i) : name;
-
-               while (names .has (newName))
-               {
-                  newName = name + '_' + (++ i);
-               }
+            var newName = `_${++ names .index}`;
+         }
 
-               name = newName;
-            }
+         // Add to indices.
 
-            names .set (name, baseNode);
-            this .namesByNode .set (baseNode, name);
+         names .add (newName);
+         this .namesByNode .set (baseNode, newName);
 
-            return name;
-         }
-      };
-   })(),
+         return newName;
+      }
+   },
    NeedsName: function (baseNode)
    {
       if (baseNode .getCloneCount () > 1)
@@ -409,20 +374,6 @@ Generator .prototype =
          return false;
       }
    },
-   UniqueName: function ()
-   {
-      const names = this .names .get (this .ExecutionContext ());
-
-      for (; ;)
-      {
-         const name = '_' + (++ this .newName);
-
-         if (names .has (name))
-            continue;
-
-         return name;
-      }
-   },
    LocalName: function (baseNode)
    {
       const importedName = this .importedNames .get (baseNode);