.github/workflows/node.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '14', '16' ]
+        node: [ '16', '18' ]
     name: Node ${{ matrix.node }} test
     steps:
       - uses: actions/checkout@v2

package.json

@@ -59,7 +59,8 @@
       "**/old/",
       "**/ui/csg-viewer",
       "**/io/scad-deserializer",
-      "**/io/gcode-deserializer"
+      "**/io/gcode-deserializer",
+      "**/desktop"
     ],
     "env": {
       "browser": true,

packages/cli/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.3.4](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.3.3...@jscad/cli@2.3.4) (2024-11-10)
+
+**Note:** Version bump only for package @jscad/cli
+
+
+
+
+
 ## [2.3.3](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/cli@2.3.2...@jscad/cli@2.3.3) (2024-10-06)
 
 **Note:** Version bump only for package @jscad/cli

packages/cli/cli.conversions.test.js

@@ -8,19 +8,23 @@ test.afterEach.always((t) => {
   // remove files
   try {
     if (t.context.file1Path) fs.unlinkSync(t.context.file1Path)
-  } catch (err) {}
+  } catch (err) { }
 
   try {
     if (t.context.file2Path) fs.unlinkSync(t.context.file2Path)
-  } catch (err) {}
+  } catch (err) { }
 
   try {
     if (t.context.file3Path) fs.unlinkSync(t.context.file3Path)
-  } catch (err) {}
+  } catch (err) { }
 
   try {
     if (t.context.file4Path) fs.unlinkSync(t.context.file4Path)
-  } catch (err) {}
+  } catch (err) { }
+
+  try {
+    if (t.context.file5Path) fs.unlinkSync(t.context.file5Path)
+  } catch (err) { }
 })
 
 test.beforeEach((t) => {
@@ -68,6 +72,56 @@ module.exports = { main, getParameterDefinitions }
   return filePath
 }
 
+const createImportJscad = (id, extension) => {
+  const jscadScript = `// test script ${id} -- import
+
+const main = () => {
+  return require('./test${id}.${extension}')
+}
+
+module.exports = { main }
+`
+
+  const fileName = `./test${id}-import.jscad`
+  const filePath = path.resolve(__dirname, fileName)
+  fs.writeFileSync(filePath, jscadScript)
+  return filePath
+}
+
+const testBackImport = (t, testID, extension) => {
+  const cliPath = t.context.cliPath
+
+  const file4Path = createImportJscad(testID, extension)
+  t.context.file4Path = file4Path
+  t.true(fs.existsSync(file4Path))
+
+  const file5Name = `./test${testID}-import.stl`
+  const file5Path = path.resolve(__dirname, file5Name)
+  t.context.file5Path = file5Path
+  t.false(fs.existsSync(file5Path))
+
+  const cmd = `node ${cliPath} ${file4Path}`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(file5Path))
+}
+
+const runOnFixture = (t, fixtureName) => {
+  const inputFile = path.resolve(
+    __dirname,
+    path.join('test_fixtures', fixtureName, 'index.js'))
+
+  const outputFile = inputFile.replace('.js', '.stl')
+  t.context.file1Path = outputFile
+
+  t.false(fs.existsSync(outputFile))
+
+  const cmd = `node ${t.context.cliPath} ${inputFile}`
+  execSync(cmd, { stdio: [0, 1, 2] })
+  t.true(fs.existsSync(outputFile))
+
+  return outputFile
+}
+
 test('cli (conversions STL)', (t) => {
   const testID = 11
 
@@ -99,6 +153,8 @@ test('cli (conversions STL)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -o ${file3Path} -v -add-metadata false`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
+
+  testBackImport(t, testID, 'stl')
 })
 
 test('cli (conversions DXF)', (t) => {
@@ -132,6 +188,8 @@ test('cli (conversions DXF)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
+
+  testBackImport(t, testID, 'dxf')
 })
 
 test('cli (conversions AMF)', (t) => {
@@ -165,6 +223,8 @@ test('cli (conversions AMF)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
+
+  testBackImport(t, testID, 'amf')
 })
 
 test('cli (conversions JSON)', (t) => {
@@ -198,6 +258,8 @@ test('cli (conversions JSON)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
+
+  testBackImport(t, testID, 'json')
 })
 
 test('cli (conversions SVG)', (t) => {
@@ -264,4 +326,12 @@ test('cli (conversions X3D)', (t) => {
   cmd = `node ${cliPath} ${file2Path} -of js`
   execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(file3Path))
+
+  testBackImport(t, testID, 'x3d')
+})
+
+test('cli (import STL)', (t) => {
+  // const testID = 17
+
+  runOnFixture(t, 'stl_import')
 })

packages/cli/cli.js

@@ -76,13 +76,13 @@ generateOutputData(src, params, { outputFile, outputFormat, inputFile, inputForm
             if (err) {
               console.error(err)
             } else {
-              logFileOutput(zipFilename)              
+              logFileOutput(zipFilename)
             }
           })
         })
       } else {
         for (let i = 0; i < outputData.length; i++) {
-          const filename = outputFile.replace(/\.(\w+)$/, `-part-${i + 1}-of-${outputData.length}.$1`)        
+          const filename = outputFile.replace(/\.(\w+)$/, `-part-${i + 1}-of-${outputData.length}.$1`)
           logFileOutput(filename)
           writeOutput(filename, outputData[i])
         }
@@ -97,7 +97,7 @@ generateOutputData(src, params, { outputFile, outputFormat, inputFile, inputForm
             if (err) {
               console.error(err)
             } else {
-              logFileOutput(zipFilename)              
+              logFileOutput(zipFilename)
             }
           })
         })

packages/cli/cli.parameters.test.js

@@ -58,7 +58,7 @@ const main = (params) => {
   let ageom2 = primitives.ellipse()
   let ageom3 = primitives.ellipsoid()
 
-  ${multipart ? `return [ageom3, ageom3, ageom3]` : `return [apath2, ageom2, ageom3]`}
+  ${multipart ? 'return [ageom3, ageom3, ageom3]' : 'return [apath2, ageom2, ageom3]'}
 }
 
 module.exports = { main, getParameterDefinitions }
@@ -215,7 +215,6 @@ test('cli (single input file, invalid jscad)', (t) => {
   })
 })
 
