@jscad/stl-deserializer 2.1.27 → 3.0.1-alpha.0

package/{index.js → src/index.js}

@@ -1,8 +1,8 @@
-const { maths, primitives } = require('@jscad/modeling')
+import { polyhedron, vec3 } from '@jscad/modeling'
 
-const { BinaryReader } = require('@jscad/io-utils')
+import { BinaryReader } from '@jscad/io-utils'
 
-const packageVersion = require('./package.json').version
+const pkgversion = '[VI]{version}[/VI]' // version is injected by rollup
 
 // STL function from http://jsfiddle.net/Riham/yzvGD/35/
 // CC BY-SA by Riham
@@ -33,7 +33,7 @@ const packageVersion = require('./package.json').version
 const deserialize = (options, stl) => {
   const defaults = {
     filename: 'stl',
-    version: packageVersion,
+    version: pkgversion,
     addMetaData: true,
     output: 'script'
   }
@@ -116,14 +116,12 @@ const formatAsJscad = (data, addMetaData, version, filename) => {
   //
   `
   }
-  code += 'const {primitives} = require(\'@jscad/modeling\')\n'
+  code += 'import * from \'@jscad/modeling\'\n'
   code += data.join('\n')
   code += `
-const main = () => {
+export const main = () => {
  return [${data.map((d, i) => `solid${i + 1}()`)}]
 }
-
-module.exports = {main}
 `
   return code
 }
@@ -248,10 +246,10 @@ const deserializeBinarySTL = (stl, filename, version, elementFormatter) => {
       // E2 = C - A
       // test = dot( Normal, cross( E1, E2 ) )
       // test > 0: cw, test < 0 : ccw
-      const e1 = maths.vec3.subtract(maths.vec3.create(), v2, v1)
-      const e2 = maths.vec3.subtract(maths.vec3.create(), v3, v1)
-      const cr = maths.vec3.cross(maths.vec3.create(), e1, e2)
-      const t = maths.vec3.dot(no, cr)
+      const e1 = vec3.subtract(vec3.create(), v2, v1)
+      const e2 = vec3.subtract(vec3.create(), v3, v1)
+      const cr = vec3.cross(vec3.create(), e1, e2)
+      const t = vec3.dot(no, cr)
       if (t > 0) { // 1,2,3 -> 3,2,1
         const tmp = v3
         v3 = v1
@@ -328,10 +326,10 @@ const deserializeAsciiSTL = (stl, filename, version, elementFormatter) => {
         // E2 = C - A
         // test = dot( Normal, cross( E1, E2 ) )
         // test > 0: cw, test < 0: ccw
-        const e1 = maths.vec3.subtract(maths.vec3.create(), v2, v1)
-        const e2 = maths.vec3.subtract(maths.vec3.create(), v3, v1)
-        const cr = maths.vec3.cross(maths.vec3.create(), e1, e2)
-        const t = maths.vec3.dot(no, cr)
+        const e1 = vec3.subtract(vec3.create(), v2, v1)
+        const e2 = vec3.subtract(vec3.create(), v3, v1)
+        const cr = vec3.cross(vec3.create(), e1, e2)
+        const t = vec3.dot(no, cr)
         if (t > 0) { // 1,2,3 -> 3,2,1
           const tmp = v3
           v3 = v1
@@ -369,7 +367,7 @@ const toPolyhedron = (points, faces, normals, colors) => {
     faces,
     colors
   }
-  return primitives.polyhedron(options)
+  return polyhedron(options)
 }
 
 /*
@@ -406,13 +404,13 @@ const solid${index} = () => {
   } else {
     src += '  const colors = null\n'
   }
-  src += '  return primitives.polyhedron({points, faces, colors, orientation: \'inside\'})\n}\n'
+  src += '  return polyhedron({points, faces, colors, orientation: \'inside\'})\n}\n'
   return src
 }
 
-const extension = 'stl'
+const mimeType = 'model/stl'
 
-module.exports = {
-  deserialize,
-  extension
+export {
+  mimeType,
+  deserialize
 }

package/tests/instantiate.test.js

@@ -1,12 +1,13 @@
-const fs = require('fs')
-const path = require('path')
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
 
-const { geometries } = require('@jscad/modeling')
+import test from 'ava'
 
-const deserializer = require('../index.js')
+import { geom3 } from '@jscad/modeling'
 
-const samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import { deserialize } from '../src/index.js'
+
+const samplesPath = '../../../node_modules/@jscad/sample-files'
 
 const toArray = (polygons) => polygons.map((p) => p.vertices.map((v) => ([v[0], v[1], v[2]])))
 
@@ -14,9 +15,9 @@ test('instantiate simple ascii stl to geometry', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/testcube_ascii.stl')
   const inputFile = fs.readFileSync(inputPath, 'utf8')
 
-  const observed = deserializer.deserialize({ output: 'geometry', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'geometry', addMetaData: false }, inputFile)
   t.is(observed.length, 1)
-  const polygons = geometries.geom3.toPolygons(observed[0])
+  const polygons = geom3.toPolygons(observed[0])
   t.deepEqual(polygons.length, 12) // 6 faces, 12 polygons
 
   const observedPolygons = toArray(polygons)
@@ -41,9 +42,9 @@ test('instantiate simple binary stl to geometry', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/testcube_10mm.stl')
   const inputFile = fs.readFileSync(inputPath)
 
-  const observed = deserializer.deserialize({ output: 'geometry', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'geometry', addMetaData: false }, inputFile)
   t.is(observed.length, 1)
-  const polygons = geometries.geom3.toPolygons(observed[0])
+  const polygons = geom3.toPolygons(observed[0])
   t.deepEqual(polygons.length, 12) // 6 faces, 12 polygons
 
   const observedPolygons = toArray(polygons)
@@ -68,9 +69,9 @@ test('instantiate medium complexity binary stl to geometry', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/pr2_head_tilt.stl')
   const inputFile = fs.readFileSync(inputPath)
 
-  const observed = deserializer.deserialize({ output: 'geometry', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'geometry', addMetaData: false }, inputFile)
   t.is(observed.length, 1)
-  const polygons = geometries.geom3.toPolygons(observed[0])
+  const polygons = geom3.toPolygons(observed[0])
   t.deepEqual(polygons.length, 1052)
 })
 
@@ -78,9 +79,9 @@ test('instantiate complex ascii stl to geometry', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/herringbone-gear-large.stl')
   const inputFile = fs.readFileSync(inputPath, 'utf8')
 
-  const observed = deserializer.deserialize({ output: 'geometry', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'geometry', addMetaData: false }, inputFile)
   t.is(observed.length, 1)
-  const polygons = geometries.geom3.toPolygons(observed[0])
+  const polygons = geom3.toPolygons(observed[0])
   t.deepEqual(polygons.length, 17742)
 })
 
@@ -88,8 +89,8 @@ test('instantiate complex binary stl to geometry', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/UM2CableChain_BedEnd.STL')
   const inputFile = fs.readFileSync(inputPath)
 
-  const observed = deserializer.deserialize({ output: 'geometry', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'geometry', addMetaData: false }, inputFile)
   t.is(observed.length, 1)
-  const polygons = geometries.geom3.toPolygons(observed[0])
+  const polygons = geom3.toPolygons(observed[0])
   t.deepEqual(polygons.length, 12744)
 })

package/tests/translate.test.js

@@ -1,10 +1,11 @@
-const fs = require('fs')
-const path = require('path')
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
 
-const deserializer = require('../index.js')
+import test from 'ava'
 
-const samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import { deserialize } from '../src/index.js'
+
+const samplesPath = '../../../node_modules/@jscad/sample-files'
 
 const countOf = (search, string) => {
   let count = 0
@@ -20,7 +21,7 @@ test('translate simple ascii stl to jscad code', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/testcube_ascii.stl')
   const inputFile = fs.readFileSync(inputPath, 'utf8')
 
-  const expected = `const {primitives} = require('@jscad/modeling')
+  const expected = `import * from '@jscad/modeling'
 
 //
 // solid 1 : 36 points, 12 faces, 0 colors
@@ -79,17 +80,15 @@ const solid1 = () => {
     [33,34,35],
   ]
   const colors = null
-  return primitives.polyhedron({points, faces, colors, orientation: 'inside'})
+  return polyhedron({points, faces, colors, orientation: 'inside'})
 }
 
-const main = () => {
+export const main = () => {
  return [solid1()]
 }
-
-module.exports = {main}
 `
 
-  const observed = deserializer.deserialize({ filename: 'ascii', output: 'script', addMetaData: false }, inputFile)
+  const observed = deserialize({ filename: 'ascii', output: 'script', addMetaData: false }, inputFile)
   t.deepEqual(observed, expected)
 })
 
@@ -97,7 +96,7 @@ test('translate simple binary stl to jscad script', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/testcube_10mm.stl')
   const inputFile = fs.readFileSync(inputPath)
 
-  const expected = `const {primitives} = require('@jscad/modeling')
+  const expected = `import * from '@jscad/modeling'
 
 //
 // solid 1 : 36 points, 12 faces, 0 colors
@@ -156,17 +155,15 @@ const solid1 = () => {
     [33,34,35],
   ]
   const colors = null
-  return primitives.polyhedron({points, faces, colors, orientation: 'inside'})
+  return polyhedron({points, faces, colors, orientation: 'inside'})
 }
 
-const main = () => {
+export const main = () => {
  return [solid1()]
 }
-
-module.exports = {main}
 `
 
-  const observed = deserializer.deserialize({ output: 'script', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'script', addMetaData: false }, inputFile)
   t.deepEqual(observed, expected)
 })
 
@@ -174,10 +171,10 @@ test('translate stl with colors to jscad script', (t) => {
   const inputPath = path.resolve(samplesPath, 'stl/colors.stl')
   const inputFile = fs.readFileSync(inputPath)
 
-  const observed = deserializer.deserialize({ output: 'script', addMetaData: false }, inputFile)
+  const observed = deserialize({ output: 'script', addMetaData: false }, inputFile)
   t.is(countOf('points', observed), 3) // comment, definition, useage
   t.is(countOf('faces', observed), 3)
   t.is(countOf('colors', observed), 3)
   t.is(countOf('colors = [', observed), 1)
-  t.is(countOf('primitives.polyhedron', observed), 1)
+  t.is(countOf('polyhedron', observed), 1)
 })