fix(svg-serializer): return array instead of single item (#60)

* Corrected return of serialize() to array
Use ES6 string templates
Slight reorg
* Updated expected results in test to reflect changes to serialize()

Author: z3dev

packages/svg-serializer/index.js

@@ -1,38 +1,9 @@
-// import { CSG } from '@jscad/csg'
 const {CSG} = require('@jscad/csg')
 const stringify = require('onml/lib/stringify')
 
 const mimeType = 'image/svg+xml'
 
-function dPath (path, xoffset, yoffset) {
-  var pointindex
-  var str = ''
-  var numpointsClosed = path.points.length + (path.closed ? 1 : 0)
-  for (pointindex = 0; pointindex < numpointsClosed; pointindex++) {
-    var pointindexwrapped = pointindex
-    if (pointindexwrapped >= path.points.length) pointindexwrapped -= path.points.length
-    var point = path.points[pointindexwrapped]
-    if (pointindex > 0) {
-      str += 'L' + (point.x + xoffset) + ' ' + (point.y + yoffset)
-    } else {
-      str += 'M' + (point.x + xoffset) + ' ' + (point.y + yoffset)
-    }
-  }
-  return str
-}
-
-function PathsToSvg (paths, bounds, options) {
-  // calculate offsets in order to create paths orientated from the 0,0 axis
-  var xoffset = 0 - bounds[0].x
-  var yoffset = 0 - bounds[0].y
-
-  return paths.reduce(function (res, path, i) {
-    options && options.statusCallback && options.statusCallback({progress: 100 * i / paths.length})
-    return res.concat([['path', {d: dPath(path, xoffset, yoffset)}]])
-  }, ['g'])
-}
-
-function serialize (cagObject, options) {
+const serialize = function (cagObject, options) {
   options && options.statusCallback && options.statusCallback({progress: 0})
   var decimals = 1000
 
@@ -58,13 +29,41 @@ function serialize (cagObject, options) {
     PathsToSvg(paths, bounds)
   ]
 
-  var svg = '<?xml version="1.0" encoding="UTF-8"?>\n'
-  svg += '<!-- Generated by OpenJSCAD.org -->\n'
-  svg += '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">\n'
-  svg += stringify(body)
+  var svg = `<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated by OpenJSCAD.org -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+${stringify(body)}`
 
   options && options.statusCallback && options.statusCallback({progress: 100})
-  return svg
+  return [svg]
+}
+
+const PathsToSvg = function (paths, bounds, options) {
+  // calculate offsets in order to create paths orientated from the 0,0 axis
+  var xoffset = 0 - bounds[0].x
+  var yoffset = 0 - bounds[0].y
+
+  return paths.reduce(function (res, path, i) {
+    options && options.statusCallback && options.statusCallback({progress: 100 * i / paths.length})
+    return res.concat([['path', {d: dPath(path, xoffset, yoffset)}]])
+  }, ['g'])
+}
+
+const dPath = function (path, xoffset, yoffset) {
+  var pointindex
+  var str = ''
+  var numpointsClosed = path.points.length + (path.closed ? 1 : 0)
+  for (pointindex = 0; pointindex < numpointsClosed; pointindex++) {
+    var pointindexwrapped = pointindex
+    if (pointindexwrapped >= path.points.length) pointindexwrapped -= path.points.length
+    var point = path.points[pointindexwrapped]
+    if (pointindex > 0) {
+      str += `L${(point.x + xoffset)} ${(point.y + yoffset)}`
+    } else {
+      str += `M${(point.x + xoffset)} ${(point.y + yoffset)}`
+    }
+  }
+  return str
 }
 
 module.exports = {

packages/svg-serializer/test.js

@@ -27,5 +27,5 @@ test('serialize ag/csg objects to svg (path: simple)', function (t) {
 `
 
   const observed = serializer.serialize(source(), undefined, {output: 'jscad', addMetaData: false})
-  t.deepEqual(expected, observed)
+  t.deepEqual([expected], observed)
 })