x_ite 8.3.2 → 8.3.3

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

@@ -48,7 +48,6 @@
 import Fields       from "../../Fields.js";
 import X3DBaseNode  from "../../Base/X3DBaseNode.js";
 import X3DConstants from "../../Base/X3DConstants.js";
-import Generator    from "../../InputOutput/Generator.js";
 
 function X3DNode (executionContext)
 {
@@ -218,14 +217,12 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       return true;
    },
    traverse: function () { },
-   toStream: function (stream)
+   toStream: function (generator)
    {
-      stream .string += this .getTypeName () + " { }";
+      generator .string += this .getTypeName () + " { }";
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       generator .EnterScope ();
 
       const name = generator .Name (this);
@@ -234,9 +231,9 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       {
          if (generator .ExistsNode (this))
          {
-            stream .string += "USE";
-            stream .string += " ";
-            stream .string += name;
+            generator .string += "USE";
+            generator .string += generator .Space ();
+            generator .string += name;
 
             generator .LeaveScope ();
             return;
@@ -247,96 +244,108 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       {
          generator .AddNode (this);
 
-         stream .string += "DEF";
-         stream .string += " ";
-         stream .string += name;
-         stream .string += " ";
+         generator .string += "DEF";
+         generator .string += generator .Space ();
+         generator .string += name;
+         generator .string += generator .Space ();
       }
 
-      stream .string += this .getTypeName ();
-      stream .string += " ";
-      stream .string += "{";
+      generator .string += this .getTypeName ();
+      generator .string += generator .TidySpace ();
+      generator .string += "{";
 
       const
          fields            = this .getChangedFields (),
          userDefinedFields = this .getUserDefinedFields ();
 
-      let
-         fieldTypeLength  = 0,
-         accessTypeLength = 0;
-
       if (this .canUserDefinedFields ())
       {
-         for (const field of userDefinedFields)
-         {
-            fieldTypeLength  = Math .max (fieldTypeLength, field .getTypeName () .length);
-            accessTypeLength = Math .max (accessTypeLength, generator .AccessType (field .getAccessType ()) .length);
-         }
-
          if (userDefinedFields .length)
          {
-            stream .string += "\n";
+            let
+               fieldTypeLength  = 0,
+               accessTypeLength = 0;
+
+            for (const field of userDefinedFields)
+            {
+               fieldTypeLength  = Math .max (fieldTypeLength, field .getTypeName () .length);
+               accessTypeLength = Math .max (accessTypeLength, generator .AccessType (field .getAccessType ()) .length);
+            }
+
+            const last = userDefinedFields .at (-1);
+
+            generator .string += generator .TidyBreak ();
             generator .IncIndent ();
 
             for (const field of userDefinedFields)
             {
-               this .toVRMLStreamUserDefinedField (stream, field, fieldTypeLength, accessTypeLength);
+               this .toVRMLStreamUserDefinedField (generator, field, fieldTypeLength, accessTypeLength);
 
-               stream .string += "\n";
+               if (field === last)
+                  generator .string += generator .TidyBreak ();
+               else
+                  generator .string += generator .Break ();
             }
 
             generator .DecIndent ();
 
             if (fields .length !== 0)
-               stream .string += "\n";
+               generator .string += generator .TidyBreak ();
          }
       }
 
       if (fields .length === 0)
       {
          if (userDefinedFields .length)
-            stream .string += generator .Indent ();
+            generator .string += generator .Indent ();
          else
-            stream .string += " ";
+            generator .string += generator .TidySpace ();
       }
       else
       {
+         const last = fields .at (-1);
+
          if (userDefinedFields .length === 0)
-            stream .string += "\n";
+            generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
-         fields .forEach (function (field)
+         for (const field of fields)
          {
-            this .toVRMLStreamField (stream, field, fieldTypeLength, accessTypeLength);
+            this .toVRMLStreamField (generator, field);
 
-            stream .string += "\n";
-         },
-         this);
+            if (field === last)
+               generator .string += generator .TidyBreak ();
+            else
+               generator .string += generator .Break ();
+         }
 
          generator .DecIndent ();
-         stream .string += generator .Indent ();
+         generator .string += generator .Indent ();
       }
 
-      stream .string += "}";
+      generator .string += "}";
 
       generator .LeaveScope ();
    },
-   toVRMLStreamField: function (stream, field, fieldTypeLength, accessTypeLength)
+   toVRMLStreamUserDefinedField: function (generator, field, fieldTypeLength, accessTypeLength)
    {
-      const
-         generator  = Generator .Get (stream),
-         sharedNode = generator .IsSharedNode (this);
+      const sharedNode = generator .IsSharedNode (this);
 
       if (field .getReferences () .size === 0 || !generator .ExecutionContext () || sharedNode)
       {
+         generator .string += generator .Indent ();
+         generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+         generator .string += generator .Space ();
+         generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+         generator .string += generator .Space ();
+         generator .string += field .getName ();
+
          if (field .isInitializable ())
          {
-            stream .string += generator .Indent ();
-            stream .string += field .getName ();
-            stream .string += " ";
+            generator .string += generator .Space ();
 
-            field .toVRMLStream (stream);
+            field .toVRMLStream (generator);
          }
       }
       else
@@ -349,54 +358,57 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             initializableReference = initializableReference || reference .isInitializable ();
 
-            // Output build in reference field
+            // Output user defined reference field
 
-            stream .string += generator .Indent ();
-            stream .string += field .getName ();
-            stream .string += " ";
-            stream .string += "IS";
-            stream .string += " ";
-            stream .string += reference .getName ();
+            generator .string += generator .Indent ();
+            generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+            generator .string += generator .Space ();
+            generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+            generator .string += generator .Space ();
+            generator .string += field .getName ();
+            generator .string += generator .Space ();
+            generator .string += "IS";
+            generator .string += generator .Space ();
+            generator .string += reference .getName ();
 
             ++ index;
 
             if (index !== field .getReferences () .size)
-               stream .string += "\n";
+               generator .string += generator .Break ();
          });
 
