x_ite 8.3.3 → 8.4.1

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

@@ -354,7 +354,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             index                  = 0,
             initializableReference = false;
 
-         field .getReferences () .forEach (function (reference)
+         for (const reference of field .getReferences ())
          {
             initializableReference = initializableReference || reference .isInitializable ();
 
@@ -375,7 +375,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
             if (index !== field .getReferences () .size)
                generator .string += generator .Break ();
-         });
+         }
 
          if (field .getAccessType () === X3DConstants .inputOutput && !initializableReference && !field .isDefaultValue ())
          {
@@ -417,7 +417,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             index                  = 0,
             initializableReference = false;
 
-         field .getReferences () .forEach (function (reference)
+         for (const reference of field .getReferences ())
          {
             initializableReference = initializableReference || reference .isInitializable ();
 
@@ -434,7 +434,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
             if (index !== field .getReferences () .size)
                generator .string += generator .Break ();
-         });
+         }
 
          if (field .getAccessType () === X3DConstants .inputOutput && !initializableReference && !this .isDefaultValue (field))
          {
@@ -543,14 +543,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
          {
             if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
             {
-               let initializableReference = false;
-
-               field .getReferences () .forEach (function (fieldReference)
-               {
-                  initializableReference = initializableReference || fieldReference .isInitializable ();
-               });
-
-               if (!initializableReference)
+               if (![... field .getReferences ()] .some (reference => reference .isInitializable ()))
                   mustOutputValue = !this .isDefaultValue (field);
             }
          }
@@ -635,17 +628,13 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
                let mustOutputValue = false;
 
-               if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
+               if (generator .ExecutionContext ())
                {
-                  let initializableReference = false;
-
-                  field .getReferences () .forEach (function (fieldReference)
+                  if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
                   {
-                     initializableReference = initializableReference || fieldReference .isInitializable ();
-                  });
-
-                  if (!initializableReference)
-                     mustOutputValue = true;
+                     if (![... field .getReferences ()] .some (reference => reference .isInitializable ()))
+                        mustOutputValue = !this .isDefaultValue (field);
+                  }
                }
 
                if ((field .getReferences () .size === 0 || !generator .ExecutionContext ()) || sharedNode || mustOutputValue)
@@ -725,7 +714,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
             {
                const protoFields = field .getReferences ();
 
-               protoFields .forEach (function (protoField)
+               for (const protoField of protoFields)
                {
                   generator .string += generator .Indent ();
                   generator .string += "<connect";
@@ -739,7 +728,7 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
                   generator .string += "'";
                   generator .string += "/>";
                   generator .string += generator .TidyBreak ();
-               });
+               }
             }
 
             generator .DecIndent ();
@@ -781,6 +770,480 @@ X3DNode .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
 
       generator .LeaveScope ();
    },
