@jscad/cli 2.2.7 → 2.2.11

package/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.11](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.10...@jscad/cli@2.2.11) (2021-12-11)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
+## [2.2.10](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.9...@jscad/cli@2.2.10) (2021-11-07)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
+## [2.2.9](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.8...@jscad/cli@2.2.9) (2021-10-17)
+
+
+### Bug Fixes
+
+* **cli:** corrected cli to exit with non-zero code in case of errors ([#931](https://github.com/jscad/OpenJSCAD.org/issues/931)) ([e66a285](https://github.com/jscad/OpenJSCAD.org/commit/e66a2851693397d2d667f7d64aef7a4f52282d80))
+* **cli:** corrected generateOutputData to use registered deserializers from IO module, and added conversion tests ([ac7cba7](https://github.com/jscad/OpenJSCAD.org/commit/ac7cba7547c75e6d7cfc9fb680eba347d7f6a7ae))
+
+
+
+
+
+## [2.2.8](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.7...@jscad/cli@2.2.8) (2021-10-04)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
 ## [2.2.7](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.6...@jscad/cli@2.2.7) (2021-09-27)
 
 **Note:** Version bump only for package @jscad/cli

package/cli.conversions.test.js

@@ -68,7 +68,7 @@ module.exports = { main, getParameterDefinitions }
   return filePath
 }
 
-test('cli (conversions)', t => {
+test('cli (conversions STL)', t => {
   const testID = 11
 
   // convert from JSCAD script to STL
@@ -99,15 +99,169 @@ test('cli (conversions)', t => {
   cmd = `node ${cliPath} ${file2Path} -o ${file3Path} -v -add-metadata false`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
+})
+
+test('cli (conversions DXF)', t => {
+  const testID = 12
+
+  // convert from JSCAD to DXF
+  const file1Path = createJscad(testID)
+  t.true(fs.existsSync(file1Path))
+
+  t.context.file1Path = file1Path
+
+  const file2Name = `./test${testID}.dxf`
+  const file2Path = path.resolve(__dirname, file2Name)
+  t.false(fs.existsSync(file2Path))
+
+  t.context.file2Path = file2Path
+
+  const cliPath = t.context.cliPath
+
+  let cmd = `node ${cliPath} ${file1Path} -of dxf`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file2Path))
+
+  // convert from DXF to JS
+  const file3Name = `./test${testID}.js`
+  const file3Path = path.resolve(__dirname, file3Name)
+  t.false(fs.existsSync(file3Path))
+
+  t.context.file3Path = file3Path
+
+  cmd = `node ${cliPath} ${file2Path} -of js`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file3Path))
+})
+
+test('cli (conversions AMF)', t => {
+  const testID = 13
+
+  // convert from JSCAD to AMF
+  const file1Path = createJscad(testID)
+  t.true(fs.existsSync(file1Path))
+
+  t.context.file1Path = file1Path
+
+  const file2Name = `./test${testID}.amf`
+  const file2Path = path.resolve(__dirname, file2Name)
+  t.false(fs.existsSync(file2Path))
+
+  t.context.file2Path = file2Path
+
+  const cliPath = t.context.cliPath
+
+  let cmd = `node ${cliPath} ${file1Path} -of amf`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file2Path))
+
+  // convert from AMF to JS
+  const file3Name = `./test${testID}.js`
+  const file3Path = path.resolve(__dirname, file3Name)
+  t.false(fs.existsSync(file3Path))
+
+  t.context.file3Path = file3Path
+
+  cmd = `node ${cliPath} ${file2Path} -of js`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file3Path))
+})
+
+test('cli (conversions JSON)', t => {
+  const testID = 14
+
+  // convert from JSCAD to JSON
+  const file1Path = createJscad(testID)
+  t.true(fs.existsSync(file1Path))
+
+  t.context.file1Path = file1Path
+
+  const file2Name = `./test${testID}.json`
+  const file2Path = path.resolve(__dirname, file2Name)
+  t.false(fs.existsSync(file2Path))
+
+  t.context.file2Path = file2Path
+
+  const cliPath = t.context.cliPath
+
+  let cmd = `node ${cliPath} ${file1Path} -of json`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file2Path))
+
+  // convert from JSON to JS
+  const file3Name = `./test${testID}.js`
+  const file3Path = path.resolve(__dirname, file3Name)
+  t.false(fs.existsSync(file3Path))
+
+  t.context.file3Path = file3Path
+
+  cmd = `node ${cliPath} ${file2Path} -of js`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file3Path))
+})
 
