x3d-tidy 2.2.0 → 2.2.2

package/README.md

@@ -33,14 +33,18 @@ This tool is particularly useful for developers, 3D artists, and researchers wor
 
 Set double precision, default is 15.
 
-### -e *extension*
+### -e *extension(s)* ...
 
-Set output file extension(s), e.g. ".x3dv". The output file will have the same basename as the input file.
+Set output file extension(s), e.g. ".x3dv" or ".tidy.x3d". The output file will have the same basename as the input file. Use either "-e" or "-o".
 
 ### -f *integer*
 
 Set float precision, default is 7.
 
+### -l
+
+Log output filenames to stdout.
+
 ### -h
 
 Show help.
@@ -55,7 +59,7 @@ If set, remove metadata nodes.
 
 ### -o *file(s)* ...
 
-Set output file(s). To output it to stdout use only the extension, e.g. ".x3dv".
+Set output file(s). To output it to stdout use only the extension, e.g. ".x3dv". Use either "-e" or "-o".
 
 ### -r
 

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "x3d-tidy",
-   "version": "2.2.0",
+   "version": "2.2.2",
    "description": "X3D Converter, Beautifier and Minimizer",
    "main": "src/main.js",
    "bin": {

package/src/main.js

@@ -26,7 +26,7 @@ async function main ()
    }
    catch (error)
    {
-      console .error (error .message || error);
+      console .error (colors .red (error .message || error));
       process .exit (1);
    }
 }
@@ -58,7 +58,7 @@ async function convert ()
    {
       type: "string",
       alias: "e",
-      description: `Set output file extension(s), e.g. ".x3dv". The output file will have the same basename as the input file.`,
+      description: `Set output file extension(s), e.g. ".x3dv" or ".tidy.x3d". The output file will have the same basename as the input file.`,
       array: true,
       requiresArg: true,
       implies: "input",
@@ -73,6 +73,21 @@ async function convert ()
       default: [7],
       requiresArg: true,
    })
+   .option ("log",
+   {
+      type: "boolean",
+      alias: "l",
+      description: `Log output filenames to stdout.`,
+      implies: "input",
+   })
+   .option ("infer",
+   {
+      type: "boolean",
+      alias: "r",
+      description: "If set, infer profile and components from used nodes.",
+      array: true,
+      default: [false],
+   })
    .option ("input",
    {
       type: "string",
@@ -100,14 +115,6 @@ async function convert ()
       implies: "input",
       conflicts: "extension",
    })
-   .option ("infer",
-   {
-      type: "boolean",
-      alias: "r",
-      description: "If set, infer profile and components from used nodes.",
-      array: true,
-      default: [false],
-   })
    .option ("style",
    {
       type: "string",
@@ -118,6 +125,13 @@ async function convert ()
       requiresArg: true,
       default: ["TIDY"],
    })
+   .check (args =>
+   {
+      if (!args .output && !args .extension)
+         throw new Error ("Missing argument output or extension.");
+
+      return true;
+   })
    .example ([
       [
          "npx x3d-tidy -i file.x3d -o file.x3dv",
@@ -128,16 +142,9 @@ async function convert ()
          "Convert an XML encoded file to a VRML encoded file and a JSON encoded file with smallest size possible by removing redundant whitespaces"
       ],
    ])
-   .requiresArg (["extension", "output"])
    .help ()
    .alias ("help", "h") .argv;
 
-   if (!args .output && !args .extension)
-   {
-      console .error (colors .red ("Missing argument output or extension."));
-      process .exit (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"));
 
@@ -153,15 +160,37 @@ async function convert ()
 
    await browser .loadComponents (browser .getProfile ("Full"));
 
-   if (!args .input .length)
-      console .warn ("No input files specified.");
-
    const argc = Math .max (args .input .length, args .output ?.length ?? args .extension ?.length);
 
    for (let i = 0; i < argc; ++ i)
    {
+      // Create input filename.
+
+      const input = new URL (arg (args .input, i), url .pathToFileURL (path .join (process .cwd (), "/")));
+
+      // Create output filename.
+
+      let output;
+
+      if (args .output)
+      {
+         output = path .resolve (process .cwd (), arg (args .output, i));
+      }
+      else if (args .extension)
+      {
+         const
+            filename  = url .fileURLToPath (input),
+            extension = arg (args .extension, i);
+
+         output = `${filename .slice (0, -path. extname (filename) .length)}${extension}`;
+      }
+
+      if (args .log)
+         console .log (output);
+
+      // Load scene.
+
       const
-         input     = new URL (arg (args .input, i), 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)) ?? [ ];
 
@@ -171,6 +200,8 @@ async function convert ()
       scene .setMetaData ("generator", generator);
       scene .setMetaData ("modified", new Date () .toUTCString ());
 
+      // Output scene.
+
       if (arg (args .infer, i))
          infer (scene);
 
@@ -185,21 +216,6 @@ async function convert ()
          doublePrecision: arg (args .double, i),
       };
 
-      let output;
-
-      if (args .output)
-      {
-         output = path .resolve (process .cwd (), arg (args .output, i));
-      }
-      else if (args .extension)
-      {
-         const
-            filename  = url .fileURLToPath (input),
-            extension = arg (args .extension, i);
-
-         output = `${filename .slice (0, -path. extname (filename) .length)}${extension}`;
-      }
-
       if (path .extname (output))
          fs .writeFileSync (output, getContents ({ ... options, type: path .extname (output) }));
       else