x3d-tidy 1.0.0 → 1.0.2

package/.vscode/settings.json

@@ -2,7 +2,7 @@
    "files.exclude": {
       "**/*~": true,
       "node_modules": true,
-      "package-lock.json": true,
+      "package-lock.json": true
    },
    "files.insertFinalNewline": true,
    "files.trimFinalNewlines": true,

package/README.md

@@ -0,0 +1,9 @@
+# x3d-tidy
+
+X3D converter, beautifier and minimizer
+
+## Usage
+
+```sh
+$ npx . -i file.x3d -o file.x3dv
+```

package/bin/x3d-tidy.js

@@ -1,3 +1,17 @@
 #!/usr/bin/env node
+const path = require ("path")
+const { execFile } = require ("child_process")
 
-console.log("Hello, World!");
+execFile ("electron", [path .resolve (__dirname, ".."), ... process .argv], (error, stdout, stderr) =>
+{
+   if (error)
+   {
+      process .stderr .write (error .message);
+      return;
+   }
+
+   if (stderr)
+      process .stderr .write (stderr);
+
+   process .stdout .write (stdout);
+});

package/package.json

@@ -1,12 +1,13 @@
 {
    "name": "x3d-tidy",
-   "version": "1.0.0",
-   "description": "X3D Beautifier and Minimizer",
-   "main": "index.js",
+   "version": "1.0.2",
+   "description": "X3D Converter, Beautifier and Minimizer",
    "bin": {
       "x3d-tidy": "bin/x3d-tidy.js"
    },
+   "main": "src/main.js",
    "scripts": {
+      "start": "electron .",
       "test": "echo \"Error: no test specified\" && exit 1"
    },
    "repository": {
@@ -15,17 +16,20 @@
    },
    "keywords": [
       "X3D",
+      "converter",
       "minimizer",
       "beautifier",
       "tidy"
    ],
    "author": "Holger Seelig",
-   "license": "GPL",
+   "license": "GPL-3.0",
    "bugs": {
       "url": "https://github.com/create3000/x3d-tidy/issues"
    },
    "homepage": "https://github.com/create3000/x3d-tidy#readme",
-   "devDependencies": {
-      "x_ite": "^6.1.0"
+   "dependencies": {
+      "electron": "^22.0.0",
+      "x_ite": "^8.3.0",
+      "yargs": "^17.6.2"
    }
 }

package/src/convert.js

@@ -0,0 +1,94 @@
+const
+   X3D      = require ("x_ite"),
+   electron = require ("electron"),
+   yargs    = require ("yargs"),
+   path     = require ("path"),
+   fs       = require ("fs"),
+   zlib     = require ("zlib")
+
+electron .ipcRenderer .on ("convert", async (event, argv) => main (argv))
+
+async function main (argv)
+{
+   try
+   {
+      await convert (argv)
+
+      electron .ipcRenderer .send ("ready")
+   }
+   catch (error)
+   {
+      electron .ipcRenderer .send ("error", error .message || error)
+   }
+}
+
+async function convert (argv)
+{
+   const args = yargs (argv) .command ("x3d-tidy", "X3D converter, beautifier and minimizer")
+   .fail ((msg, error, yargs) =>
+   {
+      process .stderr .write (msg)
+      process .exit (1)
+   })
+   .option ("input",
+   {
+      alias: "i",
+      description: "Input filename",
+      type: "string",
+      demandOption: true,
+   })
+   .option ("output",
+   {
+      alias: "o",
+      description: "Output filename",
+      type: "string",
+   })
+   .help ()
+   .alias ("help", "h") .argv;
+
+   const
+      Browser = X3D .createBrowser () .browser,
+      input   = path .resolve (process .cwd (), args .input)
+
+   Browser .endUpdate ()
+
+   await Browser .loadURL (new X3D .MFString (input))
+
+   if (args .output)
+   {
+      const output = path .resolve (process .cwd (), args .output)
+
+      if (path .extname (output))
+         fs .writeFileSync (output, getContents (Browser .currentScene, path .extname (output)))
+      else
+         process .stdout .write (getContents (Browser .currentScene, path .basename (output)))
+   }
+   else
+   {
+      process .stdout .write (getContents (Browser .currentScene, path .extname (input)))
+   }
+}
+
+function getContents (scene, type)
+{
+   switch (type)
+   {
+      default:
+      case ".x3d":
+         return scene .toXMLString ()
+      case ".x3dz":
+         return zlib .gzipSync (scene .toXMLString ())
+      case ".x3dv":
+         return scene .toVRMLString ()
+      case ".x3dvz":
+         return zlib .gzipSync (scene .toVRMLString ())
+      case ".x3dj":
+         return scene .toJSONString ()
+      case ".x3djz":
+         return zlib .gzipSync (scene .toJSONString ())
+   }
+}
+
+process .exit  = (status) => electron .ipcRenderer .send (status ? "error" : "ready", "")
+console .log   = (s = "") => process .stdout .write (s + "\n")
+console .error = (s = "") => process .stderr .write (s + "\n")

package/src/main.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+const
+   electron = require ("electron"),
+   path     = require ("path")
+
+process .env .ELECTRON_DISABLE_SECURITY_WARNINGS = "true"
+
+electron .app .whenReady () .then (async () =>
+{
+   const window = new electron .BrowserWindow ({
+      show: false,
+      webPreferences: {
+         offscreen: true,
+         preload: path .join (__dirname, "window.js"),
+         nodeIntegration: true,
+         contextIsolation: false,
+      },
+   })
+
+   electron .ipcMain .on ("ready", () => electron .app .quit ())
+
+   electron .ipcMain .on ("error", (event, message) =>
+   {
+      process .stderr .write (message)
+      process .stderr .write ("\n")
+      process .exit (1)
+   })
+
+   await window .loadFile (path .join (__dirname, "window.html"))
+
+   window .webContents .send ("convert", process .argv)
+})

package/src/window.html

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+  </head>
+  <body></body>
+</html>

package/src/window.js

@@ -0,0 +1,6 @@
+"use strict"
+
+window .addEventListener ("DOMContentLoaded", () =>
+{
+   require ("./convert")
+})

package/test.x3d

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE X3D PUBLIC "ISO//Web3D//DTD X3D 3.3//EN" "http://www.web3d.org/specifications/x3d-3.3.dtd">
+<X3D profile='Interactive' version='4.0' xmlns:xsd='https://www.w3.org/2001/XMLSchema-instance' xsd:noNamespaceSchemaLocation='https://www.web3d.org/specifications/x3d-4.0.xsd'>
+   <Scene>
+      <Background
+            skyColor='0.2 0.2 0.2'>
+      </Background>
+      <Viewpoint
+            position='4.75079 5.5764 6.80689'
+            orientation='-0.67979594907481 0.70155548858341 0.2137694179717 0.842769006819'>
+      </Viewpoint>
+      <TouchSensor
+            description='Box Geometry'>
+      </TouchSensor>
+      <Shape>
+         <Appearance>
+            <Material
+                  diffuseColor='0 0.5 1'>
+               <PixelTexture
+                  containerField='diffuseTexture'
+                  image='2 2 1 0xff 0x00 0x00 0xff'>
+                  <TextureProperties
+                     boundaryModeS='CLAMP_TO_EDGE'
+                     boundaryModeT='CLAMP_TO_EDGE'>
+                  </TextureProperties>
+               </PixelTexture>
+            </Material>
+         </Appearance>
+         <Box></Box>
+      </Shape>
+   </Scene>
+</X3D>