-         if (field .getAccessType () === X3DConstants .inputOutput && !initializableReference && !this .isDefaultValue (field))
+         if (field .getAccessType () === X3DConstants .inputOutput && !initializableReference && !field .isDefaultValue ())
          {
-            // Output build in field
+            generator .string += generator .Break ();
+            generator .string += generator .Indent ();
+            generator .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
+            generator .string += generator .Space ();
+            generator .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
+            generator .string += generator .Space ();
+            generator .string += field .getName ();
 
-            stream .string += "\n";
-            stream .string += generator .Indent ();
-            stream .string += field .getName ();
-            stream .string += " ";
+            if (field .isInitializable ())
+            {
+               generator .string += generator .Space ();
 
-            field .toVRMLStream (stream);
+               field .toVRMLStream (generator);
+            }
          }
       }
    },
-   toVRMLStreamUserDefinedField: function (stream, field, fieldTypeLength, accessTypeLength)
+   toVRMLStreamField: function (generator, field)
    {
-      const
-         generator  = Generator .Get (stream),
-         sharedNode = generator .IsSharedNode (this);
+      const sharedNode = generator .IsSharedNode (this);
 
       if (field .getReferences () .size === 0 || !generator .ExecutionContext () || sharedNode)
       {
-         stream .string += generator .Indent ();
-         stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
-         stream .string += " ";
-         stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
-         stream .string += " ";
-         stream .string += field .getName ();
-
          if (field .isInitializable ())
          {
-            stream .string += " ";
+            generator .string += generator .Indent ();
+            generator .string += field .getName ();
+            generator .string += generator .Space ();
 
-            field .toVRMLStream (stream);
+            field .toVRMLStream (generator);
          }
       }
       else
@@ -409,49 +421,37 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             initializableReference = initializableReference || reference .isInitializable ();
 
-            // Output user defined reference field
+            // Output build in reference field
 
-            stream .string += generator .Indent ();
-            stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
-            stream .string += " ";
-            stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
-            stream .string += " ";
-            stream .string += field .getName ();
-            stream .string += " ";
-            stream .string += "IS";
-            stream .string += " ";
-            stream .string += reference .getName ();
+            generator .string += generator .Indent ();
+            generator .string += field .getName ();
+            generator .string += generator .Space ();
+            generator .string += "IS";
+            generator .string += generator .Space ();
+            generator .string += reference .getName ();
 
             ++ index;
 
             if (index !== field .getReferences () .size)
-               stream .string += "\n";
+               generator .string += generator .Break ();
          });
 
-         if (field .getAccessType () === X3DConstants .inputOutput && !initializableReference && !field .isDefaultValue ())
+         if (field .getAccessType () === X3DConstants .inputOutput && !initializableReference && !this .isDefaultValue (field))
          {
-            stream .string += "\n";
-            stream .string += generator .Indent ();
-            stream .string += generator .PadRight (generator .AccessType (field .getAccessType ()), accessTypeLength);
-            stream .string += " ";
-            stream .string += generator .PadRight (field .getTypeName (), fieldTypeLength);
-            stream .string += " ";
-            stream .string += field .getName ();
+            // Output build in field
 
-            if (field .isInitializable ())
-            {
-               stream .string += " ";
+            generator .string += generator .Break ();
+            generator .string += generator .Indent ();
+            generator .string += field .getName ();
+            generator .string += generator .Space ();
 
-               field .toVRMLStream (stream);
-            }
+            field .toVRMLStream (generator);
          }
       }
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const
-         generator  = Generator .Get (stream),
-         sharedNode = generator .IsSharedNode (this);
+      const sharedNode = generator .IsSharedNode (this);
 
       generator .EnterScope ();
 