-
 test('cli (single input file, multiple output files)', (t) => {
   const testID = 7
 
@@ -239,7 +238,7 @@ test('cli (single input file, multiple output files)', (t) => {
   const cliPath = t.context.cliPath
 
   const cmd = `node ${cliPath} ${inputPath} -gp`
-  execSync(cmd, { stdio: [0,1,2] })
+  execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(outputPath1))
   t.true(fs.existsSync(outputPath2))
   t.true(fs.existsSync(outputPath3))
@@ -257,13 +256,13 @@ test('cli (single multipart input file, zipped output file)', async (t) => {
   const outputPath = path.resolve(__dirname, outputName)
 
   t.false(fs.existsSync(outputPath))
-  
+
   t.context.outputPath = outputPath
 
   const cliPath = t.context.cliPath
 
   const cmd = `node ${cliPath} ${inputPath} -gp -z`
-  execSync(cmd, { stdio: [0,1,2] })
+  execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(outputPath))
 
   // check contents of zip file
@@ -281,18 +280,18 @@ test('cli (single input file, zipped output file)', async (t) => {
   t.true(fs.existsSync(inputPath))
 
   t.context.inputPath = inputPath
-  
+
   const outputName = `./test${testID}.zip`
   const outputPath = path.resolve(__dirname, outputName)
 
   t.false(fs.existsSync(outputPath))
-  
+
   t.context.outputPath = outputPath
 
   const cliPath = t.context.cliPath
 
   const cmd = `node ${cliPath} ${inputPath} -z`
-  execSync(cmd, { stdio: [0,1,2] })
+  execSync(cmd, { stdio: [0, 1, 2] })
   t.true(fs.existsSync(outputPath))
 
   // check contents of zip file

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/cli",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "Command Line Interface (CLI) for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
@@ -36,9 +36,9 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "2.1.4",
-    "@jscad/core": "2.6.10",
-    "@jscad/io": "2.4.9",
-    "@jscad/modeling": "2.12.3",
+    "@jscad/core": "2.6.11",
+    "@jscad/io": "2.4.10",
+    "@jscad/modeling": "2.12.4",
     "jszip": "^3.10.1"
   },
   "devDependencies": {

packages/cli/src/generateOutputData.js

@@ -64,7 +64,7 @@ const generateOutputData = (source, params, options) => {
     .then((solids) => {
       const serializerOptions = Object.assign({ format: outputFormat }, params)
       if (generateParts) {
-        let blobs = []
+        const blobs = []
         for (let i = 0; i < solids.length; i++) {
           blobs.push(solidsAsBlob(solids[i], serializerOptions))
         }

packages/cli/test_fixtures/stl_import/index.js

@@ -0,0 +1,4 @@
+
+const main = () => require('./binary_stl.stl')
+
+module.exports = { main }

packages/core/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.6.11](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/core@2.6.10...@jscad/core@2.6.11) (2024-11-10)
+
+**Note:** Version bump only for package @jscad/core
+
+
+
+
+
 ## [2.6.10](https://github.com/jscad/OpenJSCAD.org/compare/@jscad/core@2.6.9...@jscad/core@2.6.10) (2024-10-06)
 
 **Note:** Version bump only for package @jscad/core