1 files changed, 5 insertions, 128 deletions
diff --git a/src/types/PathArray.js b/src/types/PathArray.js
index b7c3c33..e021238 100644
--- a/src/types/PathArray.js
+++ b/src/types/PathArray.js
@@ -1,19 +1,7 @@
-import {
-  delimiter,
-  dots,
-  hyphen,
-  isPathLetter,
-  numbersWithDots,
-  pathLetters
-} from '../modules/core/regex.js'
-import Point from './Point.js'
 import SVGArray from './SVGArray.js'
 import parser from '../modules/core/parser.js'
 import Box from './Box.js'
-
-export function pathRegReplace (a, b, c, d) {
-  return c + d.replace(dots, ' .')
-}
+import { pathParser } from '../utils/pathParser.js'
 
 function arrayToString (a) {
   for (var i = 0, il = a.length, s = ''; i < il; i++) {
@@ -51,79 +39,6 @@ function arrayToString (a) {
   return s + ' '
 }
 
-const pathHandlers = {
-  M: function (c, p, p0) {
-    p.x = p0.x = c[0]
-    p.y = p0.y = c[1]
-
-    return [ 'M', p.x, p.y ]
-  },
-  L: function (c, p) {
-    p.x = c[0]
-    p.y = c[1]
-    return [ 'L', c[0], c[1] ]
-  },
-  H: function (c, p) {
-    p.x = c[0]
-    return [ 'H', c[0] ]
-  },
-  V: function (c, p) {
-    p.y = c[0]
-    return [ 'V', c[0] ]
-  },
-  C: function (c, p) {
-    p.x = c[4]
-    p.y = c[5]
-    return [ 'C', c[0], c[1], c[2], c[3], c[4], c[5] ]
-  },
-  S: function (c, p) {
-    p.x = c[2]
-    p.y = c[3]
-    return [ 'S', c[0], c[1], c[2], c[3] ]
-  },
-  Q: function (c, p) {
-    p.x = c[2]
-    p.y = c[3]
-    return [ 'Q', c[0], c[1], c[2], c[3] ]
-  },
-  T: function (c, p) {
-    p.x = c[0]
-    p.y = c[1]
-    return [ 'T', c[0], c[1] ]
-  },
-  Z: function (c, p, p0) {
-    p.x = p0.x
-    p.y = p0.y
-    return [ 'Z' ]
-  },
-  A: function (c, p) {
-    p.x = c[5]
-    p.y = c[6]
-    return [ 'A', c[0], c[1], c[2], c[3], c[4], c[5], c[6] ]
-  }
-}
-
-const mlhvqtcsaz = 'mlhvqtcsaz'.split('')
-
-for (var i = 0, il = mlhvqtcsaz.length; i < il; ++i) {
-  pathHandlers[mlhvqtcsaz[i]] = (function (i) {
-    return function (c, p, p0) {
-      if (i === 'H') c[0] = c[0] + p.x
-      else if (i === 'V') c[0] = c[0] + p.y
-      else if (i === 'A') {
-        c[5] = c[5] + p.x
-        c[6] = c[6] + p.y
-      } else {
-        for (var j = 0, jl = c.length; j < jl; ++j) {
-          c[j] = c[j] + (j % 2 ? p.y : p.x)
-        }
-      }
-
-      return pathHandlers[i](c, p, p0)
-    }
-  })(mlhvqtcsaz[i].toUpperCase())
-}
-
 export default class PathArray extends SVGArray {
   // Get bounding box of path
   bbox () {
@@ -173,50 +88,12 @@ export default class PathArray extends SVGArray {
   }
 
   // Absolutize and parse path to array
-  parse (array = [ 'M', 0, 0 ]) {
-    // prepare for parsing
-    var s
-    var paramCnt = { M: 2, L: 2, H: 1, V: 1, C: 6, S: 4, Q: 4, T: 2, A: 7, Z: 0 }
-
-    if (typeof array === 'string') {
-      array = array
-        .replace(numbersWithDots, pathRegReplace) // convert 45.123.123 to 45.123 .123
-        .replace(pathLetters, ' $& ') // put some room between letters and numbers
-        .replace(hyphen, '$1 -') // add space before hyphen
-        .trim() // trim
-        .split(delimiter) // split into array
-    } else {
-      // Flatten array
-      array = Array.prototype.concat.apply([], array)
+  parse (d = 'M0 0') {
+    if (Array.isArray(d)) {
+      d = Array.prototype.concat.apply([], d).toString()
     }
 
-    // array now is an array containing all parts of a path e.g. ['M', '0', '0', 'L', '30', '30' ...]
-    var result = []
-    var p = new Point()
-    var p0 = new Point()
-    var index = 0
-    var len = array.length
-
-    do {
-      // Test if we have a path letter
-      if (isPathLetter.test(array[index])) {
-        s = array[index]
-        ++index
-        // If last letter was a move command and we got no new, it defaults to [L]ine
-      } else if (s === 'M') {
-        s = 'L'
-      } else if (s === 'm') {
-        s = 'l'
-      }
-
-      result.push(pathHandlers[s].call(null,
-        array.slice(index, (index = index + paramCnt[s.toUpperCase()])).map(parseFloat),
-        p, p0
-      )
-      )
-    } while (len > index)
-
-    return result
+    return pathParser(d)
   }
 
   // Resize path string