x3d-tidy 1.0.80 → 1.0.81

package/Makefile

@@ -1,5 +1,6 @@
-test:
-	npm start -- -i tests/test.x3d -o tests/test.html
+.PHONY: tests
+tests:
+	npx . -i tests/test.x3d -o tests/test.html
 
 publish:
 	perl build/publish.pl

package/build/publish.pl

@@ -14,11 +14,14 @@ if (`git branch --show-current` ne "development\n")
 system "git", "checkout", "main";
 system "git", "merge", "development";
 
+my $name = `node -p "require('./package.json').name"`;
+chomp $name;
+
 my $version = `npm pkg get version | sed 's/"//g'`;
 chomp $version;
 say "package.json version $version";
 
-my $online = `npm view x3d-tidy version`;
+my $online = `npm view $name version`;
 chomp $online;
 say "NPM version $online";
 

package/package.json

@@ -1,14 +1,14 @@
 {
    "name": "x3d-tidy",
-   "version": "1.0.80",
+   "version": "1.0.81",
    "description": "X3D Converter, Beautifier and Minimizer",
+   "main": "src/main.js",
    "bin": {
       "x3d-tidy": "bin/x3d-tidy.js"
    },
-   "main": "src/main.js",
    "scripts": {
       "start": "electron .",
-      "test": "echo \"Error: no test specified\" && exit 1"
+      "test": "make tests"
    },
    "repository": {
       "type": "git",
@@ -40,10 +40,17 @@
       "url": "https://github.com/create3000/x3d-tidy/issues"
    },
    "homepage": "https://www.npmjs.com/package/x3d-tidy",
+   "contributors": [
+      {
+         "name": "Holger Seelig",
+         "email": "holger.seelig@gmail.com",
+         "url": "https://github.com/create3000"
+      }
+   ],
    "dependencies": {
       "colors": "^1.4.0",
       "electron": "^25.3.0",
-      "x_ite": "^8.11.4",
+      "x_ite": "^8.11.5",
       "yargs": "^17.7.2"
    }
 }

package/src/convert.js

@@ -1,17 +1,17 @@
 "use strict"
 
 const
-   X3D         = require ("x_ite"),
-   infer       = require ("./infer"),
-   pkg         = require ("../package.json"),
-   metadata    = require ("./metadata"),
-   electron    = require ("electron"),
-   yargs       = require ("yargs"),
-   url         = require ("url"),
-   path        = require ("path"),
-   fs          = require ("fs"),
-   zlib        = require ("zlib"),
-   DEBUG       = false
+   X3D      = require ("x_ite"),
+   infer    = require ("./infer"),
+   pkg      = require ("../package.json"),
+   metadata = require ("./metadata"),
+   electron = require ("electron"),
+   yargs    = require ("yargs"),
+   url      = require ("url"),
+   path     = require ("path"),
+   fs       = require ("fs"),
+   zlib     = require ("zlib"),
+   DEBUG    = false
 
 // Redirect console messages.
 
@@ -20,7 +20,7 @@ console .log   = (... messages) => electron .ipcRenderer .send ("log",   message
 console .warn  = (... messages) => electron .ipcRenderer .send ("warn",  messages)
 console .error = (... messages) => electron .ipcRenderer .send ("error", messages)
 
-electron .ipcRenderer .on ("convert", async (event, argv) => main (argv))
+electron .ipcRenderer .on ("main", async (event, argv) => main (argv))
 
 async function main (argv)
 {
@@ -98,15 +98,18 @@ async function convert (argv)
       description: "If set, remove metadata nodes.",
    })
    .help ()
-   .alias ("help", "h") .argv;
+   .alias ("help", "h") .argv
+
+   if (args .help)
+      return
 
    const
       Browser = X3D .createBrowser () .browser,
       input   = path .resolve (args .cwd, args .input)
 
    Browser .endUpdate ()
-   Browser .setBrowserOption ("PrimitiveQuality", "HIGH");
-   Browser .setBrowserOption ("TextureQuality",   "HIGH");
+   Browser .setBrowserOption ("PrimitiveQuality", "HIGH")
+   Browser .setBrowserOption ("TextureQuality",   "HIGH")
 
    await Browser .loadComponents (Browser .getProfile ("Full"))
    await Browser .loadURL (new X3D .MFString (input))
@@ -145,7 +148,7 @@ async function convert (argv)
 
 function getContents ({ scene, type, style, precision, doublePrecision })
 {
-   switch (type)
+   switch (type .toLowerCase ())
    {
       default:
       case ".x3d":
@@ -161,7 +164,7 @@ function getContents ({ scene, type, style, precision, doublePrecision })
       case ".x3djz":
          return zlib .gzipSync (scene .toJSONString ({ style: style || "CLEAN", precision: precision, doublePrecision: doublePrecision }))
       case ".html":
-         return getHTML (scene);
+         return getHTML (scene)
    }
 }
 

package/src/main.js

@@ -49,5 +49,5 @@ electron .app .whenReady () .then (async () =>
 
    await window .loadFile (path .join (__dirname, "window.html"))
 
-   window .webContents .send ("convert", process .argv)
+   window .webContents .send ("main", process .argv)
 })