-  // convert from STL to DXF
-  const file4Name = `./test${testID}.dxf`
-  const file4Path = path.resolve(__dirname, file4Name)
-  t.false(fs.existsSync(file4Path))
+test('cli (conversions SVG)', t => {
+  const testID = 15
 
-  t.context.file4Path = file4Path
+  // convert from JSCAD to SVG
+  const file1Path = createJscad(testID)
+  t.true(fs.existsSync(file1Path))
+
+  t.context.file1Path = file1Path
+
+  const file2Name = `./test${testID}.svg`
+  const file2Path = path.resolve(__dirname, file2Name)
+  t.false(fs.existsSync(file2Path))
+
+  t.context.file2Path = file2Path
+
+  const cliPath = t.context.cliPath
 
-  cmd = `node ${cliPath} ${file2Path} -of dxf`
+  let cmd = `node ${cliPath} ${file1Path} -of svg`
   execSync(cmd, { stdio: [0, 1, 2] })
-  t.true(fs.existsSync(file4Path))
+  t.true(fs.existsSync(file2Path))
+
+  // convert from SVG to JS
+  const file3Name = `./test${testID}.js`
+  const file3Path = path.resolve(__dirname, file3Name)
+  t.false(fs.existsSync(file3Path))
+
+  t.context.file3Path = file3Path
+
+  cmd = `node ${cliPath} ${file2Path} -of js`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file3Path))
+})
+
+test('cli (conversions X3D)', t => {
+  const testID = 16
+
+  // convert from JSCAD to X3D
+  const file1Path = createJscad(testID)
+  t.true(fs.existsSync(file1Path))
+
+  t.context.file1Path = file1Path
+
+  const file2Name = `./test${testID}.x3d`
+  const file2Path = path.resolve(__dirname, file2Name)
+  t.false(fs.existsSync(file2Path))
+
+  t.context.file2Path = file2Path
+
+  const cliPath = t.context.cliPath
+
+  let cmd = `node ${cliPath} ${file1Path} -of x3d`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file2Path))
+
+  // convert from X3D to JS
+  const file3Name = `./test${testID}.js`
+  const file3Path = path.resolve(__dirname, file3Name)
+  t.false(fs.existsSync(file3Path))
+
+  t.context.file3Path = file3Path
+
+  cmd = `node ${cliPath} ${file2Path} -of js`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file3Path))
 })

package/cli.js

@@ -60,4 +60,7 @@ const src = fs.readFileSync(inputFile, inputFile.match(/\.stl$/i) ? 'binary' : '
 // -- and write it to disk
 generateOutputData(src, params, { outputFile, outputFormat, inputFile, inputFormat, version, addMetaData, inputIsDirectory })
   .then(outputData => writeOutput(outputFile, outputData))
-  .catch(error => console.error(error))
+  .catch(error => {
+    console.error(error)
+    process.exit(1)
+  })

package/cli.parameters.test.js

@@ -126,7 +126,7 @@ test('cli (single input file, output filename)', t => {
   t.true(fs.existsSync(outputPath))
 })
 
-test('cli (folder, output format', t => {
+test('cli (folder, output format)', t => {
   const testID = 4
 
   const inputPath = createJscad(testID)
@@ -181,3 +181,29 @@ test('cli (single input file, parameters)', t => {
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(outputPath))
 })
+
+test('cli (no parameters)', t => {
+  const cliPath = t.context.cliPath
+
+  const cmd = `node ${cliPath}`
+  t.throws(() => {
+    execSync(cmd, { stdio: [0, 1, 2] })
+  })
+})
+
+test('cli (single input file, invalid jscad)', t => {
+  const testID = 6
+
+  const inputPath = createJscad(testID)
+  fs.writeFileSync(inputPath, "INVALID")
+  t.true(fs.existsSync(inputPath))
+
+  t.context.inputPath = inputPath
+
+  const cliPath = t.context.cliPath
+
+  const cmd = `node ${cliPath} ${inputPath}`
+  t.throws(() => {
+    execSync(cmd, { stdio: [0, 1, 2] })
+  })
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/cli",
-  "version": "2.2.7",
+  "version": "2.2.11",
   "description": "Command Line Interface (CLI) for JSCAD",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "bin": {
@@ -35,9 +35,9 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.0",
-    "@jscad/core": "2.3.7",
-    "@jscad/io": "2.0.8",
-    "@jscad/modeling": "2.5.2"
+    "@jscad/core": "2.5.1",
+    "@jscad/io": "2.2.1",
+    "@jscad/modeling": "2.7.0"
   },
   "devDependencies": {
     "ava": "3.15.0",
@@ -48,5 +48,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "a761f641bb2ac6016dc4a02ef86ce279dd553d7c"
+  "gitHead": "fbc9b90f0ae02bea4e6e7b974c65e751c3858269"
 }

package/src/generateOutputData.js

@@ -32,23 +32,19 @@ const generateOutputData = (source, params, options) => {
   registerAllExtensions(fs, require)
 
   return new Promise((resolve, reject) => {
-    // FIXME this table should come from core
-    const conversionTable = {
-      amf: data => deserializers.amf(data.options, data.source),
-      obj: data => deserializers.obj(data.options, data.source),
-      stl: data => deserializers.stl(data.options, data.source),
-      svg: data => deserializers.svg(data.options, data.source),
-      dxf: data => deserializers.dxf(data.options, data.source),
-      json: data => deserializers.json(data.options, data.source),
-      jscad: data => data.source,
-      js: data => data.source,
-      undefined: data => reject(new Error(`unsuported input format ${inputFormat}`))
+    let deserializer = deserializers[inputFormat]
+    if (!deserializer) {
+      if (inputFormat === 'jscad' || inputFormat === 'js') {
+        deserializer = (options, source) => source
+      } else {
+        reject(new Error(`unsuported input format ${inputFormat}`))
+      }
     }
 
     // convert any inputs
     const prevsource = source
     const deserializerOptions = Object.assign({}, params, options)
-    source = conversionTable[inputFormat]({ source, options: deserializerOptions })
+    source = deserializer(deserializerOptions, source)
     const useFakeFs = (source !== prevsource) // conversion, so use a fake file system when rebuilding
 
     if (outputFormat === 'jscad' || outputFormat === 'js') {