x3d-tidy 2.2.1 → 2.2.2

package/README.md

@@ -35,15 +35,15 @@ 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'.
+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
+### -l
 
-Log output filenames to stdout..
+Log output filenames to stdout.
 
 ### -h
 
@@ -59,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". Use either '-e' or '-o'.
+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.1",
+   "version": "2.2.2",
    "description": "X3D Converter, Beautifier and Minimizer",
    "main": "src/main.js",
    "bin": {

package/src/main.js

@@ -76,7 +76,7 @@ async function convert ()
    .option ("log",
    {
       type: "boolean",
-      alias: "g",
+      alias: "l",
       description: `Log output filenames to stdout.`,
       implies: "input",
    })
@@ -125,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",
@@ -138,12 +145,6 @@ 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"));
 
@@ -159,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)) ?? [ ];
 
@@ -177,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);
 
@@ -191,24 +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 (args .log)
-         console .log (output);
-
       if (path .extname (output))
          fs .writeFileSync (output, getContents ({ ... options, type: path .extname (output) }));
       else