x3d-tidy 2.0.6 → 2.0.8

package/README.md

@@ -10,19 +10,19 @@ X3D converter, beautifier and minimizer
 
 You can run *x3d-tidy* without installing it using **npx**:
 
-**npx x3d-tidy** \[options\]
+**npx x3d-tidy** \[options\] input-file output-file [input-file output-file ...]
 
 ## Options
 
 **x3d-tidy** interprets the following options when it is invoked:
 
-### -i *file*
+### -i *file* ...
 
-Set input file. This can be either a local file path or a URL.
+Set input file(s). This can be either a local file path or a URL. If there are less input files than output files, the last input file is used for the remaining output files.
 
-### -o *file*
+### -o *file* ...
 
-Set output file.
+Set output file(s).
 
 ### -s *[**TIDY**, COMPACT, SMALL, CLEAN]*
 
@@ -80,7 +80,13 @@ Show help.
 Convert an XML encoded file into a VRML encoded file.
 
 ```sh
-$ npx x3d-tidy -i file.x3d -o file.x3dv
+$ npx x3d-tidy file.x3d file.x3dv
+```
+
+Convert an XML encoded file into a VRML encoded file and a JSON encoded file.
+
+```sh
+$ npx x3d-tidy -i file.x3d -o file.x3dv file.x3dj
 ```
 
 ## Online Converter

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "x3d-tidy",
-   "version": "2.0.6",
+   "version": "2.0.8",
    "description": "X3D Converter, Beautifier and Minimizer",
    "main": "src/main.js",
    "bin": {
@@ -54,9 +54,9 @@
    ],
    "dependencies": {
       "colors": "^1.4.0",
-      "x_ite": "^10.5.14",
-      "x_ite-node": "^1.0.16",
-      "x3d-traverse": "^1.0.5",
+      "x_ite": "^11.0.0",
+      "x_ite-node": "^1.0.17",
+      "x3d-traverse": "^1.0.6",
       "yargs": "^17.7.2"
    },
    "devDependencies": {

package/src/main.js

@@ -1,16 +1,17 @@
 "use strict";
 
 const
-   X3D      = require ("x_ite-node"),
-   pkg      = require ("../package.json"),
-   infer    = require ("./infer"),
-   metadata = require ("./metadata"),
-   yargs    = require ("yargs"),
-   url      = require ("url"),
-   path     = require ("path"),
-   fs       = require ("fs"),
-   zlib     = require ("zlib"),
-   DEBUG    = false;
+   X3D         = require ("x_ite-node"),
+   pkg         = require ("../package.json"),
+   infer       = require ("./infer"),
+   metadata    = require ("./metadata"),
+   yargs       = require ("yargs"),
+   { hideBin } = require ("yargs/helpers"),
+   url         = require ("url"),
+   path        = require ("path"),
+   fs          = require ("fs"),
+   zlib        = require ("zlib"),
+   DEBUG       = false;
 
 main ();
 
@@ -31,10 +32,10 @@ async function main ()
 
 async function convert ()
 {
-   const args = yargs (process .argv)
+   const args = yargs (hideBin (process .argv))
    .scriptName ("x3d-tidy")
-   .usage ("$0 args")
-   .command ("x3d-tidy", "X3D converter, beautifier and minimizer")
+   .usage ("$0 [options] input-file output-file [input-file output-file ...]")
+   .command ("X3D converter, beautifier and minimizer")
    .version (pkg .version)
    .alias ("v", "version")
    .fail ((msg, error, yargs) =>
@@ -46,15 +47,17 @@ async function convert ()
    {
       type: "string",
       alias: "i",
-      description: "Set input file.",
-      demandOption: true,
+      description: "Set input file(s). If there are less input files than output files, the last input file is used for the remaining output files.",
+      array: true,
+      implies: "output",
    })
    .option ("output",
    {
       type: "string",
       alias: "o",
-      description: "Set output file. To output it to stdout use only the extension, e.g. '.x3dv'.",
-      demandOption: true,
+      description: "Set output file(s). To output it to stdout use only the extension, e.g. '.x3dv'.",
+      array: true,
+      implies: "input",
    })
    .option ("style",
    {
@@ -90,15 +93,27 @@ async function convert ()
    .help ()
    .alias ("help", "h") .argv;
 
-   if (args .version)
-      return;
+   args .input  ??= [ ];
+   args .output ??= [ ];
 
-   if (args .help)
-      return;
+   if (args .input .length === 0 && args .output .length === 0)
+   {
+      if (args ._ .length % 2 === 0)
+      {
+         for (let i = 0; i < args ._ .length; i += 2)
+         {
+            args .input  .push (args ._ [i + 0]);
+            args .output .push (args ._ [i + 1]);
+         }
+      }
+   }
+
+   // Fixes an issue with URL, if it matches a drive letter.
+   args .input = args .input .map (input => input .replace (/^([A-Za-z]:)/, "file://$1"));
 
    const
       Browser = X3D .createBrowser () .browser,
-      input   = new URL (args .input, url .pathToFileURL (path .join (process .cwd (), "/")));
+      scenes  = new Map ();
 
    Browser .endUpdate ();
    Browser .setBrowserOption ("LoadUrlObjects",   false);
@@ -106,45 +121,50 @@ async function convert ()
    Browser .setBrowserOption ("TextureQuality",   "HIGH");
 
    await Browser .loadComponents (Browser .getProfile ("Full"));
-   await Browser .loadURL (new X3D .MFString (input));
-
-   const
-      scene     = Browser .currentScene,
-      generator = scene .getMetaData ("generator") ?.filter (value => !value .startsWith (pkg .name)) ?? [ ];
-
-   generator .push (`${pkg .name} V${pkg .version}, ${pkg .homepage}`);
-
-   scene .setMetaData ("generator", generator);
-   scene .setMetaData ("modified", new Date () .toUTCString ());
 
-   if (args .infer)
-      infer (scene);
-
-   if (args .metadata)
-      metadata (scene);
-
-   const options =
-   {
-      scene: scene,
-      style: args .style,
-      precision: args .float,
-      doublePrecision: args .double,
-   };
-
-   if (args .output)
+   for (const i of args .output .keys ())
    {
-      const output = path .resolve (process .cwd (), args .output);
-
-      if (path .extname (output))
-         fs .writeFileSync (output, getContents ({ ... options, type: path .extname (output) }));
+      const
+         input     = new URL (args .input [i] ?? args .input .at (-1), url .pathToFileURL (path .join (process .cwd (), "/"))),
+         scene     = scenes .get (input .href) ?? await Browser .createX3DFromURL (new X3D .MFString (input)),
+         generator = scene .getMetaData ("generator") ?.filter (value => !value .startsWith (pkg .name)) ?? [ ];
+
+      scenes .set (input .href, scene);
+      generator .push (`${pkg .name} V${pkg .version}, ${pkg .homepage}`);
+
+      scene .setMetaData ("generator", generator);
+      scene .setMetaData ("modified", new Date () .toUTCString ());
+
+      if (args .infer)
+         infer (scene);
+
+      if (args .metadata)
+         metadata (scene);
+
+      const options =
+      {
+         scene: scene,
+         style: args .style,
+         precision: args .float,
+         doublePrecision: args .double,
+      };
+
+      if (args .output [i])
+      {
+         const output = path .resolve (process .cwd (), args .output [i]);
+
+         if (path .extname (output))
+            fs .writeFileSync (output, getContents ({ ... options, type: path .extname (output) }));
+         else
+            console .log (getContents ({ ... options, type: path .basename (output) }));
+      }
       else
-         console .log (getContents ({ ... options, type: path .basename (output) }));
-   }
-   else
-   {
-      console .log (getContents ({ ... options, type: path .extname (input) }));
+      {
+         console .log (getContents ({ ... options, type: path .extname (input) }));
+      }
    }
 
+   scenes .forEach (scene => scene .dispose ());
    Browser .dispose ();
 }