x3d-tidy 2.1.26 → 2.2.1

package/README.md

@@ -33,10 +33,18 @@ This tool is particularly useful for developers, 3D artists, and researchers wor
 
 Set double precision, default is 15.
 
+### -e *extension(s)* ...
+
+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.
 
+### -g
+
+Log output filenames to stdout..
+
 ### -h
 
 Show help.
@@ -51,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.1.26",
+   "version": "2.2.1",
    "description": "X3D Converter, Beautifier and Minimizer",
    "main": "src/main.js",
    "bin": {
@@ -53,6 +53,7 @@
       }
    ],
    "dependencies": {
+      "colors": "^1.4.0",
       "x_ite": "^12.0.7",
       "x_ite-node": "^1.1.0",
       "x3d-traverse": "^1.0.13",

package/src/main.js

@@ -11,6 +11,7 @@ const
    path        = require ("path"),
    fs          = require ("fs"),
    zlib        = require ("zlib"),
+   colors      = require ("colors"),
    DEBUG       = false;
 
 main ();
@@ -25,7 +26,7 @@ async function main ()
    }
    catch (error)
    {
-      console .error (error .message || error);
+      console .error (colors .red (error .message || error));
       process .exit (1);
    }
 }
@@ -41,7 +42,7 @@ async function convert ()
    .alias ("v", "version")
    .fail ((msg, error, yargs) =>
    {
-      console .error (msg);
+      console .error (colors .red (msg));
       process .exit (1);
    })
    .option ("double",
@@ -51,6 +52,17 @@ async function convert ()
       description: "Set double precision, default is 15.",
       array: true,
       default: [15],
+      requiresArg: true,
+   })
+   .option ("extension",
+   {
+      type: "string",
+      alias: "e",
+      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",
+      conflicts: "output",
    })
    .option ("float",
    {
@@ -59,6 +71,22 @@ async function convert ()
       description: "Set float precision, default is 7.",
       array: true,
       default: [7],
+      requiresArg: true,
+   })
+   .option ("log",
+   {
+      type: "boolean",
+      alias: "g",
+      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",
    {
@@ -66,8 +94,8 @@ async function convert ()
       alias: "i",
       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,
-      default: [ ],
-      implies: "output",
+      requiresArg: true,
+      demandOption: true,
    })
    .option ("metadata",
    {
@@ -83,16 +111,9 @@ async function convert ()
       alias: "o",
       description: `Set output file(s). To output it to stdout use only the extension, e.g. ".x3dv".`,
       array: true,
-      default: [ ],
+      requiresArg: true,
       implies: "input",
-   })
-   .option ("infer",
-   {
-      type: "boolean",
-      alias: "r",
-      description: "If set, infer profile and components from used nodes.",
-      array: true,
-      default: [false],
+      conflicts: "extension",
    })
    .option ("style",
    {
@@ -101,6 +122,7 @@ async function convert ()
       description: `Set output style, default is "TIDY". "TIDY" results in a good readable file, but with larger size, whereas "CLEAN" result in the smallest size possible by removing all redundant whitespaces. The other values are somewhere in between.`,
       choices: ["TIDY", "COMPACT", "SMALL", "CLEAN"],
       array: true,
+      requiresArg: true,
       default: ["TIDY"],
    })
    .example ([
@@ -116,6 +138,12 @@ async function convert ()
    .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"));
 
@@ -134,7 +162,9 @@ async function convert ()
    if (!args .input .length)
       console .warn ("No input files specified.");
 
-   for (const i of args .output .keys ())
+   const argc = Math .max (args .input .length, args .output ?.length ?? args .extension ?.length);
+
+   for (let i = 0; i < argc; ++ i)
    {
       const
          input     = new URL (arg (args .input, i), url .pathToFileURL (path .join (process .cwd (), "/"))),
@@ -161,7 +191,23 @@ async function convert ()
          doublePrecision: arg (args .double, i),
       };
 
-      const output = path .resolve (process .cwd (), args .output [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 (args .log)
+         console .log (output);
 
       if (path .extname (output))
          fs .writeFileSync (output, getContents ({ ... options, type: path .extname (output) }));