@jscad/obj-deserializer 2.0.30 → 3.0.1-alpha.0

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

@@ -1,7 +1,7 @@
-const { colors, primitives } = require('@jscad/modeling')
-const { ensureString } = require('@jscad/io-utils')
+import { ensureString } from '@jscad/io-utils'
+import { colorNameToRgb, polyhedron } from '@jscad/modeling'
 
-const version = require('./package.json').version
+const version = '[VI]{version}[/VI]' // version is injected by rollup
 
 /**
  * Deserializer of OBJ data to JSCAD geometries.
@@ -33,10 +33,9 @@ const deserialize = (options, input) => {
   options = Object.assign({}, defaults, options)
   const { output } = options
 
-  input = ensureString(input)
-
   options && options.statusCallback && options.statusCallback({ progress: 0 })
 
+  input = ensureString(input)
   const { positions, groups } = getGroups(input, options)
 
   const result = output === 'script' ? stringify(positions, groups, options) : objectify(positions, groups, options)
@@ -88,7 +87,7 @@ const getGroups = (data, options) => {
     material = null
     if (values && values.length > 0) {
       // try to convert the material to a color by name
-      const c = colors.colorNameToRgb(values[0])
+      const c = colorNameToRgb(values[0])
       if (c) material = [c[0], c[1], c[2], 1] // add alpha
     }
   }
@@ -127,7 +126,7 @@ const getGroups = (data, options) => {
 }
 
 const objectify = (points, groups, options) => {
-  const geometries = groups.map((group) => primitives.polyhedron({ orientation: options.orientation, points, faces: group.faces, colors: group.colors }))
+  const geometries = groups.map((group) => polyhedron({ orientation: options.orientation, points, faces: group.faces, colors: group.colors }))
   return geometries
 }
 
@@ -176,7 +175,7 @@ const translateGroupsToFunctions = (groups, options) => {
     code += `const group${index} = (points) => {
 ${translateFaces(faces)}
 ${translateColors(colors)}
-  return primitives.polyhedron({ orientation: '${options.orientation}', points, faces, colors })
+  return polyhedron({ orientation: '${options.orientation}', points, faces, colors })
 }
 `
   })
@@ -196,11 +195,11 @@ const stringify = (positions, groups, options) => {
     : ''
 
   // create the main function, with a list of points and translated groups
-  code += `const {primitives} = require('@jscad/modeling')
+  code += `import * from '@jscad/modeling'
 
 // groups: ${groups.length}
 // points: ${positions.length}
-const main = () => {
+export const main = () => {
   // points are common to all geometries
 ${translatePoints(positions)}
 
@@ -210,16 +209,15 @@ ${translateGroupsToCalls(groups)}  ]
 }
 
 ${translateGroupsToFunctions(groups, options)}
-module.exports = {main}
 `
 
   // create a function for each group
   return code
 }
 
-const extension = 'obj'
+const mimeType = 'model/obj'
 
-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 samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import test from 'ava'
 
-const { geometries } = require('@jscad/modeling')
+import { geom3 } from '@jscad/modeling'
 
-const deserializer = require('../index.js')
+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('deserialize simple obj to geometry', (t) => {
   const inputPath = path.resolve(samplesPath, 'obj/cube.obj')
   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, 6)
 
   const observedVertices = toArray(polygons)

package/tests/translate.test.js

@@ -1,21 +1,22 @@
-const fs = require('fs')
-const path = require('path')
-const test = require('ava')
+import fs from 'fs'
+import path from 'path'
 
-const samplesPath = path.dirname(require.resolve('@jscad/sample-files/package.json'))
+import test from 'ava'
 
-const deserializer = require('../index.js')
+import { deserialize } from '../src/index.js'
+
+const samplesPath = '../../../node_modules/@jscad/sample-files'
 
 test('translate simple obj file to jscad script', (t) => {
   const inputPath = path.resolve(samplesPath, 'obj/cube.obj')
   const inputFile = fs.readFileSync(inputPath, 'utf8')
 
-  const observed = deserializer.deserialize({ output: 'script', addMetaData: false }, inputFile)
-  const expected = `const {primitives} = require('@jscad/modeling')
+  const observed = deserialize({ output: 'script', addMetaData: false }, inputFile)
+  const expected = `import * from '@jscad/modeling'
 
 // groups: 1
 // points: 8
-const main = () => {
+export const main = () => {
   // points are common to all geometries
   let points = [
     [-0.5,-0.5,0.5],
@@ -54,10 +55,9 @@ const group0 = (points) => {
     null,
     null,
   ]
-  return primitives.polyhedron({ orientation: 'outward', points, faces, colors })
+  return polyhedron({ orientation: 'outward', points, faces, colors })
 }
 
-module.exports = {main}
 `
 
   t.deepEqual(observed, expected)
@@ -82,12 +82,12 @@ f 5 1 4 8
 f 5 6 2 1
 f 2 6 7 3
 `
-  const observed = deserializer.deserialize({ filename: 'absolute', output: 'script', addMetaData: false }, data)
-  const expected = `const {primitives} = require('@jscad/modeling')
+  const observed = deserialize({ filename: 'absolute', output: 'script', addMetaData: false }, data)
+  const expected = `import * from '@jscad/modeling'
 
 // groups: 1
 // points: 8
-const main = () => {
+export const main = () => {
   // points are common to all geometries
   let points = [
     [0,2,2],
@@ -126,10 +126,9 @@ const group0 = (points) => {
     [0,0.5019607843137255,0.5019607843137255,1],
     [0,0.5019607843137255,0.5019607843137255,1],
   ]
-  return primitives.polyhedron({ orientation: 'outward', points, faces, colors })
+  return polyhedron({ orientation: 'outward', points, faces, colors })
 }
 
-module.exports = {main}
 `
 
   t.deepEqual(observed, expected)
@@ -168,12 +167,12 @@ v 2.000000 0.000000 0.000000
 v 2.000000 0.000000 2.000000
 f -4 -3 -2 -1
 `
-  const observed = deserializer.deserialize({ output: 'script', addMetaData: false }, data)
-  const expected = `const {primitives} = require('@jscad/modeling')
+  const observed = deserialize({ output: 'script', addMetaData: false }, data)
+  const expected = `import * from '@jscad/modeling'
 
 // groups: 1
 // points: 24
-const main = () => {
+export const main = () => {
   // points are common to all geometries
   let points = [
     [0,2,2],
@@ -228,10 +227,9 @@ const group0 = (points) => {
     null,
     null,
   ]
-  return primitives.polyhedron({ orientation: 'outward', points, faces, colors })
+  return polyhedron({ orientation: 'outward', points, faces, colors })
 }
 
-module.exports = {main}
 `
   t.deepEqual(observed, expected)
 })