x_ite 8.3.2 → 8.4.0

package/src/x_ite/Execution/X3DImportedNode.js

@@ -48,7 +48,6 @@
 import X3DNode      from "../Components/Core/X3DNode.js";
 import X3DConstants from "../Base/X3DConstants.js";
 import SFNodeCache  from "../Fields/SFNodeCache.js";
-import Generator    from "../InputOutput/Generator.js";
 
 const
    _inlineNode   = Symbol (),
@@ -68,6 +67,7 @@ function X3DImportedNode (executionContext, inlineNode, exportedName, importedNa
    this [_inlineNode] ._loadState .addInterest ("set_loadState__", this);
 }
 
+// Must be of type X3DNode, to get routes work.
 X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype),
 {
    constructor: X3DImportedNode,
@@ -175,25 +175,23 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
          }
       }
    },
-   toVRMLStream: function (stream)
+   toVRMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       if (generator .ExistsNode (this .getInlineNode ()))
       {
-         stream .string += generator .Indent ();
-         stream .string += "IMPORT";
-         stream .string += " ";
-         stream .string += generator .Name (this .getInlineNode ());
-         stream .string += ".";
-         stream .string += this .getExportedName ();
+         generator .string += generator .Indent ();
+         generator .string += "IMPORT";
+         generator .string += generator .Space ();
+         generator .string += generator .Name (this .getInlineNode ());
+         generator .string += ".";
+         generator .string += this .getExportedName ();
 
          if (this .getImportedName () !== this .getExportedName ())
          {
-            stream .string += " ";
-            stream .string += "AS";
-            stream .string += " ";
-            stream .string += this .getImportedName ();
+            generator .string += generator .Space ();
+            generator .string += "AS";
+            generator .string += generator .Space ();
+            generator .string += this .getImportedName ();
          }
 
          try
@@ -223,53 +221,53 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                      ? destinationNode .getImportedName ()
                      : generator .Name (destinationNode);
 
-                  stream .string += "\n";
-                  stream .string += "\n";
-                  stream .string += generator .Indent ();
-                  stream .string += "ROUTE";
-                  stream .string += " ";
-                  stream .string += sourceNodeName;
-                  stream .string += ".";
-                  stream .string += sourceField;
-                  stream .string += " ";
-                  stream .string += "TO";
-                  stream .string += " ";
-                  stream .string += destinationNodeName;
-                  stream .string += ".";
-                  stream .string += destinationField;
+                  generator .string += generator .Break ();
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += "ROUTE";
+                  generator .string += generator .Space ();
+                  generator .string += sourceNodeName;
+                  generator .string += ".";
+                  generator .string += sourceField;
+                  generator .string += generator .Space ();
+                  generator .string += "TO";
+                  generator .string += generator .Space ();
+                  generator .string += destinationNodeName;
+                  generator .string += ".";
+                  generator .string += destinationField;
                }
             }
          }
       }
       else
+      {
          throw new Error ("X3DImportedNode.toXMLStream: Inline node does not exist.");
+      }
    },
-   toXMLStream: function (stream)
+   toXMLStream: function (generator)
    {
-      const generator = Generator .Get (stream);
-
       if (generator .ExistsNode (this .getInlineNode ()))
       {
-         stream .string += generator .Indent ();
-         stream .string += "<IMPORT";
-         stream .string += " ";
-         stream .string += "inlineDEF='";
-         stream .string += generator .XMLEncode (generator .Name (this .getInlineNode ()));
-         stream .string += "'";
-         stream .string += " ";
-         stream .string += "importedDEF='";
-         stream .string += generator .XMLEncode (this .getExportedName ());
-         stream .string += "'";
+         generator .string += generator .Indent ();
+         generator .string += "<IMPORT";
+         generator .string += generator .Space ();
+         generator .string += "inlineDEF='";
+         generator .string += generator .XMLEncode (generator .Name (this .getInlineNode ()));
+         generator .string += "'";
+         generator .string += generator .Space ();
+         generator .string += "importedDEF='";
+         generator .string += generator .XMLEncode (this .getExportedName ());
+         generator .string += "'";
 
          if (this .getImportedName () !== this .getExportedName ())
          {
-            stream .string += " ";
-            stream .string += "AS='";
-            stream .string += generator .XMLEncode (this .getImportedName ());
-            stream .string += "'";
+            generator .string += generator .Space ();
+            generator .string += "AS='";
+            generator .string += generator .XMLEncode (this .getImportedName ());
+            generator .string += "'";
          }
 
-         stream .string += "/>";
+         generator .string += "/>";
 
          try
          {
@@ -298,33 +296,195 @@ X3DImportedNode .prototype = Object .assign (Object .create (X3DNode .prototype)
                      ? destinationNode .getImportedName ()
                      : generator .Name (destinationNode);
 
-                  stream .string += "\n";
-                  stream .string += "\n";
-                  stream .string += generator .Indent ();
-                  stream .string += "<ROUTE";
-                  stream .string += " ";
-                  stream .string += "fromNode='";
-                  stream .string += generator .XMLEncode (sourceNodeName);
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "fromField='";
-                  stream .string += generator .XMLEncode (sourceField);
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "toNode='";
-                  stream .string += generator .XMLEncode (destinationNodeName);
-                  stream .string += "'";
-                  stream .string += " ";
-                  stream .string += "toField='";
-                  stream .string += generator .XMLEncode (destinationField);
-                  stream .string += "'";
-                  stream .string += "/>";
+                  generator .string += generator .Break ();
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += "<ROUTE";
+                  generator .string += generator .Space ();
+                  generator .string += "fromNode='";
+                  generator .string += generator .XMLEncode (sourceNodeName);
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "fromField='";
+                  generator .string += generator .XMLEncode (sourceField);
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "toNode='";
+                  generator .string += generator .XMLEncode (destinationNodeName);
+                  generator .string += "'";
+                  generator .string += generator .Space ();
+                  generator .string += "toField='";
+                  generator .string += generator .XMLEncode (destinationField);
+                  generator .string += "'";
+                  generator .string += "/>";
                }
             }
          }
       }
       else
