@jscad/svg-deserializer 3.0.1-alpha.0 → 3.0.3-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jscad/svg-deserializer",
-  "version": "3.0.1-alpha.0",
+  "version": "3.0.3-alpha.0",
   "description": "SVG Deserializer for JSCAD",
   "homepage": "https://openjscad.xyz/",
   "repository": "https://github.com/jscad/OpenJSCAD.org",
@@ -38,8 +38,8 @@
   "license": "MIT",
   "dependencies": {
     "@jscad/array-utils": "3.0.1-alpha.0",
-    "@jscad/io-utils": "3.0.1-alpha.0",
-    "@jscad/modeling": "3.0.1-alpha.0",
+    "@jscad/io-utils": "3.0.3-alpha.0",
+    "@jscad/modeling": "3.0.3-alpha.0",
     "saxes": "6.0.0"
   },
   "devDependencies": {
@@ -52,5 +52,5 @@
     "rollup-plugin-banner": "^0.2.1",
     "rollup-plugin-version-injector": "^1.3.3"
   },
-  "gitHead": "0660b5c1f1a5faf54d4cfae1cb85bb94182a8d32"
+  "gitHead": "b0a83db054ec02ccddd9e19e51f86bf30f72a69e"
 }

package/src/shapesMapGeometry.js

@@ -133,15 +133,22 @@ export const shapesMapGeometry = (obj, objectify, params) => {
       const listofpaths = expandPath(obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, svgGroups, segments, pathSelfClosed)
       // order is important
       const listofentries = Object.entries(listofpaths).sort((a, b) => a[0].localeCompare(b[0]))
-      const shapes = listofentries.map((entry) => {
-        const path = entry[1]
-        if (target === 'geom2' && path.isClosed) {
-          const points = path2.toPoints(path)
-          return geom2.create([points])
-        }
-        return path
-      })
-      return shapes
+      if (target === 'geom2') {
+        // concatenate all sides to a single geom2
+        const outlines = []
+        listofentries.forEach((entry) => {
+          const path = entry[1]
+          // discard unclosed paths
+          if (path.isClosed) {
+            const points = path2.toPoints(path)
+            outlines.push(points)
+          }
+        })
+        if (outlines.length === 0) return []
+        return geom2.create(outlines)
+      } else {
+        return listofentries.map((entry) => entry[1])
+      }
     }
   }
 
@@ -153,6 +160,18 @@ const appendPoints = (points, geometry) => {
   return path2.fromPoints({ }, points)
 }
 
+/*
+ * Expands the given SVG path object into a set of path segments.
+ * @param {object} obj - SVG path object to expand
+ * @param {number} svgUnitsPmm - SVG units per millimeter
+ * @param {number} svgUnitsX - X-axis SVG units
+ * @param {number} svgUnitsY - Y-axis SVG units
+ * @param {number} svgUnitsV - SVG units value
+ * @param {object} svgGroups - SVG groups object
+ * @param {number} segments - number of segments per 360 rotation
+ * @param {boolean} pathSelfClosed - Whether the path is self-closed
+ * @returns {object} a object containing the named paths
+ */
 const expandPath = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, svgGroups, segments, pathSelfClosed) => {
   const paths = {}
   const on = 'path'

package/tests/instantiate.test.js

@@ -326,9 +326,7 @@ test('deserialize : instantiate svg (path: with bezier) to objects', (t) => {
 </svg>`
 
   observed = deserialize({ output: 'geometry', target: 'geom2', addMetaData: false }, sourceSvg)
-  t.is(observed.length, 2)
-  shape = observed[0]
-  t.is(shape.points.length, 14) // open path
+  t.is(observed.length, 0) // open path
 
   observed = deserialize({ output: 'geometry', target: 'path', addMetaData: false }, sourceSvg)
   t.is(observed.length, 2)
@@ -344,9 +342,7 @@ test('deserialize : instantiate svg (path: with bezier) to objects', (t) => {
 </svg>`
 
   observed = deserialize({ output: 'geometry', target: 'geom2', addMetaData: false }, sourceSvg)
-  t.is(observed.length, 1)
-  shape = observed[0]
-  t.is(shape.points.length, 29) // open path
+  t.is(observed.length, 0) // open path
 
   observed = deserialize({ output: 'geometry', target: 'path', addMetaData: false }, sourceSvg)
   t.is(observed.length, 1)
@@ -420,13 +416,11 @@ test('deserialize : instantiate svg produced by inkscape to objects', (t) => {
 `
 
   let observed = deserialize({ filename: 'inkscape', output: 'geometry', target: 'geom2', addMetaData: false }, sourceSvg)
-  t.is(observed.length, 2)
+  t.is(observed.length, 1)
   let shape = observed[0]
-  t.is(shape.outlines.length, 1)
+  t.is(shape.outlines.length, 2)
   t.is(shape.outlines[0].length, 19)
-  shape = observed[1]
-  t.is(shape.outlines.length, 1)
-  t.is(shape.outlines[0].length, 20)
+  t.is(shape.outlines[1].length, 20)
 
   observed = deserialize({ output: 'geometry', target: 'path', addMetaData: false }, sourceSvg)
   t.is(observed.length, 2)
@@ -446,13 +440,11 @@ test('deserialize : instantiate shape with a hole to objects', (t) => {
 `
 
   let observed = deserialize({ output: 'geometry', target: 'geom2', addMetaData: false }, sourceSvg)
-  t.is(observed.length, 2)
+  t.is(observed.length, 1)
   let shape = observed[0]
-  t.is(shape.outlines.length, 1)
-  t.is(shape.outlines[0].length, 38)
-  shape = observed[1]
-  t.is(shape.outlines.length, 1)
+  t.is(shape.outlines.length, 2)
   t.is(shape.outlines[0].length, 38)
+  t.is(shape.outlines[1].length, 38)
 
   observed = deserialize({ output: 'geometry', target: 'path', addMetaData: false }, sourceSvg)
   t.is(observed.length, 2)
@@ -472,9 +464,9 @@ test('deserialize : instantiate shape with a nested hole to objects', (t) => {
 `
 
   let observed = deserialize({ output: 'geometry', target: 'geom2', addMetaData: false }, sourceSvg)
-  t.is(observed.length, 4)
+  t.is(observed.length, 1)
   let shape = observed[0]
-  t.is(shape.outlines.length, 1)
+  t.is(shape.outlines.length, 4)
   t.is(shape.outlines[0].length, 38)
 
   observed = deserialize({ output: 'geometry', target: 'path', addMetaData: false }, sourceSvg)