@jscad/vtree 2.0.13 → 2.0.16

package/prototyping/examples/caching-test-vanilla.js

@@ -1,24 +1,20 @@
 const { cube, sphere } = require('@jscad/csg/api').primitives3d
-const { union, difference, intersection } = require('@jscad/csg/api').booleanOps
-const { translate, rotate, scale } = require('@jscad/csg/api').transformations
+const { union } = require('@jscad/csg/api').booleanOps
+const { translate } = require('@jscad/csg/api').transformations
 
-function foo () {
-  return [
-    cube(),
-    translate([13, 0, 0], cube()),
-    sphere({ fn: 128 })
-  ]
-}
+const foo = () => [
+  cube(),
+  translate([13, 0, 0], cube()),
+  sphere({ fn: 128 })
+]
 
-function main () {
-  return [
-    foo(),
-    cube(),
-    translate([13, 0, 0], cube()),
-    translate([0, 0, 2], sphere()),
-    union(cube(), sphere()),
-    sphere({ fn: 128 })
-  ]
-}
+const main = () => [
+  foo(),
+  cube(),
+  translate([13, 0, 0], cube()),
+  translate([0, 0, 2], sphere()),
+  union(cube(), sphere()),
+  sphere({ fn: 128 })
+]
 
 module.exports = main

package/prototyping/examples/caching-test-vtree-changed.js

@@ -1,27 +1,24 @@
 const {
   cube, sphere,
-  difference, intersection, union,
-  scale, rotate, translate
+  union,
+  rotate, translate
 } = require('../../core/index')
 
-function foo () {
-  return [
-    cube(),
-    translate([13, 0, 0], cube()),
-    sphere({ fn: 128 })
-  ]
-}
-function main () {
-  return [
-    foo(),
-    cube(),
-    translate([13, 0, 0], cube()),
-    translate([0, 0, 2], sphere()),
-    union(cube(), sphere()),
-    translate([23, 0, 0], cube()),
-    rotate([13, 0, 0], cube()),
-    sphere({ fn: 128 })
-  ]
-}
+const foo = () => [
+  cube(),
+  translate([13, 0, 0], cube()),
+  sphere({ fn: 128 })
+]
+
+const main = () => [
+  foo(),
+  cube(),
+  translate([13, 0, 0], cube()),
+  translate([0, 0, 2], sphere()),
+  union(cube(), sphere()),
+  translate([23, 0, 0], cube()),
+  rotate([13, 0, 0], cube()),
+  sphere({ fn: 128 })
+]
 
 module.exports = main

package/prototyping/examples/caching-test-vtree-changed2.js

@@ -1,25 +1,22 @@
 const {
   cube, sphere,
-  difference, intersection, union,
-  scale, rotate, translate
+  union,
+  rotate, translate
 } = require('../../core/index')
 
-function foo () {
-  return [
-    cube(),
-    translate([13, 0, 0], cube())
-  ]
-}
-function main () {
-  return [
-    foo(),
-    cube(),
-    translate([13, 0, 0], cube()),
-    translate([0, 0, 2], sphere()),
-    union(cube(), sphere()),
-    translate([23, 0, 0], cube()),
-    rotate([13, 0, 0], cube())
-  ]
-}
+const foo = () => [
+  cube(),
+  translate([13, 0, 0], cube())
+]
+
+const main = () => [
+  foo(),
+  cube(),
+  translate([13, 0, 0], cube()),
+  translate([0, 0, 2], sphere()),
+  union(cube(), sphere()),
+  translate([23, 0, 0], cube()),
+  rotate([13, 0, 0], cube())
+]
 
 module.exports = main

package/prototyping/examples/caching-test-vtree.js

@@ -1,26 +1,22 @@
 const {
   cube, sphere,
-  difference, intersection, union,
-  scale, rotate, translate
+  union,
+  translate
 } = require('../../core/index')
 
-function foo () {
-  return [
-    cube(),
-    translate([13, 0, 0], cube()),
-    sphere({ fn: 128 })
-  ]
-}
+const foo = () => [
+  cube(),
+  translate([13, 0, 0], cube()),
+  sphere({ fn: 128 })
+]
 
-function main () {
-  return [
-    foo(),
-    cube(),
-    translate([13, 0, 0], cube()),
-    translate([0, 0, 2], sphere()),
-    union(cube(), sphere()),
-    sphere({ fn: 128 })
-  ]
-}
+const main = () => [
+  foo(),
+  cube(),
+  translate([13, 0, 0], cube()),
+  translate([0, 0, 2], sphere()),
+  union(cube(), sphere()),
+  sphere({ fn: 128 })
+]
 
 module.exports = main

package/prototyping/examples/caching-test.js