+      {
          throw new Error ("X3DImportedNode.toXMLStream: Inline node does not exist.");
+      }
+   },
+   toJSONStream: function (generator)
+   {
+      if (generator .ExistsNode (this .getInlineNode ()))
+      {
+         generator .string += generator .Indent ();
+         generator .string += '{';
+         generator .string += generator .TidySpace ();
+         generator .string += '"';
+         generator .string += "IMPORT";
+         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 += "@inlineDEF";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += generator .JSONEncode (generator .Name (this .getInlineNode ()));
+         generator .string += ',';
+         generator .string += generator .TidyBreak ();
+
+         generator .string += generator .Indent ();
+         generator .string += '"';
+         generator .string += "@importedDEF";
+         generator .string += '"';
+         generator .string += ':';
+         generator .string += generator .TidySpace ();
+         generator .string += generator .JSONEncode (this .getExportedName ());
+
+         if (this .getImportedName () !== this .getExportedName ())
+         {
+            generator .string += ',';
+            generator .string += generator .TidyBreak ();
+            generator .string += generator .Indent ();
+            generator .string += '"';
+            generator .string += "@AS";
+            generator .string += '"';
+            generator .string += ':';
+            generator .string += generator .TidySpace ();
+            generator .string += generator .JSONEncode (this .getImportedName ());
+            generator .string += generator .TidyBreak ();
+         }
+         else
+         {
+            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 += '}';
+
+         try
+         {
+            generator .AddRouteNode (this);
+            generator .AddImportedNode (this .getExportedNode (), this .getImportedName ());
+         }
+         catch (error)
+         {
+            // Output unresolved routes.
+
+            for (const route of this [_routes])
+            {
+               const
+                  sourceNode       = route .sourceNode,
+                  sourceField      = route .sourceField,
+                  destinationNode  = route .destinationNode,
+                  destinationField = route .destinationField;
+
+               if (generator .ExistsRouteNode (sourceNode) && generator .ExistsRouteNode (destinationNode))
+               {
+                  const sourceNodeName = sourceNode instanceof X3DImportedNode
+                     ? sourceNode .getImportedName ()
+                     : generator .Name (sourceNode);
+
+                  const destinationNodeName = destinationNode instanceof X3DImportedNode
+                     ? destinationNode .getImportedName ()
+                     : generator .Name (destinationNode);
+
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+                  generator .string += generator .Indent ();
+                  generator .string += '{';
+                  generator .string += generator .TidySpace ();
+                  generator .string += '"';
+                  generator .string += "ROUTE";
+                  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 += "@fromNode";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (sourceNodeName);
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@fromField";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (sourceField);
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@toNode";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (destinationNodeName);
+                  generator .string += ',';
+                  generator .string += generator .TidyBreak ();
+
+                  generator .string += generator .Indent ();
+                  generator .string += '"';
+                  generator .string += "@toField";
+                  generator .string += '"';
+                  generator .string += ':';
+                  generator .string += generator .TidySpace ();
+                  generator .string += generator .JSONEncode (destinationField);
+                  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 += '}';
+               }
+            }
+         }
+      }
+      else
+      {
+         throw new Error ("X3DImportedNode.toJSONStream: Inline node does not exist.");
+      }
    },
    dispose: function ()
    {