@jscad/cli 2.2.12 → 2.2.15

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.2.15](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.14...@jscad/cli@2.2.15) (2022-03-06)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
+## [2.2.14](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.13...@jscad/cli@2.2.14) (2022-02-19)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
+## [2.2.13](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.12...@jscad/cli@2.2.13) (2022-01-23)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
 ## [2.2.12](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.2.11...@jscad/cli@2.2.12) (2021-12-26)
 
 **Note:** Version bump only for package @jscad/cli

package/cli.conversions.test.js

@@ -4,7 +4,7 @@ const path = require('path')
 const { execSync } = require('child_process')
 const fs = require('fs')
 
-test.afterEach.always(t => {
+test.afterEach.always((t) => {
   // remove files
   try {
     if (t.context.file1Path) fs.unlinkSync(t.context.file1Path)
@@ -23,7 +23,7 @@ test.afterEach.always(t => {
   } catch (err) {}
 })
 
-test.beforeEach(t => {
+test.beforeEach((t) => {
   const cliName = './cli.js'
   t.context = {
     cliPath: path.resolve(__dirname, cliName)
@@ -68,7 +68,7 @@ module.exports = { main, getParameterDefinitions }
   return filePath
 }
 
-test('cli (conversions STL)', t => {
+test('cli (conversions STL)', (t) => {
   const testID = 11
 
   // convert from JSCAD script to STL
@@ -101,7 +101,7 @@ test('cli (conversions STL)', t => {
   t.true(fs.existsSync(file3Path))
 })
 
-test('cli (conversions DXF)', t => {
+test('cli (conversions DXF)', (t) => {
   const testID = 12
 
   // convert from JSCAD to DXF
@@ -134,7 +134,7 @@ test('cli (conversions DXF)', t => {
   t.true(fs.existsSync(file3Path))
 })
 
-test('cli (conversions AMF)', t => {
+test('cli (conversions AMF)', (t) => {
   const testID = 13
 
   // convert from JSCAD to AMF
@@ -167,7 +167,7 @@ test('cli (conversions AMF)', t => {
   t.true(fs.existsSync(file3Path))
 })
 
-test('cli (conversions JSON)', t => {
+test('cli (conversions JSON)', (t) => {
   const testID = 14
 
   // convert from JSCAD to JSON
@@ -200,7 +200,7 @@ test('cli (conversions JSON)', t => {
   t.true(fs.existsSync(file3Path))
 })
 
-test('cli (conversions SVG)', t => {
+test('cli (conversions SVG)', (t) => {
   const testID = 15
 
   // convert from JSCAD to SVG
@@ -233,7 +233,7 @@ test('cli (conversions SVG)', t => {
   t.true(fs.existsSync(file3Path))
 })
 
-test('cli (conversions X3D)', t => {
+test('cli (conversions X3D)', (t) => {
   const testID = 16
 
   // convert from JSCAD to X3D

package/cli.js

@@ -59,8 +59,8 @@ const src = fs.readFileSync(inputFile, inputFile.match(/\.stl$/i) ? 'binary' : '
 // -- convert from JSCAD script into the desired output format
 // -- and write it to disk
 generateOutputData(src, params, { outputFile, outputFormat, inputFile, inputFormat, version, addMetaData, inputIsDirectory })
-  .then(outputData => writeOutput(outputFile, outputData))
-  .catch(error => {
+  .then((outputData) => writeOutput(outputFile, outputData))
+  .catch((error) => {
     console.error(error)
     process.exit(1)
   })

package/cli.parameters.test.js

@@ -4,7 +4,7 @@ const path = require('path')
 const { execSync } = require('child_process')
 const fs = require('fs')
 
-test.afterEach.always(t => {
+test.afterEach.always((t) => {
   // remove files
   try {
     if (t.context.inputPath) fs.unlinkSync(t.context.inputPath)
@@ -19,7 +19,7 @@ test.afterEach.always(t => {
   } catch (err) {}
 })
 
-test.beforeEach(t => {
+test.beforeEach((t) => {
   const cliName = './cli.js'
   t.context = {
     cliPath: path.resolve(__dirname, cliName)
@@ -63,7 +63,7 @@ module.exports = { main, getParameterDefinitions }
   return filePath
 }
 
-test('cli (single input file)', t => {
+test('cli (single input file)', (t) => {
   const testID = 1
 
   const inputPath = createJscad(testID)
@@ -84,7 +84,7 @@ test('cli (single input file)', t => {
   t.true(fs.existsSync(outputPath))
 })
 
-test('cli (single input file, output format)', t => {
+test('cli (single input file, output format)', (t) => {
   const testID = 2
 
   const inputPath = createJscad(testID)
@@ -105,7 +105,7 @@ test('cli (single input file, output format)', t => {
   t.true(fs.existsSync(outputPath))
 })
 
-test('cli (single input file, output filename)', t => {
+test('cli (single input file, output filename)', (t) => {
   const testID = 3
 
   const inputPath = createJscad(testID)
@@ -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)
@@ -161,7 +161,7 @@ test('cli (folder, output format)', t => {
   t.true(fs.existsSync(outputPath))
 })
 
-test('cli (single input file, parameters)', t => {
+test('cli (single input file, parameters)', (t) => {
   const testID = 5
 
   const inputPath = createJscad(testID)
@@ -182,7 +182,7 @@ test('cli (single input file, parameters)', t => {
   t.true(fs.existsSync(outputPath))
 })
 
-test('cli (no parameters)', t => {
+test('cli (no parameters)', (t) => {
   const cliPath = t.context.cliPath
 
   const cmd = `node ${cliPath}`
@@ -191,11 +191,11 @@ test('cli (no parameters)', t => {
   })
 })
 
-test('cli (single input file, invalid jscad)', t => {
+test('cli (single input file, invalid jscad)', (t) => {
   const testID = 6
 
   const inputPath = createJscad(testID)
-  fs.writeFileSync(inputPath, "INVALID")
+  fs.writeFileSync(inputPath, 'INVALID')
   t.true(fs.existsSync(inputPath))
 
   t.context.inputPath = inputPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/cli",
-  "version": "2.2.12",
+  "version": "2.2.15",
   "description": "Command Line Interface (CLI) for JSCAD",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
   "bin": {
@@ -34,10 +34,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@jscad/array-utils": "2.1.1",
-    "@jscad/core": "2.5.2",
-    "@jscad/io": "2.2.2",
-    "@jscad/modeling": "2.7.1"
+    "@jscad/array-utils": "2.1.2",
+    "@jscad/core": "2.5.5",
+    "@jscad/io": "2.2.5",
+    "@jscad/modeling": "2.8.0"
   },
   "devDependencies": {
     "ava": "3.15.0",
@@ -48,5 +48,5 @@
     "url": "https://opencollective.com/openjscad",
     "logo": "https://opencollective.com/openjscad/logo.txt"
   },
-  "gitHead": "c8ac21281a7acf5a5575b940c18353c598ffa1a4"
+  "gitHead": "92fb9c75eb070fca5f5ee8c2bab6614b1f54514e"
 }

package/src/env.js

@@ -1,13 +1,13 @@
 const version = require('../package.json').version
 
-function env () {
-  var env = 'OpenJSCAD ' + version
+const env = () => {
+  let env = 'OpenJSCAD ' + version
   if (typeof document !== 'undefined') {
-    var w = document.defaultView
+    const w = document.defaultView
     env = env + ' [' + w.navigator.userAgent + ']'
   } else {
     if (typeof require === 'function') {
-      var os = require('os')
+      const os = require('os')
       env = env + ' [' + os.type() + ':' + os.release() + ',' + os.platform() + ':' + os.arch() + ']'
     }
   }

package/src/generateOutputData.js

@@ -60,7 +60,7 @@ const generateOutputData = (source, params, options) => {
       }
     }
   })
-    .then(solids => {
+    .then((solids) => {
       const serializerOptions = Object.assign({ format: outputFormat }, params)
       return solidsAsBlob(solids, serializerOptions)
     })

package/src/parseArgs.js

@@ -5,7 +5,7 @@ const { supportedInputExtensions, supportedOutputExtensions, supportedOutputForm
 
 const env = require('./env')
 
-const parseArgs = args => {
+const parseArgs = (args) => {
   const inputExtensions = supportedInputExtensions()
   const outputExtensions = supportedOutputExtensions()
   const outputFormats = supportedOutputFormats()
@@ -28,17 +28,15 @@ const parseArgs = args => {
   let addMetaData = false // wether to add metadata to outputs or not : ie version info, timestamp etc
   let inputIsDirectory = false // did we pass in a folder or a file ?
 
-  const isValidInputFileFormat = input => {
+  const isValidInputFileFormat = (input) => {
     if (input === undefined || input === null || !(typeof input === 'string')) {
       return false
     }
-    return inputExtensions.reduce((acc, format) => {
-      return input.toLowerCase().endsWith('.' + format) || acc
-    }, false)
+    return inputExtensions.reduce((acc, format) => input.toLowerCase().endsWith('.' + format) || acc, false)
   }
-  const getFileExtensionFromString = input => (input.substring(input.lastIndexOf('.') + 1)).toLowerCase()
+  const getFileExtensionFromString = (input) => (input.substring(input.lastIndexOf('.') + 1)).toLowerCase()
 
-  const parseBool = input => input.toLowerCase() === 'true'
+  const parseBool = (input) => input.toLowerCase() === 'true'
 
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '-of') { // -of <format>
@@ -54,8 +52,6 @@ const parseArgs = args => {
       params[RegExp.$1] = RegExp.$2
     } else if (args[i].match(/^--(\w+)$/)) { // params for main()
       params[RegExp.$1] = args[++i]
-    } else if (args[i].match(/^--(\w+)$/)) { // params for main()
-      params[RegExp.$1] = args[++i]
     } else if (isValidInputFileFormat(args[i])) {
       inputFile = args[i]
       inputFormat = getFileExtensionFromString(args[i])

package/src/writeOutput.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 
 const writeOutputDataToFile = (outputFile, outputData) => {
   fs.writeFile(outputFile, outputData.asBuffer(),
-    function (err) {
+    (err) => {
       if (err) {
         console.log('err', err)
       } else {