x_ite 8.7.2 → 8.7.4

package/src/x_ite/Components/Core/X3DNode.js

@@ -799,8 +799,6 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
    },
    toJSONStream: function (generator)
    {
-      try
-      {
       const sharedNode = generator .IsSharedNode (this);
 
       generator .EnterScope ();
@@ -900,9 +898,6 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       {
          if (sourceText .length !== 1)
             sourceText = null;
-
-         if (sourceText && ! sourceText [0] .match (/^\s*(?:ecmascript|javascript|vrmlscript)\:/s))
-            sourceText = null;
       }
 
 
@@ -1277,11 +1272,6 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       generator .string += '}';
 
       generator .LeaveScope ();
-      }
-      catch (error)
-      {
-         console .log (error)
-      }
    },
    dispose: function ()
    {

package/src/x_ite/Components/Core/X3DPrototypeInstance.js

@@ -59,7 +59,7 @@ const
 function X3DPrototypeInstance (executionContext, protoNode)
 {
    this [_protoNode]        = protoNode;
-   this [_protoFields]      = new Map (protoNode .getFields () .map (f => [f, f .getName ()]));
+   this [_protoFields]      = new Map ([... protoNode .getFields ()] .map (f => [f, f .getName ()]));
    this [_fieldDefinitions] = protoNode .getFieldDefinitions ();
    this [_body]             = null;
 
@@ -197,14 +197,14 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
       const
          oldProtoFields = this [_protoFields],
-         oldFields      = new Map (this .getFields () .map (f => [f .getName (), f]));
+         oldFields      = new Map ([... this .getFields ()] .map (f => [f .getName (), f]));
 
       for (const field of oldFields .values ())
          this .removeField (field .getName ());
 
       // Add new fields.
 
-      this [_protoFields] = new Map (this [_protoNode] .getFields () .map (f => [f, f .getName ()]));
+      this [_protoFields] = new Map ([... this [_protoNode] .getFields ()] .map (f => [f, f .getName ()]));
 
       for (const fieldDefinition of this .getFieldDefinitions ())
          this .addField (fieldDefinition);
@@ -268,7 +268,7 @@ X3DPrototypeInstance .prototype = Object .assign (Object .create (X3DNode .proto
 
          // Get field from new proto node.
 
-         this [_protoFields]      = new Map (protoNode .getFields () .map (f => [f, f .getName ()]));
+         this [_protoFields]      = new Map ([... protoNode .getFields ()] .map (f => [f, f .getName ()]));
          this [_fieldDefinitions] = protoNode .getFieldDefinitions ();
       }
 

package/src/x_ite/Components/Picking/X3DPickSensorNode.js

@@ -238,7 +238,7 @@ X3DPickSensorNode .prototype = Object .assign (Object .create (X3DSensorNode .pr
 
       var instance = geometryNode .getExecutionContext ();
 
-      if (instance .getType () .indexOf (X3DConstants .X3DPrototypeInstance) !== -1 && instance .getExecutionContext () === executionContext)
+      if (instance .getType () .includes (X3DConstants .X3DPrototypeInstance) && instance .getExecutionContext () === executionContext)
          return instance;
 
       var pickingHierarchy = target .pickingHierarchy;
@@ -252,7 +252,7 @@ X3DPickSensorNode .prototype = Object .assign (Object .create (X3DSensorNode .pr
 
          var instance = node .getExecutionContext ();
 
-         if (instance .getType () .indexOf (X3DConstants .X3DPrototypeInstance) !== -1 && instance .getExecutionContext () === executionContext)
+         if (instance .getType () .includes (X3DConstants .X3DPrototypeInstance) && instance .getExecutionContext () === executionContext)
             return instance;
       }
 

package/src/x_ite/Configuration/ComponentInfo.js

@@ -56,10 +56,9 @@ function ComponentInfo ({ name, level, title, providerUrl, external = false, dep
       level: { value: level, enumerable: true },
       title: { value: title, enumerable: true },
       providerUrl: { value: providerUrl || URLs .getProviderUrl (external && name), enumerable: true },
+      external: { value: external },
+      dependencies: { value: dependencies },
    });
-
-   $.data (this, "external",     external)
-   $.data (this, "dependencies", dependencies)
 }
 
 ComponentInfo .prototype = Object .assign (Object .create (X3DObject .prototype),

package/src/x_ite/Configuration/ComponentInfoArray.js

@@ -45,12 +45,12 @@
  *
  ******************************************************************************/
 
-import ComponentInfo from "./ComponentInfo.js";
 import X3DInfoArray  from "../Base/X3DInfoArray.js";
+import ComponentInfo from "./ComponentInfo.js";
 
 function ComponentInfoArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   return X3DInfoArray .call (this, values, ComponentInfo);
 }
 
 ComponentInfoArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Configuration/ProfileInfoArray.js

@@ -45,13 +45,13 @@
  *
  ******************************************************************************/
 
+import X3DInfoArray       from "../Base/X3DInfoArray.js";
 import ComponentInfoArray from "./ComponentInfoArray.js";
 import ProfileInfo        from "./ProfileInfo.js";
-import X3DInfoArray       from "../Base/X3DInfoArray.js";
 
 function ProfileInfoArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   return X3DInfoArray .call (this, values, X3DInfoArray);
 }
 
 ProfileInfoArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Configuration/UnitInfoArray.js

@@ -46,10 +46,24 @@
  ******************************************************************************/
 
 import X3DInfoArray from "../Base/X3DInfoArray.js";
+import UnitInfo     from "./UnitInfo.js"
 
 function UnitInfoArray (values)
 {
-   return X3DInfoArray .call (this, values);
+   const proxy = X3DInfoArray .call (this);
+
+   if (values)
+   {
+      for (const value of values)
+      {
+         if (!(value instanceof UnitInfo))
+            throw new TypeError (`Wrong type in construction of ${this .getTypeName ()}.`);
+
+         this .add (value .category, value);
+      }
+   }
+
+   return proxy;
 }
 
 UnitInfoArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/BindableList.js

@@ -151,7 +151,7 @@ BindableList .prototype = Object .assign (Object .create (X3DBaseNode .prototype
 
          for (const node of this .nodes)
          {
-            if (collectedNodes .indexOf (node) === -1)
+            if (!collectedNodes .includes (node))
                removedNodes .push (node);
          }
 

package/src/x_ite/Execution/ExportedNodesArray.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DInfoArray    from "../Base/X3DInfoArray.js";
+import X3DExportedNode from "./X3DExportedNode.js"
 
-function ExportedNodesArray (array)
+function ExportedNodesArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   return X3DInfoArray .call (this, values, X3DExportedNode);
 }
 
 ExportedNodesArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/ImportedNodesArray.js

@@ -45,11 +45,12 @@
  *
  ******************************************************************************/
 
-import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DInfoArray    from "../Base/X3DInfoArray.js";
+import X3DImportedNode from "./X3DImportedNode.js"
 
-function ImportedNodesArray (array)
+function ImportedNodesArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   return X3DInfoArray .call (this, values, X3DImportedNode);
 }
 
 ImportedNodesArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/NamedNodesArray.js

@@ -46,10 +46,24 @@
  ******************************************************************************/
 
 import X3DInfoArray from "../Base/X3DInfoArray.js";
+import X3DBaseNode  from "../Base/X3DBaseNode.js"
 
-function NamedNodesArray (array)
+function NamedNodesArray (values)
 {
-   return X3DInfoArray .call (this, array);
+   const proxy = X3DInfoArray .call (this);
+
+   if (values)
+   {
+      for (const value of values)
+      {
+         if (!(value instanceof X3DBaseNode))
+            throw new TypeError (`Wrong type in construction of ${this .getTypeName ()}.`);
+
+         this .add (value .getName (), value);
+      }
+   }
+
+   return proxy;
 }
 
 NamedNodesArray .prototype = Object .assign (Object .create (X3DInfoArray .prototype),

package/src/x_ite/Execution/X3DScene.js

@@ -295,7 +295,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       const values = this [_metadata] .get (name);
 
       if (values)
-         return values .slice ();
+         return Array .from (values);
 
       return undefined;
    },
@@ -671,7 +671,7 @@ X3DScene .prototype = Object .assign (Object .create (X3DExecutionContext .proto
       generator .string += ':';
       generator .string += generator .TidySpace ();
       generator .string += '"';
-      generator .string += this .getSpecificationVersion ();
+      generator .string += LATEST_VERSION;
       generator .string += '"';
       generator .string += ',';
       generator .string += generator .TidyBreak ();

package/src/x_ite/Fields/ArrayFields.js

@@ -83,9 +83,9 @@ const
 
 const _cloneCount = Symbol ();
 
-function MFNode (value)
+function MFNode (... args)
 {
-   return X3DObjectArrayField .call (this, arguments);
+   return X3DObjectArrayField .call (this, args);
 }
 
 MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -419,9 +419,9 @@ MFNode .prototype = Object .assign (Object .create (X3DObjectArrayField .prototy
 for (const key of Reflect .ownKeys (MFNode .prototype))
    Object .defineProperty (MFNode .prototype, key, { enumerable: false });
 
-function MFString (value)
+function MFString (... args)
 {
-   return X3DObjectArrayField .call (this, arguments);
+   return X3DObjectArrayField .call (this, args);
 }
 
 MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -480,11 +480,15 @@ MFString .prototype = Object .assign (Object .create (X3DObjectArrayField .proto
 for (const key of Reflect .ownKeys (MFString .prototype))
    Object .defineProperty (MFString .prototype, key, { enumerable: false });
 
+/**
+ * MFImage
+ */
+
 function MFImageTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
 {
-   function ArrayField (value)
+   function ArrayField (... args)
    {
-      return X3DObjectArrayField .call (this, arguments);
+      return X3DObjectArrayField .call (this, args);
    }
 
    ArrayField .prototype = Object .assign (Object .create (X3DObjectArrayField .prototype),
@@ -524,9 +528,9 @@ function MFImageTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Comp
 
 function TypedArrayTemplate (TypeName, Type, SingleType, ValueType, ArrayType, Components)
 {
-   function ArrayField (value)
+   function ArrayField (... args)
    {
-      return X3DTypedArrayField .call (this, arguments);
+      return X3DTypedArrayField .call (this, args);
    }
 
    ArrayField .prototype = Object .assign (Object .create (X3DTypedArrayField .prototype),
@@ -564,7 +568,7 @@ function TypedArrayTemplate (TypeName, Type, SingleType, ValueType, ArrayType, C
    return ArrayField;
 }
 
-function Value (value) { return value; }
+const Value = (value) => value;
 
 const ArrayFields =
 {

package/src/x_ite/Fields/SFColor.js

@@ -134,11 +134,11 @@ SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
 
       for (let i = 0; i < last; ++ i)
       {
-         generator .string += generator .Precision (value [i]);
+         generator .string += generator .FloatFormat (value [i]);
          generator .string += generator .TidySpace ();
       }
 
-      generator .string += generator .Precision (value [last]);
+      generator .string += generator .FloatFormat (value [last]);
    },
    toVRMLStream: function (generator)
    {
@@ -166,12 +166,12 @@ SFColor .prototype = Object .assign (Object .create (X3DField .prototype),
 
       for (let i = 0; i < last; ++ i)
       {
-         generator .string += generator .JSONNumber (generator .Precision (value [i]));
+         generator .string += generator .JSONNumber (generator .FloatFormat (value [i]));
          generator .string += ',';
          generator .string += generator .TidySpace ();
       }
 
-      generator .string += generator .JSONNumber (generator .Precision (value [last]));
+      generator .string += generator .JSONNumber (generator .FloatFormat (value [last]));
    },
 });
 

package/src/x_ite/Fields/SFDouble.js

@@ -81,7 +81,7 @@ SFDouble .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .DoublePrecision (generator .ToUnit (category, this .getValue ()));
+      generator .string += generator .DoubleFormat (generator .ToUnit (category, this .getValue ()));
    },
    toVRMLStream: function (generator)
    {
@@ -99,7 +99,7 @@ SFDouble .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .JSONNumber (generator .DoublePrecision (generator .ToUnit (category, this .getValue ())));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (generator .ToUnit (category, this .getValue ())));
    },
 });
 

package/src/x_ite/Fields/SFFloat.js

@@ -81,7 +81,7 @@ SFFloat .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .Precision (generator .ToUnit (category, this .getValue ()));
+      generator .string += generator .FloatFormat (generator .ToUnit (category, this .getValue ()));
    },
    toVRMLStream: function (generator)
    {
@@ -99,7 +99,7 @@ SFFloat .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const category = generator .Unit (this .getUnit ());
 
-      generator .string += generator .JSONNumber (generator .Precision (generator .ToUnit (category, this .getValue ())));
+      generator .string += generator .JSONNumber (generator .FloatFormat (generator .ToUnit (category, this .getValue ())));
    },
 });
 

package/src/x_ite/Fields/SFImage.js

@@ -134,6 +134,8 @@ Image .prototype =
  *  SFImage
  */
 
+const _set_size = Symbol ();
+
 function SFImage (width, height, comp, array)
 {
    const MFInt32 = ArrayFields .MFInt32;
@@ -146,16 +148,23 @@ function SFImage (width, height, comp, array)
       X3DField .call (this, new Image (0, 0, 0, new MFInt32 ()));
 
    this .getValue () .getArray () .addParent (this);
-   this .addInterest ("set_size__", this);
+   this .addInterest (_set_size, this);
 }
 
 SFImage .prototype = Object .assign (Object .create (X3DField .prototype),
 {
    constructor: SFImage,
-   set_size__: function ()
+   [_set_size]: function ()
    {
       this .getValue () .getArray () .length = this .width * this .height;
    },
+   [Symbol .iterator]: function* ()
+   {
+      yield this .width;
+      yield this .height;
+      yield this .comp;
+      yield this .array;
+   },
    copy: function ()
    {
       return new SFImage (this .getValue () .copy ());

package/src/x_ite/Fields/SFMatrixPrototypeTemplate.js

@@ -49,7 +49,7 @@ import X3DField from "../Base/X3DField.js";
 
 function SFMatrixPrototypeTemplate (TypeName, Type, Matrix, SFVec, double)
 {
-   const _formatter = double ? "DoublePrecision" : "Precision";
+   const _formatter = double ? "DoubleFormat" : "FloatFormat";
 
    return Object .assign (Object .create (X3DField .prototype),
    {

package/src/x_ite/Fields/SFNode.js

@@ -284,7 +284,7 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
          value  = target .getValue ();
 
       if (value)
-         return value .getType () .slice ();
+         return Array .from (value .getType ());
 
       throw new Error ("SFNode.getNodeType: node is null.");
    },
@@ -369,6 +369,10 @@ SFNode .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       this [_target] .getValue () .setUserData (key, value);
    },
+   removeNodeUserData: function (key)
+   {
+      this [_target] .getValue () .removeUserData (key);
+   },
    valueOf: function ()
    {
       const

package/src/x_ite/Fields/SFRotation.js

@@ -155,13 +155,13 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const rotation = this .getValue ();
 
-      generator .string += generator .DoublePrecision (rotation .x);
+      generator .string += generator .DoubleFormat (rotation .x);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (rotation .y);
+      generator .string += generator .DoubleFormat (rotation .y);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (rotation .z);
+      generator .string += generator .DoubleFormat (rotation .z);
       generator .string += generator .TidySpace ();
-      generator .string += generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle));
+      generator .string += generator .DoubleFormat (generator .ToUnit ("angle", rotation .angle));
    },
    toVRMLStream: function (generator)
    {
@@ -185,16 +185,16 @@ SFRotation .prototype = Object .assign (Object .create (X3DField .prototype),
    {
       const rotation = this .getValue ();
 
-      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .x));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .x));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .y));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .y));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoublePrecision (rotation .z));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (rotation .z));
       generator .string += ',';
       generator .string += generator .TidySpace ();
-      generator .string += generator .JSONNumber (generator .DoublePrecision (generator .ToUnit ("angle", rotation .angle)));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (generator .ToUnit ("angle", rotation .angle)));
    },
 });
 