@@ -461,13 +461,13 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       {
          if (generator .ExistsNode (this))
          {
-            stream .string += generator .Indent ();
-            stream .string += "<";
-            stream .string += this .getTypeName ();
-            stream .string += " ";
-            stream .string += "USE='";
-            stream .string += generator .XMLEncode (name);
-            stream .string += "'";
+            generator .string += generator .Indent ();
+            generator .string += "<";
+            generator .string += this .getTypeName ();
+            generator .string += generator .Space ();
+            generator .string += "USE='";
+            generator .string += generator .XMLEncode (name);
+            generator .string += "'";
 
             const containerField = generator .ContainerField ();
 
@@ -475,32 +475,32 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             {
                if (containerField .getName () !== this .getContainerField ())
                {
-                  stream .string += " ";
-                  stream .string += "containerField='";
-                  stream .string += generator .XMLEncode (containerField .getName ());
-                  stream .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "containerField='";
+                  generator .string += generator .XMLEncode (containerField .getName ());
+                  generator .string += "'";
                }
             }
 
-            stream .string += "/>";
+            generator .string += "/>";
 
             generator .LeaveScope ();
             return;
          }
       }
 
-      stream .string += generator .Indent ();
-      stream .string += "<";
-      stream .string += this .getTypeName ();
+      generator .string += generator .Indent ();
+      generator .string += "<";
+      generator .string += this .getTypeName ();
 
       if (name .length)
       {
          generator .AddNode (this);
 
-         stream .string += " ";
-         stream .string += "DEF='";
-         stream .string += generator .XMLEncode (name);
-         stream .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "DEF='";
+         generator .string += generator .XMLEncode (name);
+         generator .string += "'";
       }
 
       const containerField = generator .ContainerField ();
@@ -509,10 +509,10 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
       {
          if (containerField .getName () !== this .getContainerField ())
          {
-            stream .string += " ";
-            stream .string += "containerField='";
-            stream .string += generator .XMLEncode (containerField .getName ());
-            stream .string += "'";
+            generator .string += generator .Space ();
+            generator .string += "containerField='";
+            generator .string += generator .XMLEncode (containerField .getName ());
+            generator .string += "'";
          }
       }
 
@@ -578,14 +578,14 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                      if (field === cdata)
                         break;
 
-                     stream .string += "\n";
-                     stream .string += generator .Indent ();
-                     stream .string += field .getName ();
-                     stream .string += "='";
+                     generator .string += generator .AttribBreak ();
+                     generator .string += generator .ListIndent ();
+                     generator .string += field .getName ();
+                     generator .string += "='";
 
-                     field .toXMLStream (stream);
+                     field .toXMLStream (generator);
 
-                     stream .string += "'";
+                     generator .string += "'";
                      break;
                   }
                }
