@jscad/svg-serializer 2.3.18 → 3.0.1-alpha.0

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

@@ -1,21 +1,3 @@
-/*
-JSCAD Object to SVG Format Serialization
-
-## License
-
-Copyright (c) 2018 JSCAD Organization https://github.com/jscad
-
-All code released under MIT license
-
-Notes:
-1) geom2 conversion to:
-     SVG GROUP containing a continous SVG PATH that contains the outlines of the geometry
-2) geom3 conversion to:
-     none
-3) path2 conversion to:
-     SVG GROUP containing a SVG PATH for each path
-*/
-
 /**
  * Serializer of JSCAD geometries to SVG source (XML).
  *
@@ -31,11 +13,11 @@ Notes:
  * const { serializer, mimeType } = require('@jscad/svg-serializer')
  */
 
-const { geometries, maths, measurements, utils } = require('@jscad/modeling')
+import { geom2, flatten, measureBoundingBox, path2, vec3 } from '@jscad/modeling'
 
-const stringify = require('onml/lib/stringify')
+import { stringify } from '@jscad/io-utils'
 
-const version = require('./package.json').version
+const version = '[VI]{version}[/VI]' // version is injected by rollup
 
 const mimeType = 'image/svg+xml'
 
@@ -61,10 +43,10 @@ const serialize = (options, ...objects) => {
   }
   options = Object.assign({}, defaults, options)
 
-  objects = utils.flatten(objects)
+  objects = flatten(objects)
 
   // convert only 2D geometries
-  const objects2d = objects.filter((object) => geometries.geom2.isA(object) || geometries.path2.isA(object))
+  const objects2d = objects.filter((object) => geom2.isA(object) || path2.isA(object))
 
   if (objects2d.length === 0) throw new Error('only 2D geometries can be serialized to SVG')
   if (objects.length !== objects2d.length) console.warn('some objects could not be serialized to SVG')