@@ -1,14 +1,12 @@
-// not that API is injected so it is independant of implementation ! (vanilla vs vtree)
-function main (api) {
-  const { cube, sphere, difference, intersection, union, scale, rotate, translate } = api
+// note that API is injected so it is independent of implementation ! (vanilla vs vtree)
+const main = (api) => {
+  const { cube, sphere, union, translate } = api
 
-  function foo () {
-    return [
-      cube(),
-      translate([13, 0, 0], cube()),
-      sphere({ fn: 128 })
-    ]
-  }
+  const foo = () => [
+    cube(),
+    translate([13, 0, 0], cube()),
+    sphere({ fn: 128 })
+  ]
 
   return [
     foo(),

package/prototyping/examples/complex-base.js

@@ -1,38 +1,31 @@
 const { cube, sphere } = require('@jscad/csg/api').primitives3d
-const { union, difference, intersection } = require('@jscad/csg/api').booleanOps
-const { translate, rotate, scale } = require('@jscad/csg/api').transformations
+const { difference } = require('@jscad/csg/api').booleanOps
+const { translate } = require('@jscad/csg/api').transformations
 
-function aCoolPart () {
-  return [
-    cube({ name: 'c1' }),
-    translate([13, 0, 0], cube({ name: 's1' })),
-    translate([0, 0, 2], sphere({ name: 's2' }))
-  ]
-}
+const aCoolPart = () => [
+  cube({ name: 'c1' }),
+  translate([13, 0, 0], cube({ name: 's1' })),
+  translate([0, 0, 2], sphere({ name: 's2' }))
+]
 
-function anotherCoolPart () {
-  return difference(
-    cube({ name: 'c2', size: 1, center: true }),
-    sphere({ name: 's3', r: 0.6, fn: 128 })
-  )
-}
+const anotherCoolPart = () => difference(
+  cube({ name: 'c2', size: 1, center: true }),
+  sphere({ name: 's3', r: 0.6, fn: 128 })
+)
 
-function wowPart () {
-  return { type: 'part', children: [cube(), sphere()] }
-}
+const wowPart = () => ({ type: 'part', children: [cube(), sphere()] })
 
-const flatten = arr =>
+const flatten = (arr) =>
   arr.reduce(
     (flat, toFlatten) => flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten),
     []
   )
 
-function main () {
-  return flatten([
-    translate([0, 5, 0], aCoolPart()),
-    anotherCoolPart(),
-    anotherCoolPart()
-  ])
-}
+const main = () => flatten([
+  translate([0, 5, 0], aCoolPart()),
+  anotherCoolPart(),
+  anotherCoolPart(),
+  wowPart()
+])
 
 module.exports = main

package/prototyping/examples/complex-vtree-changed.js

@@ -1,40 +1,33 @@
 const {
   cube, sphere,
-  difference, intersection, union,
-  scale, rotate, translate
+  difference,
+  translate
 } = require('../../core/index')
 
-function aCoolPart () {
-  return [
-    cube({ name: 'c1' }),
-    translate([13, 0, 0], cube({ name: 's1' })),
-    translate([0, 0, 2], sphere({ name: 's2' }))
-  ]
-}
+const aCoolPart = () => [
+  cube({ name: 'c1' }),
+  translate([13, 0, 0], cube({ name: 's1' })),
+  translate([0, 0, 2], sphere({ name: 's2' }))
+]
 
-function anotherCoolPart () {
-  return difference(
-    cube({ name: 'c2', size: 1, center: true }),
-    sphere({ name: 's3', r: 0.6, fn: 128 })
-  )
-}
+const anotherCoolPart = () => difference(
+  cube({ name: 'c2', size: 1, center: true }),
+  sphere({ name: 's3', r: 0.6, fn: 128 })
+)
 
-function wowPart () {
-  return { type: 'part', children: [cube(), sphere()] }
-}
+const wowPart = () => ({ type: 'part', children: [cube(), sphere()] })
 
-const flatten = arr =>
+const flatten = (arr) =>
   arr.reduce(
     (flat, toFlatten) => flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten),
     []
   )
 
-function main () {
-  return flatten([
-    translate([0, 5, 0], aCoolPart()),
-    anotherCoolPart(),
-    anotherCoolPart()
-  ])
-}
+const main = () => flatten([
+  translate([0, 5, 0], aCoolPart()),
+  anotherCoolPart(),
+  anotherCoolPart(),
+  wowPart()
+])
 
 module.exports = main

package/prototyping/examples/complex-vtree.js

@@ -1,39 +1,32 @@
 const {
   cube, sphere,
-  difference, intersection, union,
-  scale, rotate, translate
+  difference,
+  translate
 } = require('../../core/index')
 
-function aCoolPart () {
-  return [
-    cube({ name: 'c1' }),
-    translate([3, 0, 0], cube({ name: 's1' })),
-    translate([0, 0, 2], sphere({ name: 's2' }))
-  ]
-}
+const aCoolPart = () => [
+  cube({ name: 'c1' }),
+  translate([3, 0, 0], cube({ name: 's1' })),
+  translate([0, 0, 2], sphere({ name: 's2' }))
+]
 
-function anotherCoolPart () {
-  return difference(
-    cube({ name: 'c2', size: 1, center: true }),
-    sphere({ name: 's3', r: 0.6, fn: 128 })
-  )
-}
+const anotherCoolPart = () => difference(
+  cube({ name: 'c2', size: 1, center: true }),
+  sphere({ name: 's3', r: 0.6, fn: 128 })
+)
 
-function wowPart () {
-  return { type: 'part', children: [cube(), sphere()] }
-}
+const wowPart = () => ({ type: 'part', children: [cube(), sphere()] })
 
-const flatten = arr =>
+const flatten = (arr) =>
   arr.reduce(
     (flat, toFlatten) => flat.concat(Array.isArray(toFlatten) ? flatten(toFlatten) : toFlatten),
     []
   )
 
-function main () {
-  return flatten([
-    translate([0, 5, 0], aCoolPart()),
-    anotherCoolPart()
-  ])
-}
+const main = () => flatten([
+  translate([0, 5, 0], aCoolPart()),
+  anotherCoolPart(),
+  wowPart()
+])
 
 module.exports = main

package/prototyping/examples/logo-base.js

@@ -1,17 +1,15 @@
 const { cube, sphere } = require('@jscad/csg/api').primitives3d
 const { union, difference, intersection } = require('@jscad/csg/api').booleanOps
 
-function main () {
-  return union(
-    difference(
-      cube({ size: 3, center: true }),
-      sphere({ r: 2, center: true })
-    ),
-    intersection(
-      sphere({ r: 1.3, center: true }),
-      cube({ size: 2.1, center: true })
-    )
+const main = () => union(
+  difference(
+    cube({ size: 3, center: true }),
+    sphere({ r: 2, center: true })
+  ),
+  intersection(
+    sphere({ r: 1.3, center: true }),
+    cube({ size: 2.1, center: true })
   )
-}
+)
 
 module.exports = main

package/prototyping/examples/logo-vtree.js

@@ -1,16 +1,14 @@
 const { cube, sphere, difference, intersection, union } = require('../../core/index')
 
-function main () {
-  return union(
-    difference(
-      cube({ size: 3, center: true }),
-      sphere({ r: 2, center: true })
-    ),
-    intersection(
-      sphere({ r: 1.3, center: true }),
-      cube({ size: 2.1, center: true })
-    )
+const main = () => union(
+  difference(
+    cube({ size: 3, center: true }),
+    sphere({ r: 2, center: true })
+  ),
+  intersection(
+    sphere({ r: 1.3, center: true }),
+    cube({ size: 2.1, center: true })
   )
-}
+)
 
 module.exports = main

package/prototyping/examples/shapes-array-base.js

@@ -1,7 +1,5 @@
 const { cube, sphere } = require('@jscad/csg/api').primitives3d
 
-function main () {
-  return [cube(), sphere()]
-}
+const main = () => [cube(), sphere()]
 
 module.exports = main

package/prototyping/examples/shapes-array-nested-vtree.js

@@ -1,19 +1,21 @@
-const { cube, sphere, difference, intersection, union } = require('../../core/index')
+const { cube, sphere, union } = require('../../core/index')
 
-function aCoolPart () {
-  return [cube({ name: 'c1' }), cube({ name: 's1' }), sphere({ name: 's2' })]
-}
+const aCoolPart = () => [
+  cube({ name: 'c1' }),
+  cube({ name: 's1' }),
+  sphere({ name: 's2' })
+]
 
-function anotherCoolPart () {
-  return union(cube({ name: 'c2' }), sphere({ name: 's3' }))
-}
+const anotherCoolPart = () => union(cube({ name: 'c2' }), sphere({ name: 's3' }))
 
-function wowPart () {
-  return { type: 'part', children: [cube(), sphere()] }
-}
+const wowPart = () => ({ type: 'part', children: [cube(), sphere()] })
 
-function main () {
-  return [cube({ name: 'c3' }), sphere({ name: 's4' }), aCoolPart(), anotherCoolPart(), wowPart()]
-}
+const main = () => [
+  cube({ name: 'c3' }),
+  sphere({ name: 's4' }),
+  aCoolPart(),
+  anotherCoolPart(),
+  wowPart()
+]
 
 module.exports = main

package/prototyping/examples/shapes-array-vtree.js

@@ -1,7 +1,5 @@
-const { cube, sphere, difference, intersection, union } = require('../../core/index')
+const { cube, sphere } = require('../../core/index')
 
-function main () {
-  return [cube(), sphere()]
-}
+const main = () => [cube(), sphere()]
 
 module.exports = main

package/prototyping/examples/single-shape-vtree.js

@@ -1,7 +1,5 @@
 const { cube } = require('../../core/index')
 
-function main () {
-  return cube({ size: 3, center: true })
-}
+const main = () => cube({ size: 3, center: true })
 
 module.exports = main

package/prototyping/examples/transforms-vtree.js

@@ -1,15 +1,12 @@
 const {
-  cube, sphere,
-  difference, intersection, union,
+  cube,
   scale, rotate, translate
 } = require('../../core/index')
 
-function main () {
-  return [
-    translate([0, 5, 0], cube({ size: 10 })),
-    scale([1, 2, 1], rotate([0, 10, 0], cube({ size: 10 }))),
-    cube({ size: 10 })
-  ]
-}
+const main = () => [
+  translate([0, 5, 0], cube({ size: 10 })),
+  scale([1, 2, 1], rotate([0, 10, 0], cube({ size: 10 }))),
+  cube({ size: 10 })
+]
 
 module.exports = main

package/prototyping/examples/union-base.js

@@ -1,8 +1,6 @@
 const { cube } = require('@jscad/csg/api').primitives3d
 const { union } = require('@jscad/csg/api').booleanOps
 
-function main () {
-  return union([cube(), cube()])
-}
+const main = () => union([cube(), cube()])
 
 module.exports = main

package/prototyping/examples/union-vtree.js

@@ -1,7 +1,5 @@
 const { cube, union } = require('../../core/index')
 
-function main () {
-  return union([cube(), cube()])
-}
+const main = () => union([cube(), cube()])
 
 module.exports = main

package/prototyping/io/deserializeGeometryCache.js

@@ -2,7 +2,7 @@ const serialize = require('serialize-to-js')
 
 const deserializeGeometryCache = (cache) => {
   const data = {}
-  Object.keys(cache).map(function (key) {
+  Object.keys(cache).map((key) => {
     data[key] = cache[key]// .toCompactBinary()
   })
   /* results.forEach(function (result) {

package/prototyping/io/serializeGeometryCache.js

@@ -8,7 +8,7 @@ const serializeGeometryCache = (cache) => {
     fs.mkdirSync(cachePath)
   }
   const data = {}
-  Object.keys(cache).map(function (key) {
+  Object.keys(cache).map((key) => {
     data[key] = cache[key]// .toCompactBinary()
   })
   /* results.forEach(function (result) {

package/prototyping/runBenchmark.js

@@ -1,7 +1,7 @@
 // const decache = require('decache')
 const child_process = require('child_process')
 
-function runBenchMark (runFn, name, runs = 10) {
+const runBenchMark = (runFn, name, runs = 10) => {
   console.log('running benchmarks for ' + name + ' ' + runs + ' times')
 
   // first verify they all have the same output
@@ -17,7 +17,7 @@ function runBenchMark (runFn, name, runs = 10) {
   runPass(runFn, runs, name)
 }
 
-function spawnBenchMark (path, runs = 100) {
+const spawnBenchMark = (path, runs = 100) => {
   const usage = require('usage')
   const cpuNumbers = []
   const memNumbers = []
@@ -25,8 +25,8 @@ function spawnBenchMark (path, runs = 100) {
   const process = child_process.spawn('node', [path, runs])
 
   const pid = process.pid // you can use any valid PID instead
-  const measureInterval = setInterval(function () {
-    usage.lookup(pid, function (err, result) {
+  const measureInterval = setInterval(() => {
+    usage.lookup(pid, (err, result) => {
       if (err) {
         console.log('error?', err)
       }
@@ -37,15 +37,15 @@ function spawnBenchMark (path, runs = 100) {
     })
   }, 1000)
 
-  process.stdout.on('data', function (data) {
+  process.stdout.on('data', (data) => {
     console.log('' + data)
   })
 
-  process.stderr.on('data', function (data) {
+  process.stderr.on('data', (data) => {
     console.log('' + data)
   })
 
-  process.on('close', function (code) {
+  process.on('close', (code) => {
     // console.log('Child process is exiting with exit code: ' + code)
     clearInterval(measureInterval)
 
@@ -62,7 +62,7 @@ const runPass = (runFn, runs, name) => {
   let start
 
   const numbers = []
-  for (var i = 0; i < runs; i++) {
+  for (let i = 0; i < runs; i++) {
     // decache(moduleName)
 
     start = process.hrtime()
@@ -76,7 +76,7 @@ const runPass = (runFn, runs, name) => {
   // console.log(name + process.hrtime(start)[0] + ' s, ' + elapsed.toFixed(precision) + ' ms - ')
 }
 
-const median = sequence => {
+const median = (sequence) => {
   sequence.sort() // note that direction doesn't matter
   return sequence[Math.ceil(sequence.length / 2)]
 }