@@ -602,11 +602,12 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       if ((!this .canUserDefinedFields () || !userDefinedFields .length) && (!references .length || sharedNode) && !childNodes .length && !cdata)
       {
-         stream .string += "/>";
+         generator .string += "/>";
       }
       else
       {
-         stream .string += ">\n";
+         generator .string += ">";
+         generator .string += generator .TidyBreak ();
 
          generator .IncIndent ();
 
@@ -614,20 +615,20 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             for (const field of userDefinedFields)
             {
-               stream .string += generator .Indent ();
-               stream .string += "<field";
-               stream .string += " ";
-               stream .string += "accessType='";
-               stream .string += generator .AccessType (field .getAccessType ());
-               stream .string += "'";
-               stream .string += " ";
-               stream .string += "type='";
-               stream .string += field .getTypeName ();
-               stream .string += "'";
-               stream .string += " ";
-               stream .string += "name='";
-               stream .string += generator .XMLEncode (field .getName ());
-               stream .string += "'";
+               generator .string += generator .Indent ();
+               generator .string += "<field";
+               generator .string += generator .Space ();
+               generator .string += "accessType='";
+               generator .string += generator .AccessType (field .getAccessType ());
+               generator .string += "'";
+               generator .string += generator .Space ();
+               generator .string += "type='";
+               generator .string += field .getTypeName ();
+               generator .string += "'";
+               generator .string += generator .Space ();
+               generator .string += "name='";
+               generator .string += generator .XMLEncode (field .getName ());
+               generator .string += "'";
 
                // If the field is a inputOutput and we have as reference only inputOnly or outputOnly we must output the value
                // for this field.
@@ -654,7 +655,8 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
                   if (!field .isInitializable () || field .isDefaultValue ())
                   {
-                     stream .string += "/>\n";
+                     generator .string += "/>";
+                     generator .string += generator .TidyBreak ();
                   }
                   else
                   {
@@ -667,31 +669,34 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                         {
                            generator .PushContainerField (field);
 
-                           stream .string += ">\n";
+                           generator .string += ">";
+                           generator .string += generator .TidyBreak ();
 
                            generator .IncIndent ();
 
-                           field .toXMLStream (stream);
+                           field .toXMLStream (generator);
 
-                           stream .string += "\n";
+                           generator .string += generator .TidyBreak ();
 
                            generator .DecIndent ();
 
-                           stream .string += generator .Indent ();
-                           stream .string += "</field>\n";
+                           generator .string += generator .Indent ();
+                           generator .string += "</field>";
+                           generator .string += generator .TidyBreak ();
 
                            generator .PopContainerField ();
                            break;
                         }
                         default:
                         {
-                           stream .string += " ";
-                           stream .string += "value='";
+                           generator .string += generator .Space ();
+                           generator .string += "value='";
 
-                           field .toXMLStream (stream);
+                           field .toXMLStream (generator);
 
-                           stream .string += "'";
-                           stream .string += "/>\n";
+                           generator .string += "'";
+                           generator .string += "/>";
+                           generator .string += generator .TidyBreak ();
                            break;
                         }
                      }
@@ -702,16 +707,17 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                   if (generator .ExecutionContext ())
                      references .push (field);
 
-                  stream .string += "/>\n";
+                  generator .string += "/>";
+                  generator .string += generator .TidyBreak ();
                }
             }
          }
 
          if (references .length && !sharedNode)
          {
-            stream .string += generator .Indent ();
-            stream .string += "<IS>";
-            stream .string += "\n";
+            generator .string += generator .Indent ();
+            generator .string += "<IS>";
+            generator .string += generator .TidyBreak ();
 
             generator .IncIndent ();
 
@@ -721,33 +727,35 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
                protoFields .forEach (function (protoField)
                {
-                  stream .string += generator .Indent ();
-                  stream .string += "<connect";
-                  stream .string += " ";
-                  stream .string += "nodeField='";
-                  stream .string += generator .XMLEncode (field .getName ());
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "protoField='";
-                  stream .string += generator .XMLEncode (protoField .getName ());
-                  stream .string += "'";
-                  stream .string += "/>\n";
+                  generator .string += generator .Indent ();
+                  generator .string += "<connect";
+                  generator .string += generator .Space ();
+                  generator .string += "nodeField='";
+                  generator .string += generator .XMLEncode (field .getName ());
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "protoField='";
+                  generator .string += generator .XMLEncode (protoField .getName ());
+                  generator .string += "'";
+                  generator .string += "/>";
+                  generator .string += generator .TidyBreak ();
                });
             }
 
             generator .DecIndent ();
 
-            stream .string += generator .Indent ();
-            stream .string += "</IS>\n";
+            generator .string += generator .Indent ();
+            generator .string += "</IS>";
+            generator .string += generator .TidyBreak ();
          }
 
          for (const field of childNodes)
          {
             generator .PushContainerField (field);
 
-            field .toXMLStream (stream);
+            field .toXMLStream (generator);
 
-            stream .string += "\n";
+            generator .string += generator .TidyBreak ();
 
             generator .PopContainerField ();
          }
@@ -756,18 +764,19 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             for (const value of cdata)
             {
-               stream .string += "<![CDATA[";
-               stream .string += generator .escapeCDATA (value);
-               stream .string += "]]>\n";
+               generator .string += "<![CDATA[";
+               generator .string += generator .escapeCDATA (value);
+               generator .string += "]]>";
+               generator .string += generator .TidyBreak ();
             }
          }
 
          generator .DecIndent ();
 
-         stream .string += generator .Indent ();
-         stream .string += "</";
-         stream .string += this .getTypeName ();
-         stream .string += ">";
+         generator .string += generator .Indent ();
+         generator .string += "</";
+         generator .string += this .getTypeName ();
+         generator .string += ">";
       }
 
       generator .LeaveScope ();