package/src/x_ite/Fields/SFTime.js

@@ -95,7 +95,7 @@ SFTime .prototype = Object .assign (Object .create (X3DField .prototype),
    },
    toJSONStreamValue: function (generator)
    {
-      generator .string += generator .JSONNumber (generator .DoublePrecision (this .getValue ()));
+      generator .string += generator .JSONNumber (generator .DoubleFormat (this .getValue ()));
    },
 });
 

package/src/x_ite/Fields/SFVecPrototypeTemplate.js

@@ -49,7 +49,7 @@ import X3DField  from "../Base/X3DField.js";
 
 function SFVecPrototypeTemplate (TypeName, Type, ValueType, double)
 {
-   const _formatter = double ? "DoublePrecision" : "Precision";
+   const _formatter = double ? "DoubleFormat" : "FloatFormat";
 
    return Object .assign (Object .create (X3DField .prototype),
    {

package/src/x_ite/InputOutput/FileLoader.js

@@ -64,13 +64,13 @@ const foreign = {
 
 const defaultParameter = new Fields .MFString ();
 
-function FileLoader (node, external)
+function FileLoader (node)
 {
    X3DObject .call (this);
 
    this .node             = node;
    this .browser          = node .getBrowser ();
-   this .external         = external === undefined ? this .browser .isExternal () : external;
+   this .external         = this .browser .isExternal ();
    this .executionContext = this .external ? node .getExecutionContext () : this .browser .currentScene;
    this .target           = "";
    this .url              = [ ];
@@ -243,7 +243,7 @@ FileLoader .prototype = Object .assign (Object .create (X3DObject .prototype),
             if (result [3] === "base64")
                data = atob (data);
             else
-               data = decodeURIComponent (data);
+               data = unescape (data); // Don't use decodeURIComponent!
 
             this .callback (data);
             return;

package/src/x_ite/InputOutput/Generator.js

@@ -231,23 +231,23 @@ Generator .prototype =
 
       return "";
    },
-   Precision: function  (value)
+   FloatFormat: function  (value)
    {
       if (Number .isFinite (value))
       {
          const exponent = Math .log10 (Math .abs (value));
 
          if ((this .precision > exponent && exponent >= -4) || value === 0)
-            return this .floatFormat (Math .fround (value));
+            return this .floatFormat (value);
 
-         return this .floatExponentialFormat (Math .fround (value)) .toLowerCase ();
+         return this .floatExponentialFormat (value) .toLowerCase ();
       }
       else
       {
          return String (value);
       }
    },
-   DoublePrecision: function  (value)
+   DoubleFormat: function  (value)
    {
       if (Number .isFinite (value))
       {
@@ -267,13 +267,13 @@ Generator .prototype =
    {
       this .executionContextStack .push (executionContext);
 
-      if (! this .names .has (executionContext))
+      if (!this .names .has (executionContext))
          this .names .set (executionContext, Object .assign (new Set (), { index: 0 }));
 
-      if (! this .importedNodesIndex .has (executionContext))
+      if (!this .importedNodesIndex .has (executionContext))
          this .importedNodesIndex .set (executionContext, new Set ());
 
-      if (! this .exportedNodesIndex .has (executionContext))
+      if (!this .exportedNodesIndex .has (executionContext))
          this .exportedNodesIndex .set (executionContext, new Set ());
    },
    PopExecutionContext: function ()

package/src/x_ite/Parser/JSONParser.js

@@ -167,7 +167,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          {
             console .error ("Trouble creating element for", key);
 
-            child = document .createElement(key);
+            child = document .createElement (key);
          }
       }
 
@@ -178,28 +178,9 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
    },
    createCDATA: function (document, element, str)
    {
-      /**
-       * a way to create a CDATA function or script in HTML, by using a DOM parser.
-       */
-
-      let y = str .trim ()
-         .replace (/\\"/g, "\\\"")
-         .replace (/&lt;/g, "<")
-         .replace (/&gt;/g, ">")
-         .replace (/&amp;/g, "&");
-
-      do
-      {
-         str = y;
-         y   = str .replace (/'([^'\r\n]*)\n([^']*)'/g, "'$1\\n$2'");
-      }
-      while (y !== str);
-
       const
-         domParser = new DOMParser(),
-         cdataStr  = "<script> <![CDATA[ " + y + " ]]> </script>", // has to be wrapped into an element
-         scriptDoc = domParser .parseFromString (cdataStr, "application/xml"),
-         cdata     = scriptDoc .children [0] .childNodes [1]; // space after script is childNode[0]
+         docu  = new DOMParser () .parseFromString ("<xml></xml>", "application/xml"),
+         cdata = docu .createCDATASection (str);
 
       element .appendChild (cdata);
    },
@@ -230,7 +211,7 @@ JSONParser .prototype = Object .assign (Object .create (X3DParser .prototype),
          }
          else if (key === "#sourceCode" || key === "@sourceCode" || key === "#sourceText")
          {
-            this .createCDATA (document, element, object [key] .join ("\r\n") + "\r\n");
+            this .createCDATA (document, element, object [key] .join ("\n"));
          }
          else
          {