@jscad/svg-deserializer 2.5.5 → 3.0.0-alpha.0

package/src/shapesMapJscad.js

@@ -1,6 +1,6 @@
-const { svg2cag, cagLengthX, cagLengthY, cagLengthP, reflect } = require('./helpers')
+import { svg2cag, cagLengthX, cagLengthY, cagLengthP, reflect } from './helpers.js'
 
-const shapesMap = (obj, codify, params) => {
+export const shapesMapJscad = (obj, codify, params) => {
   const { level, indent, on, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, svgGroups, target, segments } = params
 
   const types = {
@@ -22,12 +22,12 @@ const shapesMap = (obj, codify, params) => {
         x = (x + (w / 2)).toFixed(4) // position the object via the center
         y = (y - (h / 2)).toFixed(4) // position the object via the center
         if (rx === 0) {
-          code = `${indent}${on} = primitives.rectangle({center: [${x}, ${y}], size: [${w}, ${h}]}) // line ${obj.position}\n`
+          code = `${indent}${on} = rectangle({center: [${x}, ${y}], size: [${w}, ${h}]}) // line ${obj.position}\n`
         } else {
-          code = `${indent}${on} = primitives.roundedRectangle({center: [${x}, ${y}], segments: ${segments}, size: [${w}, ${h}], roundRadius: ${rx}}) // line ${obj.position}\n`
+          code = `${indent}${on} = roundedRectangle({center: [${x}, ${y}], segments: ${segments}, size: [${w}, ${h}], roundRadius: ${rx}}) // line ${obj.position}\n`
         }
         if (target === 'path') {
-          code += `${indent}${on} = geometries.path2.fromPoints({closed: true}, geometries.geom2.toPoints(${on}))\n`
+          code += `${indent}${on} = path2.fromPoints({closed: true}, geom2.toPoints(${on}))\n`
         }
       }
       return code
@@ -39,9 +39,9 @@ const shapesMap = (obj, codify, params) => {
       const r = cagLengthP(obj.radius, svgUnitsPmm, svgUnitsV)
       let code
       if (r > 0) {
-        code = `${indent}${on} = primitives.circle({center: [${x}, ${y}], segments: ${segments}, radius: ${r}}) // line ${obj.position}\n`
+        code = `${indent}${on} = circle({center: [${x}, ${y}], segments: ${segments}, radius: ${r}}) // line ${obj.position}\n`
         if (target === 'path') {
-          code += `${indent}${on} = geometries.path2.fromPoints({closed: true}, geometries.geom2.toPoints(${on}))\n`
+          code += `${indent}${on} = path2.fromPoints({closed: true}, geom2.toPoints(${on}))\n`
         }
       }
       return code
@@ -54,9 +54,9 @@ const shapesMap = (obj, codify, params) => {
       const cy = (0 - cagLengthY(obj.cy, svgUnitsPmm, svgUnitsY))
       let code
       if (rx > 0 && ry > 0) {
-        code = `${indent}${on} = primitives.ellipse({center: [${cx}, ${cy}], segments: ${segments}, radius: [${rx}, ${ry}]}) // line ${obj.position}\n`
+        code = `${indent}${on} = ellipse({center: [${cx}, ${cy}], segments: ${segments}, radius: [${rx}, ${ry}]}) // line ${obj.position}\n`
         if (target === 'path') {
-          code += `${indent}${on} = geometries.path2.fromPoints({closed: true}, geometries.geom2.toPoints(${on}))\n`
+          code += `${indent}${on} = path2.fromPoints({closed: true}, geom2.toPoints(${on}))\n`
         }
       }
       return code
@@ -67,7 +67,7 @@ const shapesMap = (obj, codify, params) => {
       const y1 = (0 - cagLengthY(obj.y1, svgUnitsPmm, svgUnitsY))
       const x2 = cagLengthX(obj.x2, svgUnitsPmm, svgUnitsX)
       const y2 = (0 - cagLengthY(obj.y2, svgUnitsPmm, svgUnitsY))
-      const code = `${indent}${on} = primitives.line([[${x1}, ${y1}], [${x2}, ${y2}]]) // line ${obj.position}\n`
+      const code = `${indent}${on} = line([[${x1}, ${y1}], [${x2}, ${y2}]]) // line ${obj.position}\n`
       if (target === 'geom2') {
         // TODO expand the line to 2D geom
         // const r = getStrokeWidth(obj, svgUnitsPmm, svgUnitsV, svgGroups)
@@ -76,7 +76,7 @@ const shapesMap = (obj, codify, params) => {
     },
 
     polygon: (obj, svgUnitsPmm, svgUnitsX, svgUnitsY) => {
-      let code = `${indent}${on} = primitives.polygon({points: [\n`
+      let code = `${indent}${on} = polygon({points: [\n`
       for (let j = 0; j < obj.points.length; j++) {
         const p = obj.points[j]
         if ('x' in p && 'y' in p) {
@@ -87,13 +87,13 @@ const shapesMap = (obj, codify, params) => {
       }
       code += `${indent}]}) // line ${obj.position}\n`
       if (target === 'path') {
-        code += `${indent}${on} = geometries.path2.fromPoints({closed: true}, geometries.geom2.toPoints(${on}))\n`
+        code += `${indent}${on} = path2.fromPoints({closed: true}, geom2.toPoints(${on}))\n`
       }
       return code
     },
 
     polyline: (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV) => {
-      let code = `${indent}${on} = geometries.path2.fromPoints({}, [\n`
+      let code = `${indent}${on} = path2.fromPoints({}, [\n`
       for (let j = 0; j < obj.points.length; j++) {
         const p = obj.points[j]
         if ('x' in p && 'y' in p) {
@@ -116,8 +116,6 @@ const shapesMap = (obj, codify, params) => {
   return types[obj.type](obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGroups, segments)
 }
 
-module.exports = shapesMap
-
 // const getStrokeWidth = (obj, svgUnitsPmm, svgUnitsV, svgGroups) => {
 //   let r = cssPxUnit // default
 //   if ('strokeWidth' in obj) {
@@ -151,7 +149,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
   for (let j = 0; j < obj.commands.length; j++) {
     const co = obj.commands[j]
     const pts = co.p
-    // console.log('postion: ['+cx+','+cy+'] before '+co.c);
+    // console.log('position: ['+cx+','+cy+'] before '+co.c)
     switch (co.c) {
       case 'm': // relative move to X,Y
         // special case, if at beginning of path then treat like absolute M
@@ -169,14 +167,14 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           pi++
           pc = false
           pathName = on + pi
-          tmpCode += `${indent}${pathName} = geometries.path2.fromPoints({}, [[${svg2cag([cx, cy], svgUnitsPmm)}]])\n`
+          tmpCode += `${indent}${pathName} = path2.fromPoints({}, [[${svg2cag([cx, cy], svgUnitsPmm)}]])\n`
           sx = cx; sy = cy
         }
         // optional implicit relative lineTo (cf SVG spec 8.3.2)
         while (pts.length >= 2) {
           cx = cx + parseFloat(pts.shift())
           cy = cy + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([${svg2cag([cx, cy], svgUnitsPmm)}], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([${svg2cag([cx, cy], svgUnitsPmm)}], ${pathName})\n`
         }
         break
       case 'M': // absolute move to X,Y
@@ -191,14 +189,14 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           pi++
           pc = false
           pathName = on + pi
-          tmpCode += `${indent}${pathName} = geometries.path2.fromPoints({}, [[${svg2cag([cx, cy], svgUnitsPmm)}]])\n`
+          tmpCode += `${indent}${pathName} = path2.fromPoints({}, [[${svg2cag([cx, cy], svgUnitsPmm)}]])\n`
           sx = cx; sy = cy
         }
         // optional implicit absolute lineTo (cf SVG spec 8.3.2)
         while (pts.length >= 2) {
           cx = parseFloat(pts.shift())
           cy = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([${svg2cag([cx, cy], svgUnitsPmm)}], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([${svg2cag([cx, cy], svgUnitsPmm)}], ${pathName})\n`
         }
         break
       case 'a': // relative elliptical arc
@@ -210,7 +208,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           const sf = (pts.shift() === '1')
           cx = cx + parseFloat(pts.shift())
           cy = cy + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendArc({segments: ${segments}, endpoint: [${svg2cag([cx, cy], svgUnitsPmm)}], radius: [${svg2cag([rx, ry], svgUnitsPmm)}], xaxisrotation: ${ro}, clockwise: ${sf}, large: ${lf}}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendArc({segments: ${segments}, endpoint: [${svg2cag([cx, cy], svgUnitsPmm)}], radius: [${svg2cag([rx, ry], svgUnitsPmm)}], xaxisrotation: ${ro}, clockwise: ${sf}, large: ${lf}}, ${pathName})\n`
         }
         break
       case 'A': // absolute elliptical arc
@@ -222,7 +220,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           const sf = (pts.shift() === '1')
           cx = parseFloat(pts.shift())
           cy = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendArc({segments: ${segments}, endpoint: [${svg2cag([cx, cy], svgUnitsPmm)}], radius: [${svg2cag([rx, ry], svgUnitsPmm)}], xaxisrotation: ${ro}, clockwise: ${sf}, large: ${lf}}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendArc({segments: ${segments}, endpoint: [${svg2cag([cx, cy], svgUnitsPmm)}], radius: [${svg2cag([rx, ry], svgUnitsPmm)}], xaxisrotation: ${ro}, clockwise: ${sf}, large: ${lf}}, ${pathName})\n`
         }
         break
       case 'c': // relative cubic Bézier
@@ -233,7 +231,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           by = cy + parseFloat(pts.shift())
           cx = cx + parseFloat(pts.shift())
           cy = cy + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(bx, by, cx, cy)
           bx = rf[0]
           by = rf[1]
@@ -247,7 +245,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           by = parseFloat(pts.shift())
           cx = parseFloat(pts.shift())
           cy = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(bx, by, cx, cy)
           bx = rf[0]
           by = rf[1]
@@ -262,7 +260,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           cy = cy + parseFloat(pts.shift())
           const q1 = [p0[0] + (2/3) * (qx - p0[0]), p0[1] + (2/3) * (qy - p0[1])]
           const q2 = [q1[0] + (1/3) * (cx - p0[0]), q1[1] + (1/3) * (cy - p0[1])]
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(qx, qy, cx, cy)
           qx = rf[0]
           qy = rf[1]
@@ -277,7 +275,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           cy = parseFloat(pts.shift())
           const q1 = [p0[0] + (2/3) * (qx - p0[0]), p0[1] + (2/3) * (qy - p0[1])]
           const q2 = [q1[0] + (1/3) * (cx - p0[0]), q1[1] + (1/3) * (cy - p0[1])]
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(qx, qy, cx, cy)
           qx = rf[0]
           qy = rf[1]
@@ -290,7 +288,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           cy = cy + parseFloat(pts.shift())
           const q1 = [p0[0] + (2/3) * (qx - p0[0]), p0[1] + (2/3) * (qy - p0[1])]
           const q2 = [q1[0] + (1/3) * (cx - p0[0]), q1[1] + (1/3) * (cy - p0[1])]
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(qx, qy, cx, cy)
           qx = rf[0]
           qy = rf[1]
@@ -303,7 +301,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           cy = parseFloat(pts.shift())
           const q1 = [p0[0] + (2/3) * (qx - p0[0]), p0[1] + (2/3) * (qy - p0[1])]
           const q2 = [q1[0] + (1/3) * (cx - p0[0]), q1[1] + (1/3) * (cy - p0[1])]
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[[${svg2cag(q1, svgUnitsPmm)}], [${svg2cag(q2, svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(qx, qy, cx, cy)
           qx = rf[0]
           qy = rf[1]
@@ -317,7 +315,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           by = cy + parseFloat(pts.shift())
           cx = cx + parseFloat(pts.shift())
           cy = cy + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(bx, by, cx, cy)
           bx = rf[0]
           by = rf[1]
@@ -331,7 +329,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
           by = parseFloat(pts.shift())
           cx = parseFloat(pts.shift())
           cy = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendBezier({segments: ${segments}, controlPoints: [[${svg2cag([x1, y1], svgUnitsPmm)}], [${svg2cag([bx, by], svgUnitsPmm)}], [${svg2cag([cx, cy], svgUnitsPmm)}]]}, ${pathName})\n`
           const rf = reflect(bx, by, cx, cy)
           bx = rf[0]
           by = rf[1]
@@ -340,46 +338,46 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
       case 'h': // relative Horzontal line to
         while (pts.length >= 1) {
           cx = cx + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
         }
         break
       case 'H': // absolute Horzontal line to
         while (pts.length >= 1) {
           cx = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
         }
         break
       case 'l': // relative line to
         while (pts.length >= 2) {
           cx = cx + parseFloat(pts.shift())
           cy = cy + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
         }
         break
       case 'L': // absolute line to
         while (pts.length >= 2) {
           cx = parseFloat(pts.shift())
           cy = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
         }
         break
       case 'v': // relative Vertical line to
         while (pts.length >= 1) {
           cy = cy + parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
         }
         break
       case 'V': // absolute Vertical line to
         while (pts.length >= 1) {
           cy = parseFloat(pts.shift())
-          tmpCode += `${indent}${pathName} = geometries.path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
+          tmpCode += `${indent}${pathName} = path2.appendPoints([[${svg2cag([cx, cy], svgUnitsPmm)}]], ${pathName})\n`
         }
         break
       case 'z': // close current line
       case 'Z':
-        tmpCode += `${indent}${pathName} = geometries.path2.close(${pathName})\n`
+        tmpCode += `${indent}${pathName} = path2.close(${pathName})\n`
         if (target === 'geom2') {
-          tmpCode += `${indent}${pathName} = geometries.geom2.fromPoints(geometries.path2.toPoints(${pathName}))\n`
+          tmpCode += `${indent}${pathName} = geom2.create([path2.toPoints(${pathName})])\n`
         }
         tmpCode += `${indent}parts.push(${pathName})\n`
 
@@ -391,7 +389,7 @@ const path = (obj, svgUnitsPmm, svgUnitsX, svgUnitsY, svgUnitsV, params, svgGrou
         console.log('Warning: Unknow PATH command [' + co.c + ']')
         break
     }
-    // console.log('postion: ['+cx+','+cy+'] after '+co.c);
+    // console.log('postion: ['+cx+','+cy+'] after '+co.c)
   }
   if (pi > 0 && pc === false) {
     tmpCode += `${indent}parts.push(${pathName})\n`

package/src/svgElementHelpers.js

@@ -1,12 +1,12 @@
-const { cagColor, cssStyle, css2cag } = require('./helpers')
-const { pxPmm } = require('./constants')
+import { cagColor, cssStyle, css2cag } from './helpers.js'
+import { pxPmm } from './constants.js'
 
-const svgCore = (obj, element) => {
+export const svgCore = (obj, element) => {
   if ('id' in element) { obj.id = element.id }
   if ('position' in element) { obj.position = element.position }
 }
 
-const svgPresentation = (obj, element) => {
+export const svgPresentation = (obj, element) => {
   // presentation attributes for all
   if ('display' in element) { obj.visible = element.display }
   // presentation attributes for solids
@@ -95,7 +95,7 @@ const svgTransforms = (cag, element) => {
 
 const viewBoxRegExp = /([\d.-]+)[\s,]+([\d.-]+)[\s,]+([\d.-]+)[\s,]+([\d.-]+)/i
 
-const svgSvg = (element, { customPxPmm }) => {
+export const svgSvg = (element, { customPxPmm }) => {
   // default SVG with no viewport
   const obj = { type: 'svg', x: 0, y: 0, width: '100%', height: '100%', strokeWidth: '1' }
 
@@ -124,7 +124,7 @@ const svgSvg = (element, { customPxPmm }) => {
       let s = css2cag(obj.width, customPxPmm) // width in millimeters
       s = obj.viewW / s
       // scale the default units
-      // obj.unitsPmm[0] = obj.unitsPmm[0] * s;
+      // obj.unitsPmm[0] = obj.unitsPmm[0] * s
       obj.unitsPmm[0] = s
     } else {
       // scale the default units by the width (%)
@@ -136,7 +136,7 @@ const svgSvg = (element, { customPxPmm }) => {
       let s = css2cag(obj.height, pxPmm) // height in millimeters
       s = obj.viewH / s
       // scale the default units
-      // obj.unitsPmm[1] = obj.unitsPmm[1] * s;
+      // obj.unitsPmm[1] = obj.unitsPmm[1] * s
       obj.unitsPmm[1] = s
     } else {
       // scale the default units by the width (%)
@@ -160,7 +160,7 @@ const svgSvg = (element, { customPxPmm }) => {
   return obj
 }
 
-const svgEllipse = (element) => {
+export const svgEllipse = (element) => {
   const obj = { type: 'ellipse', cx: '0', cy: '0', rx: '0', ry: '0' }
   if ('cx' in element) { obj.cx = element.cx }
   if ('cy' in element) { obj.cy = element.cy }
@@ -175,7 +175,7 @@ const svgEllipse = (element) => {
   return obj
 }
 
-const svgLine = (element) => {
+export const svgLine = (element) => {
   const obj = { type: 'line', x1: '0', y1: '0', x2: '0', y2: '0' }
   if ('x1' in element) { obj.x1 = element.x1 }
   if ('y1' in element) { obj.y1 = element.y1 }
@@ -206,7 +206,7 @@ const svgListOfPoints = (list) => {
   return points
 }
 
-const svgPolyline = (element) => {
+export const svgPolyline = (element) => {
   const obj = { type: 'polyline' }
   // transforms
   svgTransforms(obj, element)
@@ -221,7 +221,7 @@ const svgPolyline = (element) => {
   return obj
 }
 
-const svgPolygon = (element) => {
+export const svgPolygon = (element) => {
   const obj = { type: 'polygon' }
   // transforms
   svgTransforms(obj, element)
@@ -236,7 +236,7 @@ const svgPolygon = (element) => {
   return obj
 }
 
-const svgRect = (element) => {
+export const svgRect = (element) => {
   const obj = { type: 'rect', x: '0', y: '0', rx: '0', ry: '0', width: '0', height: '0' }
 
   if ('x' in element) { obj.x = element.x }
@@ -263,7 +263,7 @@ const svgRect = (element) => {
   return obj
 }
 
-const svgCircle = (element) => {
+export const svgCircle = (element) => {
   const obj = { type: 'circle', x: '0', y: '0', radius: '0' }
 
   if ('cx' in element) { obj.x = element.cx }
@@ -278,7 +278,7 @@ const svgCircle = (element) => {
   return obj
 }
 
-const svgGroup = (element) => {
+export const svgGroup = (element) => {
   const obj = { type: 'group' }
   // transforms
   svgTransforms(obj, element)
@@ -304,7 +304,7 @@ const svgGroup = (element) => {
 //
 // Convert the PATH element into object representation
 //
-const svgPath = (element) => {
+export const svgPath = (element) => {
   const obj = { type: 'path' }
   // transforms
   svgTransforms(obj, element)
@@ -415,7 +415,7 @@ const svgPath = (element) => {
 // - append translate(x,y) if x,y available
 // deep clone the referenced OBJECT and add to group
 // - clone using JSON.parse(JSON.stringify(obj))
-const svgUse = (element, { svgObjects }) => {
+export const svgUse = (element, { svgObjects }) => {
   const obj = { type: 'group' }
   // transforms
   svgTransforms(obj, element)
@@ -447,18 +447,3 @@ const svgUse = (element, { svgObjects }) => {
   }
   return obj
 }
-
-module.exports = {
-  svgCore,
-  svgPresentation,
-  svgSvg,
-  svgRect,
-  svgCircle,
-  svgEllipse,
-  svgLine,
-  svgPolyline,
-  svgPolygon,
-  svgGroup,
-  svgPath,
-  svgUse
-}

package/tests/inkscape.test.js

@@ -1,10 +1,8 @@
-const test = require('ava')
+import test from 'ava'
 
-const countOf = require('../../test/helpers/countOf')
+import { countOf } from '../../test/helpers/countOf.js'
 
-const deserializer = require('../src/index.js')
-
-// deserializer
+import { deserialize } from '../src/index.js'
 
 test('deserialize : translate svg produced by inkscape to script', (t) => {
   const sourceSvg = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
@@ -52,13 +50,13 @@ test('deserialize : translate svg produced by inkscape to script', (t) => {
 </svg>
 `
 
-  let obs = deserializer.deserialize({ filename: 'inkscape', output: 'script', target: 'path', addMetaData: false }, sourceSvg)
+  let obs = deserialize({ filename: 'inkscape', output: 'script', target: 'path', addMetaData: false }, sourceSvg)
   t.is(typeof obs, 'string')
   t.is(countOf('path2.fromPoints', obs), 2)
   t.is(countOf('path2.close', obs), 2)
   t.is(countOf('color', obs), 5)
 
-  obs = deserializer.deserialize({ filename: 'inkscape', output: 'script', target: 'geom2', addMetaData: false }, sourceSvg)
+  obs = deserialize({ filename: 'inkscape', output: 'script', target: 'geom2', addMetaData: false }, sourceSvg)
   t.is(countOf('path2.fromPoints', obs), 2)
   t.is(countOf('path2.close', obs), 2)
   t.is(countOf('color', obs), 5)