@@ -112,14 +94,14 @@ ${stringify(body, 2)}`
  * Measure the bounds of the given objects, which is required to offset all points to positive X/Y values.
  */
 const getBounds = (objects) => {
-  const allbounds = measurements.measureBoundingBox(objects)
+  const allbounds = measureBoundingBox(objects)
 
   if (objects.length === 1) return allbounds
 
   // create a sum of the bounds
   const sumofbounds = allbounds.reduce((sum, bounds) => {
-    maths.vec3.min(sum[0], sum[0], bounds[0])
-    maths.vec3.max(sum[1], sum[1], bounds[1])
+    vec3.min(sum[0], sum[0], bounds[0])
+    vec3.max(sum[1], sum[1], bounds[1])
     return sum
   }, [[0, 0, 0], [0, 0, 0]])
   return sumofbounds
@@ -133,10 +115,10 @@ const convertObjects = (objects, bounds, options) => {
   objects.forEach((object, i) => {
     options.statusCallback && options.statusCallback({ progress: 100 * i / objects.length })
 
-    if (geometries.geom2.isA(object)) {
+    if (geom2.isA(object)) {
       contents.push(convertGeom2(object, [xoffset, yoffset], options))
     }
-    if (geometries.path2.isA(object)) {
+    if (path2.isA(object)) {
       contents.push(convertPaths([object], [xoffset, yoffset], options))
     }
   })
@@ -153,8 +135,8 @@ const reflect = (x, y, px, py) => {
 }
 
 const convertGeom2 = (object, offsets, options) => {
-  const outlines = geometries.geom2.toOutlines(object)
-  const paths = outlines.map((outline) => geometries.path2.fromPoints({ closed: true }, outline))
+  const outlines = geom2.toOutlines(object)
+  const paths = outlines.map((outline) => path2.fromPoints({ closed: true }, outline))
 
   options.color = 'black' // SVG initial color
   if (object.color) options.color = convertColor(object.color)
@@ -203,9 +185,9 @@ const convertPath = (path, offsets, options) => {
   return str
 }
 
-const convertColor = (color) => `rgba(${color[0] * 255},${color[1] * 255},${color[2] * 255},${color[3]})`
+const convertColor = (color) => `rgb(${color[0] * 255},${color[1] * 255},${color[2] * 255},${color[3] * 255})`
 
-module.exports = {
-  serialize,
-  mimeType
+export {
+  mimeType,
+  serialize
 }

package/tests/geom2.test.js

@@ -1,63 +1,64 @@
-const test = require('ava')
+import test from 'ava'
 
-const { colors, geometries, primitives, transforms } = require('@jscad/modeling')
+import { center, colorize, geom2, rectangle } from '@jscad/modeling'
 
-const serializer = require('../index.js')
+import { serialize } from '../src/index.js'
 
 test('serialize 2D geometries (simple) to svg', (t) => {
-  const cag1 = geometries.geom2.create()
+  const cag1 = geom2.create()
 
-  const observed1 = serializer.serialize({}, cag1)
+  const observed1 = serialize({}, cag1)
   t.deepEqual([expected1], observed1)
 
-  const cag2 = primitives.rectangle({ size: [10, 20] })
+  const cag2 = rectangle({ size: [10, 20] })
 
-  const observed2 = serializer.serialize({}, cag2)
+  const observed2 = serialize({}, cag2)
   t.deepEqual([expected2], observed2)
 
-  const cag3 = transforms.center({ relativeTo: [-30, -30, 0] }, primitives.rectangle({ size: [10, 20] }))
-  const cag4 = transforms.center({ relativeTo: [30, 30, 0] }, primitives.rectangle({ size: [10, 20] }))
+  const cag3 = center({ relativeTo: [-30, -30, 0] }, rectangle({ size: [10, 20] }))
+  const cag4 = center({ relativeTo: [30, 30, 0] }, rectangle({ size: [10, 20] }))
 
-  const observed3 = serializer.serialize({}, cag3, cag4)
+  const observed3 = serialize({}, cag3, cag4)
   t.deepEqual([expected3], observed3)
 })
 
 test('serialize 2D geometries (color) to svg', (t) => {
-  let cag2 = primitives.rectangle({ size: [10, 20] })
-  cag2 = colors.colorize([0.5, 0.5, 0.5, 0.5], cag2)
+  let cag2 = rectangle({ size: [10, 20] })
+  cag2 = colorize([0.5, 0.5, 0.5, 0.5], cag2)
   cag2.id = 'r2'
   cag2.class = 'gray-rect'
 
-  const observed2 = serializer.serialize({}, cag2)
+  const observed2 = serialize({}, cag2)
   t.deepEqual([expected4], observed2)
 })
 
 test('serialize 2D geometries (complex) to svg', (t) => {
-  let shape = geometries.geom2.create([
-    [[-75.00000, 75.00000], [-75.00000, -75.00000]],
-    [[-75.00000, -75.00000], [75.00000, -75.00000]],
-    [[75.00000, -75.00000], [75.00000, 75.00000]],
-    [[-40.00000, 75.00000], [-75.00000, 75.00000]],
-    [[75.00000, 75.00000], [40.00000, 75.00000]],
-    [[40.00000, 75.00000], [40.00000, 0.00000]],
-    [[40.00000, 0.00000], [-40.00000, 0.00000]],
-    [[-40.00000, 0.00000], [-40.00000, 75.00000]],
-    [[15.00000, -10.00000], [15.00000, -40.00000]],
-    [[-15.00000, -10.00000], [15.00000, -10.00000]],
-    [[-15.00000, -40.00000], [-15.00000, -10.00000]],
-    [[-8.00000, -40.00000], [-15.00000, -40.00000]],
-    [[15.00000, -40.00000], [8.00000, -40.00000]],
-    [[-8.00000, -25.00000], [-8.00000, -40.00000]],
-    [[8.00000, -25.00000], [-8.00000, -25.00000]],
-    [[8.00000, -40.00000], [8.00000, -25.00000]],
-    [[-2.00000, -15.00000], [-2.00000, -19.00000]],
-    [[-2.00000, -19.00000], [2.00000, -19.00000]],
-    [[2.00000, -19.00000], [2.00000, -15.00000]],
-    [[2.00000, -15.00000], [-2.00000, -15.00000]]
+  let shape = geom2.create([
+    [
+      [-75, -75],
+      [75, -75],
+      [75, 75],
+      [40, 75],
+      [40, 0],
+      [-40, 0],
+      [-40, 75],
+      [-75, 75]
+    ],
+    [
+      [15, -40],
+      [8, -40],
+      [8, -25],
+      [-8, -25],
+      [-8, -40],
+      [-15, -40],
+      [-15, -10],
+      [15, -10]
+    ],
+    [[-2, -19], [2, -19], [2, -15], [-2, -15]]
   ])
-  shape = colors.colorize([0.5, 0.5, 0.5, 0.5], shape)
+  shape = colorize([0.5, 0.5, 0.5, 0.5], shape)
 
-  const observed = serializer.serialize({}, shape)
+  const observed = serialize({}, shape)
   t.deepEqual([expected5], observed)
 })
 
@@ -99,7 +100,7 @@ const expected4 = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg width="10mm" height="20mm" viewBox="0 0 10 20" fill="none" fill-rule="evenodd" stroke-width="0.1px" version="1.1" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g>
-    <path fill="rgba(127.5,127.5,127.5,0.5)" d="M0 20L10 20L10 0L0 0L0 20" id="r2" class="gray-rect"/>
+    <path fill="rgb(127.5,127.5,127.5,127.5)" d="M0 20L10 20L10 0L0 0L0 20" id="r2" class="gray-rect"/>
   </g>
 </svg>
 `