+   toJSONStream: function (generator)
+   {
+      try
+      {
+      const sharedNode = generator .IsSharedNode (this);
+
+      generator .EnterScope ();
+
+      const name = generator .Name (this);
+
+      // USE name
+
+      if (name .length)
+      {
+         if (generator .ExistsNode (this))
+         {
+            generator .string += '{';
+            generator .string += generator .TidySpace ();
+            generator .string += '"';
+            generator .string += this .getTypeName ();
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .IncIndent ();
+            generator .string += generator .Indent ();
+            generator .string += '{';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .IncIndent ();
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@USE";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += generator .JSONEncode (name);
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .DecIndent ();
+            generator .string += generator .Indent ();
+            generator .string += '}';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .DecIndent ();
+            generator .string += generator .Indent ();
+            generator .string += '}';
+
+            generator .LeaveScope ();
+            return;
+         }
+      }
+
+      // Type name
+
+      generator .string += '{';
+      generator .string += generator .TidySpace ();
+      generator .string += '"';
+      generator .string += this .getTypeName ();
+      generator .string += '"';
+      generator .string += ':';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '{';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .IncIndent ();
+
+
+      // DEF name
+
+      if (name .length)
+      {
+         generator .AddNode (this);
+
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "@DEF";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += generator .JSONEncode (name);
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+      }
+
+
+      // Fields
+
+      const
+         fields            = this .getChangedFields (),
+         userDefinedFields = this .getUserDefinedFields ();
+
+      const references = [ ];
+
+      let sourceText = this .getSourceText ();
+
+      // Source text
+
+      if (sourceText)
+      {
+         if (sourceText .length !== 1)
+            sourceText = null;
+
+         if (sourceText && ! sourceText [0] .match (/^\s*(?:ecmascript|javascript|vrmlscript)\:/s))
+            sourceText = null;
+      }
+
+
+      // Predefined fields
+
+      if (fields .length)
+      {
+         const outputFields = [ ];
+
+         for (const field of fields)
+         {
+            // If the field is a inputOutput and we have as reference only inputOnly or outputOnly we must output the value
+            // for this field.
+
+            let mustOutputValue = false;
+
+            if (generator .ExecutionContext ())
+            {
+               if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
+               {
+                  if (![... field .getReferences ()] .some (reference => reference .isInitializable ()))
+                     mustOutputValue = !this .isDefaultValue (field);
+               }
+            }
+
+            // If we have no execution context we are not in a proto and must not generate IS references the same is true
+            // if the node is a shared node as the node does not belong to the execution context.
+
+            if (field .getReferences () .size === 0 || !generator .ExecutionContext () || sharedNode || mustOutputValue)
+            {
+               if (mustOutputValue)
+                  references .push (field);
+
+               if (field !== sourceText)
+                  outputFields .push (field);
+            }
+            else
+            {
+               references .push (field);
+            }
+         }
+
+         for (const field of outputFields)
+         {
+            if (field .isInitializable ())
+            {
+               switch (field .getType ())
+               {
+                  case X3DConstants .SFNode:
+                  case X3DConstants .MFNode:
+                  {
+                     generator .string += generator .Indent ();
+                     generator .string += '"';
+                     generator .string += '-';
+                     generator .string += field .getName ();
+                     generator .string += '"';
+                     generator .string += ':';
+                     generator .string += generator .TidySpace ();
+
+                     field .toJSONStream (generator);
+                     break;
+                  }
+                  default:
+                  {
+                     generator .string += generator .Indent ();
+                     generator .string += '"';
+                     generator .string += '@';
+                     generator .string += field .getName ();
+                     generator .string += '"';
+                     generator .string += ':';
+                     generator .string += generator .TidySpace ();
+
+                     field .toJSONStream (generator);
+                     break;
+                  }
+               }
+
+               generator .string += ',';
+               generator .string += generator .TidyBreak ();
+            }
+         }
+      }
+
+      // User defined fields
+
+      if (! this .canUserDefinedFields () || ! userDefinedFields .length)
+         ;
+      else
+      {
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "field";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += '[';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .IncIndent ();
+
+         for (const field of userDefinedFields)
+         {
+            generator .string += generator .Indent ();
+            generator .string += '{';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .IncIndent ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@accessType";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += '"';
+            generator .string += generator .AccessType (field .getAccessType ());
+            generator .string += '"';
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@type";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += '"';
+            generator .string += field .getTypeName ();
+            generator .string += '"';
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@name";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += generator .JSONEncode (field .getName ());
+
+            // If the field is a inputOutput and we have as reference only inputOnly or outputOnly we must output the value
+            // for this field.
+
+            let mustOutputValue = false;
+
+            if (generator .ExecutionContext ())
+            {
+               if (field .getAccessType () === X3DConstants .inputOutput && field .getReferences () .size !== 0)
+               {
+                  if (![... field .getReferences ()] .some (reference => reference .isInitializable ()))
+                     mustOutputValue = !this .isDefaultValue (field);
+               }
+            }
+
+            if ((field .getReferences () .size === 0 || !generator .ExecutionContext ()) || sharedNode || mustOutputValue)
+            {
+               if (mustOutputValue && generator .ExecutionContext ())
+                  references .push (field);
+
+               if (!field .isInitializable () || field .isDefaultValue ())
+                  ;
+               else
+               {
+                  // Output value
+
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+
+                  switch (field .getType ())
+                  {
+                     case X3DConstants .SFNode:
+                     {
+                        generator .string += generator .Indent ();
+                        generator .string += '"';
+                        generator .string += "-children";
+                        generator .string += '"';
+                        generator .string += ':';
+                        generator .string += generator .TidySpace ();
+                        generator .string += '[';
+                        generator .string += generator .TidyBreak ();
+                        generator .string += generator .IncIndent ();
+                        generator .string += generator .Indent ();
+
+                        field .toJSONStream (generator);
+
+                        generator .string += generator .TidyBreak ();
+                        generator .string += generator .DecIndent ();
+                        generator .string += generator .Indent ();
+                        generator .string += ']';
+                        break;
+                     }
+                     case X3DConstants .MFNode:
+                     {
+                        generator .string += generator .Indent ();
+                        generator .string += '"';
+                        generator .string += "-children";
+                        generator .string += '"';
+                        generator .string += ':';
+                        generator .string += generator .TidySpace ();
+
+                        field .toJSONStream (generator);
+                        break;
+                     }
+                     default:
+                     {
+                        generator .string += generator .Indent ();
+                        generator .string += '"';
+                        generator .string += "@value";
+                        generator .string += '"';
+                        generator .string += ':';
+                        generator .string += generator .TidySpace ();
+
+                        field .toJSONStream (generator);
+                        break;
+                     }
+                  }
+               }
+            }
+            else
+            {
+               if (generator .ExecutionContext ())
+                  references .push (field);
+            }
+
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .DecIndent ();
+            generator .string += generator .Indent ();
+            generator .string += '}';
+
+            if (field !== userDefinedFields .at (-1))
+               generator .string += ',';
+
+            generator .string += generator .TidyBreak ();
+         }
+
+         generator .string += generator .DecIndent ();
+         generator .string += generator .Indent ();
+         generator .string += ']';
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+      }
+
+      // Source text
+
+      if (sourceText)
+      {
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "#sourceText";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += '[';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .IncIndent ();
+
+         const sourceTextLines = sourceText [0] .split ("\n");
+
+         for (let i = 0, length = sourceTextLines .length; i < length; ++ i)
+         {
+            generator .string += generator .ListIndent ();
+            generator .string += generator .JSONEncode (sourceTextLines [i]);
+
+            if (i !== length - 1)
+               generator .string += ',';
+
+            generator .string += generator .TidyBreak ();
+         }
+
+         generator .string += generator .DecIndent ();
+         generator .string += generator .Indent ();
+         generator .string += ']';
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+      }
+
+
+      // IS references
+
+      if (references .length && !sharedNode)
+      {
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "IS";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += '{';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .IncIndent ();
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "connect";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += '[';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .IncIndent ();
+
+         for (const field of references)
+         {
+            const protoFields = [... field .getReferences ()];
+
+            for (const protoField of protoFields)
+            {
+               generator .string += generator .Indent ();
+               generator .string += '{';
+               generator .string += generator .TidyBreak ();
+               generator .string += generator .IncIndent ();
+
+               generator .string += generator .Indent ();
+               generator .string += '"';
+               generator .string += "@nodeField";
+               generator .string += '"';
+               generator .string += ':';
+               generator .string += generator .TidySpace ();
+               generator .string += generator .JSONEncode (field .getName ());
+               generator .string += ',';
+               generator .string += generator .TidyBreak ();
+
+               generator .string += generator .Indent ();
+               generator .string += '"';
+               generator .string += "@protoField";
+               generator .string += '"';
+               generator .string += ':';
+               generator .string += generator .TidySpace ();
+               generator .string += generator .JSONEncode (protoField .getName ());
+               generator .string += generator .TidyBreak ();
+
+               generator .string += generator .DecIndent ();
+               generator .string += generator .Indent ();
+               generator .string += '}';
+
+               if (field === references .at (-1) && protoField === protoFields .at (-1))
+                  ;
+               else
+               {
+                  generator .string += ',';
+               }
+
+               generator .string += generator .TidyBreak ();
+            }
+         }
+
+         generator .string += generator .DecIndent ();
+         generator .string += generator .Indent ();
+         generator .string += ']';
+         generator .string += generator .TidyBreak ();
+         generator .string += generator .DecIndent ();
+         generator .string += generator .Indent ();
+         generator .string += '}';
+         generator .string += generator .TidyBreak ();
+      }
+
+      generator .string = generator .string .replace (/,(\s*)$/s, "$1");
+
+      // End
+
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+      generator .string += generator .TidyBreak ();
+      generator .string += generator .DecIndent ();
+      generator .string += generator .Indent ();
+      generator .string += '}';
+
+      generator .LeaveScope ();
+      }
+      catch (error)
+      {
+         console .log (error)
+      }
+   },
    dispose: function ()
    {
       const executionContext = this .getExecutionContext ();