@@ -109,7 +110,7 @@ const expected5 = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg width="150mm" height="150mm" viewBox="0 0 150 150" fill="none" fill-rule="evenodd" stroke-width="0.1px" version="1.1" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g>
-    <path fill="rgba(127.5,127.5,127.5,0.5)" d="M0 150L150 150L150 0L115 0L115 75L35 75L35 0L0 0L0 150M90 115L83 115L83 100L67 100L67 115L60 115L60 85L90 85L90 115M73 94L77 94L77 90L73 90L73 94"/>
+    <path fill="rgb(127.5,127.5,127.5,127.5)" d="M0 150L150 150L150 0L115 0L115 75L35 75L35 0L0 0L0 150M90 115L83 115L83 100L67 100L67 115L60 115L60 85L90 85L90 115M73 94L77 94L77 90L73 90L73 94"/>
   </g>
 </svg>
 `

package/tests/path2.test.js

@@ -1,34 +1,34 @@
-const test = require('ava')
+import test from 'ava'
 
-const { colors, geometries, primitives } = require('@jscad/modeling')
+import { colorize, line, path2 } from '@jscad/modeling'
 
-const serializer = require('../index.js')
+import { serialize } from '../src/index.js'
 
 test('serialize 2D path (simple) objects to svg', (t) => {
   // simple open path
-  const object1 = primitives.line([[0, 0], [1, 1], [-3, 3]])
-  let observed = serializer.serialize({}, object1)
+  const object1 = line([[0, 0], [1, 1], [-3, 3]])
+  let observed = serialize({}, object1)
   t.deepEqual(observed, [expected1])
 
   // simple closed path
-  let object3 = geometries.path2.fromPoints({}, [
+  let object3 = path2.fromPoints({}, [
     [42.33333, 0],
     [21.166665, -56.44443999999999],
     [63.49999499999999, -56.44443999999999]
   ])
-  object3 = geometries.path2.close(object3)
+  object3 = path2.close(object3)
 
-  observed = serializer.serialize({}, object3)
+  observed = serialize({}, object3)
   t.deepEqual(observed, [expected3])
 })
 
 test('serialize 2D path (color) objects to svg', (t) => {
   // simple open path
-  let object1 = primitives.line([[0, 0], [1, 1], [-3, 3]])
-  object1 = colors.colorize([0.5, 0.5, 0.5, 0.5], object1)
+  let object1 = line([[0, 0], [1, 1], [-3, 3]])
+  object1 = colorize([0.5, 0.5, 0.5, 0.5], object1)
   object1.id = 'l1'
   object1.class = 'gray-line'
-  const observed = serializer.serialize({}, object1)
+  const observed = serialize({}, object1)
   t.deepEqual(observed, [expected4])
 })
 
@@ -61,7 +61,7 @@ const expected4 = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
 <svg width="4mm" height="3mm" viewBox="0 0 4 3" fill="none" fill-rule="evenodd" stroke-width="0.1px" version="1.1" baseProfile="tiny" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <g>
-    <path d="M3 3L4 2L0 0" stroke="rgba(127.5,127.5,127.5,0.5)" id="l1" class="gray-line"/>
+    <path d="M3 3L4 2L0 0" stroke="rgb(127.5,127.5,127.5,127.5)" id="l1" class="gray-line"/>
   </g>
 </svg>
 `