svg-path-commander 2.1.1 → 2.1.2

package/src/util/getPathArea.ts

@@ -1,5 +1,5 @@
 import pathToCurve from '../convert/pathToCurve';
-import type { PointTuple, PathArray, QuadCoordinates } from '../types';
+import type { PointTuple, PathArray } from '../types';
 
 /**
  * Returns the area of a single cubic-bezier segment.
@@ -60,7 +60,7 @@ const getPathArea = (path: PathArray) => {
           [, x, y] = seg;
           return 0;
         default:
-          len = getCubicSegArea(x, y, ...(seg.slice(1) as QuadCoordinates));
+          len = getCubicSegArea(x, y, seg[1], seg[2], seg[3], seg[4], seg[5], seg[6]);
           [x, y] = seg.slice(-2) as PointTuple;
           return len;
       }

package/src/util/getPathBBox.ts

@@ -1,23 +1,13 @@
 import iterate from '../process/iterate';
 import { PathBBox } from '../interface';
-import {
-  ArcCoordinates,
-  CubicCoordinates,
-  LineCoordinates,
-  MSegment,
-  PathArray,
-  Point,
-  PointTuple,
-  QuadCoordinates,
-} from '../types';
-// import pathFactory from './pathFactory';
-import absolutizeSegment from '../process/absolutizeSegment';
-import normalizeSegment from '../process/normalizeSegment';
-import parsePathString from '../parser/parsePathString';
+import { MSegment, PathArray, Point } from '../types';
 import { getLineBBox } from '../math/lineTools';
 import { getArcBBox } from '../math/arcTools';
 import { getCubicBBox } from '../math/cubicTools';
 import { getQuadBBox } from '../math/quadTools';
+import parsePathString from '../parser/parsePathString';
+import paramsParser from '../parser/paramsParser';
+import normalizeSegment from '../process/normalizeSegment';
 
 const getPathBBox = (pathInput: PathArray | string) => {
   if (!pathInput) {
@@ -37,58 +27,51 @@ const getPathBBox = (pathInput: PathArray | string) => {
   const path = parsePathString(pathInput);
   let data = [] as number[];
   let pathCommand = 'M';
-  let x = 0;
-  let y = 0;
+  const x = 0;
+  const y = 0;
   let mx = 0;
   let my = 0;
   const MIN = [] as Point[];
   const MAX = [] as Point[];
   let min = { x, y };
   let max = { x, y };
+  const params = { ...paramsParser };
 
-  iterate(path, (seg, params) => {
-    const absoluteSegment = absolutizeSegment(seg, params);
-    const normalSegment = normalizeSegment(absoluteSegment, params);
-    [pathCommand] = normalSegment;
-    data = [x, y, ...normalSegment.slice(1)] as number[];
+  iterate(path, (seg, _, lastX, lastY) => {
+    params.x = lastX;
+    params.y = lastY;
+    const result = normalizeSegment(seg, params);
+    [pathCommand] = result;
+    data = [lastX, lastY].concat(result.slice(1) as number[]);
 
     // this segment is always ZERO
     /* istanbul ignore else @preserve */
     if (pathCommand === 'M') {
       // remember mx, my for Z
-      [, mx, my] = normalSegment as MSegment;
+      [, mx, my] = result as MSegment;
       min = { x: mx, y: my };
       max = { x: mx, y: my };
     } else if (pathCommand === 'L') {
-      ({ min, max } = getLineBBox(...(data as LineCoordinates)));
+      ({ min, max } = getLineBBox(data[0], data[1], data[2], data[3]));
     } else if (pathCommand === 'A') {
-      ({ min, max } = getArcBBox(...(data as ArcCoordinates)));
+      ({ min, max } = getArcBBox(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8]));
     } else if (pathCommand === 'C') {
-      ({ min, max } = getCubicBBox(...(data as CubicCoordinates)));
+      ({ min, max } = getCubicBBox(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]));
     } else if (pathCommand === 'Q') {
-      ({ min, max } = getQuadBBox(...(data as QuadCoordinates)));
+      ({ min, max } = getQuadBBox(data[0], data[1], data[2], data[3], data[4], data[5]));
     } else if (pathCommand === 'Z') {
-      data = [x, y, mx, my];
-      ({ min, max } = getLineBBox(...(data as LineCoordinates)));
+      data = [lastX, lastY, mx, my];
+      ({ min, max } = getLineBBox(data[0], data[1], data[2], data[3]));
     }
 
     MIN.push(min);
     MAX.push(max);
 
-    if (pathCommand === 'Z') {
-      x = mx;
-      y = my;
-    } else {
-      [x, y] = normalSegment.slice(-2) as PointTuple;
-
-      if (pathCommand === 'M') {
-        mx = x;
-        my = y;
-      }
-    }
-    params.x = x;
-    params.y = y;
-    return normalSegment;
+    const seglen = result.length;
+    params.x1 = +result[seglen - 2];
+    params.y1 = +result[seglen - 1];
+    params.x2 = +result[seglen - 4] || params.x1;
+    params.y2 = +result[seglen - 3] || params.y1;
   });
 
   const xMin = Math.min(...MIN.map(n => n.x));

package/src/util/getPointAtLength.ts

@@ -1,21 +1,11 @@
 import DISTANCE_EPSILON from './distanceEpsilon';
-import parsePathString from '../parser/parsePathString';
-import type {
-  ArcCoordinates,
-  CubicCoordinates,
-  LineCoordinates,
-  MSegment,
-  PathArray,
-  PointTuple,
-  QuadCoordinates,
-} from '../types';
+import type { MSegment, PathArray, PointTuple } from '../types';
 import iterate from '../process/iterate';
-import absolutizeSegment from '../process/absolutizeSegment';
-import normalizeSegment from '../process/normalizeSegment';
 import { getLineLength, getPointAtLineLength } from '../math/lineTools';
 import { getArcLength, getPointAtArcLength } from '../math/arcTools';
 import { getCubicLength, getPointAtCubicLength } from '../math/cubicTools';
 import { getQuadLength, getPointAtQuadLength } from '../math/quadTools';
+import normalizePath from '../process/normalizePath';
 
 /**
  * Returns [x,y] coordinates of a point at a given length of a shape.
@@ -25,7 +15,7 @@ import { getQuadLength, getPointAtQuadLength } from '../math/quadTools';
  * @returns the requested {x, y} point coordinates
  */
 const getPointAtLength = (pathInput: string | PathArray, distance?: number) => {
-  const path = parsePathString(pathInput);
+  const path = normalizePath(pathInput);
   let isM = false;
   let data = [] as number[];
   let pathCommand = 'M';
@@ -38,18 +28,13 @@ const getPointAtLength = (pathInput: string | PathArray, distance?: number) => {
   let POINT = point;
   let totalLength = 0;
 
-  if (!distanceIsNumber) return point;
+  if (!distanceIsNumber || distance < DISTANCE_EPSILON) return point;
 
-  if (distance < DISTANCE_EPSILON) {
-    POINT = point;
-  }
-
-  iterate(path, (seg, params) => {
-    const absoluteSegment = absolutizeSegment(seg, params);
-    const normalSegment = normalizeSegment(absoluteSegment, params);
-    [pathCommand] = normalSegment;
+  // for (let i = 0; i < pathLen; i += 1) {
+  iterate(path, (seg, _, lastX, lastY) => {
+    [pathCommand] = seg;
     isM = pathCommand === 'M';
-    data = !isM ? [x, y, ...(normalSegment.slice(1) as number[])] : data;
+    data = !isM ? [lastX, lastY].concat(seg.slice(1) as number[]) : data;
 
     // this segment is always ZERO
     /* istanbul ignore else @preserve */
@@ -59,50 +44,67 @@ const getPointAtLength = (pathInput: string | PathArray, distance?: number) => {
       point = { x: mx, y: my };
       length = 0;
     } else if (pathCommand === 'L') {
-      point = getPointAtLineLength(...(data as LineCoordinates), distance - totalLength);
-      length = getLineLength(...(data as LineCoordinates));
+      point = getPointAtLineLength(data[0], data[1], data[2], data[3], distance - totalLength);
+      length = getLineLength(data[0], data[1], data[2], data[3]);
     } else if (pathCommand === 'A') {
-      point = getPointAtArcLength(...(data as ArcCoordinates), distance - totalLength);
-      length = getArcLength(...(data as ArcCoordinates));
+      point = getPointAtArcLength(
+        data[0],
+        data[1],
+        data[2],
+        data[3],
+        data[4],
+        data[5],
+        data[6],
+        data[7],
+        data[8],
+        distance - totalLength,
+      );
+      length = getArcLength(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8]);
     } else if (pathCommand === 'C') {
-      point = getPointAtCubicLength(...(data as CubicCoordinates), distance - totalLength);
-      length = getCubicLength(...(data as CubicCoordinates));
+      point = getPointAtCubicLength(
+        data[0],
+        data[1],
+        data[2],
+        data[3],
+        data[4],
+        data[5],
+        data[6],
+        data[7],
+        distance - totalLength,
+      );
+      length = getCubicLength(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
     } else if (pathCommand === 'Q') {
-      point = getPointAtQuadLength(...(data as QuadCoordinates), distance - totalLength);
-      length = getQuadLength(...(data as QuadCoordinates));
+      point = getPointAtQuadLength(data[0], data[1], data[2], data[3], data[4], data[5], distance - totalLength);
+      length = getQuadLength(data[0], data[1], data[2], data[3], data[4], data[5]);
     } else if (pathCommand === 'Z') {
-      data = [x, y, mx, my];
+      data = [lastX, lastY, mx, my];
       point = { x: mx, y: my };
-      length = getLineLength(...(data as LineCoordinates));
+
+      length = getLineLength(data[0], data[1], data[2], data[3]);
     }
 
-    if (totalLength < distance && totalLength + length >= distance) {
+    [x, y] = data.slice(-2);
+
+    if (totalLength < distance) {
       POINT = point;
+    } else {
+      // totalLength >= distance
+      // stop right here
+      // stop iterator now!
+      return false;
     }
 
     totalLength += length;
-    if (pathCommand === 'Z') {
-      x = mx;
-      y = my;
-    } else {
-      [x, y] = normalSegment.slice(-2) as PointTuple;
-
-      if (pathCommand === 'M') {
-        mx = x;
-        my = y;
-      }
-    }
-    params.x = x;
-    params.y = y;
-    return normalSegment;
+    return;
   });
 
   // native `getPointAtLength` behavior when the given distance
   // is higher than total length
   if (distance > totalLength - DISTANCE_EPSILON) {
-    POINT = { x, y };
+    return { x, y };
   }
 
   return POINT;
 };
+
 export default getPointAtLength;

package/src/util/getPropertiesAtLength.ts

@@ -1,4 +1,4 @@
-import type { PointTuple, PathArray, PathSegment } from '../types';
+import type { PathArray, PathSegment } from '../types';
 import type { SegmentProperties } from '../interface';
 import parsePathString from '../parser/parsePathString';
 import getTotalLength from './getTotalLength';
@@ -20,8 +20,6 @@ const getPropertiesAtLength = (pathInput: string | PathArray, distance?: number)
   let lengthAtSegment = 0;
   let length = 0;
   let segment = pathArray[0] as PathSegment;
-  const [x, y] = segment.slice(-2) as PointTuple;
-  const point = { x, y };
 
   // If the path is empty, return 0.
   if (index <= 0 || !distance || !Number.isFinite(distance)) {
@@ -29,7 +27,6 @@ const getPropertiesAtLength = (pathInput: string | PathArray, distance?: number)
       segment,
       index: 0,
       length,
-      point,
       lengthAtSegment,
     };
   }
@@ -38,8 +35,9 @@ const getPropertiesAtLength = (pathInput: string | PathArray, distance?: number)
     pathTemp = pathArray.slice(0, -1) as PathArray;
     lengthAtSegment = getTotalLength(pathTemp);
     length = pathLength - lengthAtSegment;
+    segment = pathArray[index];
     return {
-      segment: pathArray[index],
+      segment,
       index,
       length,
       lengthAtSegment,
@@ -53,6 +51,7 @@ const getPropertiesAtLength = (pathInput: string | PathArray, distance?: number)
     lengthAtSegment = getTotalLength(pathTemp);
     length = pathLength - lengthAtSegment;
     pathLength = lengthAtSegment;
+
     segments.push({
       segment,
       index,

package/src/util/getPropertiesAtPoint.ts

@@ -1,4 +1,4 @@
-import type { PathArray } from '../types';
+import type { PathArray, Point } from '../types';
 import type { PointProperties } from '../interface';
 import getPointAtLength from './getPointAtLength';
 import getPropertiesAtLength from './getPropertiesAtLength';
@@ -16,17 +16,17 @@ import normalizePath from '../process/normalizePath';
  * @param point the given point
  * @returns the requested properties
  */
-const getPropertiesAtPoint = (pathInput: string | PathArray, point: { x: number; y: number }): PointProperties => {
+const getPropertiesAtPoint = (pathInput: string | PathArray, point: Point): PointProperties => {
   const path = parsePathString(pathInput);
   const normalPath = normalizePath(path);
-  const pathLength = getTotalLength(path);
-  const distanceTo = (p: { x: number; y: number }) => {
+  const pathLength = getTotalLength(normalPath);
+  const distanceTo = (p: Point) => {
     const dx = p.x - point.x;
     const dy = p.y - point.y;
     return dx * dx + dy * dy;
   };
   let precision = 8;
-  let scan: { x: number; y: number };
+  let scan: Point;
   let closest = { x: 0, y: 0 }; // make TS happy
   let scanDistance = 0;
   let bestLength = 0;

package/src/util/getTotalLength.ts

@@ -1,21 +1,13 @@
-import parsePathString from '../parser/parsePathString';
-import type {
-  ArcCoordinates,
-  CubicCoordinates,
-  LineCoordinates,
-  MSegment,
-  PathArray,
-  PointTuple,
-  QuadCoordinates,
-} from '../types';
+import type { MSegment, PathArray } from '../types';
 import { getLineLength } from '../math/lineTools';
 import { getArcLength } from '../math/arcTools';
 import { getCubicLength } from '../math/cubicTools';
 import { getQuadLength } from '../math/quadTools';
 import iterate from '../process/iterate';
-import absolutizeSegment from '../process/absolutizeSegment';
+// import normalizePath from '../process/normalizePath';
+import parsePathString from '../parser/parsePathString';
+import paramsParser from '../parser/paramsParser';
 import normalizeSegment from '../process/normalizeSegment';
-// import pathFactory from './pathFactory';
 
 /**
  * Returns the shape total length, or the equivalent to `shape.getTotalLength()`.
@@ -28,53 +20,46 @@ import normalizeSegment from '../process/normalizeSegment';
  */
 const getTotalLength = (pathInput: string | PathArray) => {
   const path = parsePathString(pathInput);
+  const params = { ...paramsParser };
+
   let isM = false;
   let data = [] as number[];
   let pathCommand = 'M';
-  let x = 0;
-  let y = 0;
   let mx = 0;
   let my = 0;
   let totalLength = 0;
 
-  iterate(path, (seg, params) => {
-    const absoluteSegment = absolutizeSegment(seg, params);
-    const normalSegment = normalizeSegment(absoluteSegment, params);
+  iterate(path, (seg, _, lastX, lastY) => {
+    params.x = lastX;
+    params.y = lastY;
+    const normalSegment = normalizeSegment(seg, params);
     [pathCommand] = normalSegment;
     isM = pathCommand === 'M';
-    data = !isM ? [x, y, ...(normalSegment.slice(1) as number[])] : data;
+    data = !isM ? [lastX, lastY].concat(normalSegment.slice(1) as number[]) : data;
 
     // this segment is always ZERO
     /* istanbul ignore else @preserve */
     if (isM) {
       // remember mx, my for Z
-      [, mx, my] = seg as MSegment;
+      [, mx, my] = normalSegment as MSegment;
     } else if (pathCommand === 'L') {
-      totalLength += getLineLength(...(data as LineCoordinates));
+      totalLength += getLineLength(data[0], data[1], data[2], data[3]);
     } else if (pathCommand === 'A') {
-      totalLength += getArcLength(...(data as ArcCoordinates));
+      totalLength += getArcLength(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7], data[8]);
     } else if (pathCommand === 'C') {
-      totalLength += getCubicLength(...(data as CubicCoordinates));
+      totalLength += getCubicLength(data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
     } else if (pathCommand === 'Q') {
-      totalLength += getQuadLength(...(data as QuadCoordinates));
+      totalLength += getQuadLength(data[0], data[1], data[2], data[3], data[4], data[5]);
     } else if (pathCommand === 'Z') {
-      data = [x, y, mx, my];
-      totalLength += getLineLength(...(data as LineCoordinates));
+      data = [lastX, lastY, mx, my];
+      totalLength += getLineLength(data[0], data[1], data[2], data[3]);
     }
-    if (pathCommand === 'Z') {
-      x = mx;
-      y = my;
-    } else {
-      [x, y] = normalSegment.slice(-2) as PointTuple;
 
-      if (isM) {
-        mx = x;
-        my = y;
-      }
-    }
-    params.x = x;
-    params.y = y;
-    return normalSegment;
+    const seglen = normalSegment.length;
+    params.x1 = +normalSegment[seglen - 2];
+    params.y1 = +normalSegment[seglen - 1];
+    params.x2 = +normalSegment[seglen - 4] || params.x1;
+    params.y2 = +normalSegment[seglen - 3] || params.y1;
   });
 
   return totalLength;

package/test/class.test.ts

@@ -283,6 +283,8 @@ a1.63 1.63 0 0 0 -0.906 0.274a1.63 1.63 0 0 0 -0.601 0.73a1.63 1.63 0 0 0 -0.094
 
     path.setAttribute('d', rect.toString());
     expect(path.getAttribute('d')).to.equal('M2 0A2 2 0 0 0 0 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2V2A2 2 0 0 0 14 0H2z');
+    // add at least one round: 'off' test
+    expect(new SVGPathCommander(simpleShapes.normalized[2], { round: 'off' }).optimize().toString()).to.equal(simpleShapes.initial[2]);
   });
 
   it('Test reverse single path', async () => {

package/test/fixtures/shapes.js

@@ -20,12 +20,12 @@ const shapes = {
     "M8.66 8.66L8.66 4.66L7.34 4.66L7.34 8.66L8.65 8.66ZM8.66 11.34L8.66 10L7.34 10L7.34 11.34L8.65 11.34ZM8 1.34Q10.75 1.34 12.7 3.29Q14.65 5.24 14.66 8Q14.67 10.76 12.71 12.7Q10.75 14.64 8 14.66Q5.25 14.68 3.3 12.7Q1.35 10.72 1.34 8Q1.33 5.28 3.3 3.3Q5.27 1.32 8 1.34Z"
   ],
   optimized: [
-    "M16 8C16 4.13 12.42 1 8 1S0 4.13 0 8c0 1.76 0.74 3.37 1.97 4.6c-0.1 1.02 -0.42 2.13 -0.77 2.97c-0.08 0.18 0.07 0.39 0.27 0.36c2.26 -0.37 3.6 -0.94 4.18 -1.24A9.06 9.06 0 0 0 8 15c4.42 0 8 -3.13 8 -7zM7.19 6.77c0.09 0.12 0.17 0.26 0.23 0.4c0.43 0.94 0.39 2.37 -0.94 3.7a0.45 0.45 0 0 1 -0.61 0.01A0.41 0.41 0 0 1 5.86 10.29C6.27 9.88 6.53 9.46 6.67 9.07C6.4 9.24 6.08 9.33 5.74 9.33C4.78 9.33 4 8.59 4 7.67S4.78 6 5.73 6c0.28 0 0.53 0.06 0.76 0.17l0.01 0c0.17 0.07 0.32 0.18 0.47 0.32c0.08 0.09 0.16 0.18 0.22 0.28zM11 9.07c-0.27 0.17 -0.59 0.26 -0.93 0.26C9.11 9.33 8.34 8.59 8.34 7.67S9.11 6 10.07 6c0.27 0 0.53 0.06 0.75 0.17l0.01 0C11 6.24 11.16 6.35 11.3 6.49c0.09 0.09 0.16 0.18 0.23 0.27c0.08 0.13 0.16 0.26 0.22 0.4c0.43 0.95 0.4 2.38 -0.94 3.71a0.45 0.45 0 0 1 -0.61 0.01a0.41 0.41 0 0 1 -0.01 -0.59C10.61 9.87 10.86 9.46 11 9.07z",
-    "M16 14V5H0v9a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2zM2.56 12.33H1.85L3.75 7h0.69l1.9 5.33H5.62l-0.54 -1.6H3.1l-0.54 1.6zM4.1 7.81H4.08l-0.8 2.37H4.9L4.1 7.81zm5.75 0.42v4.1H9.18v-0.54H9.16C9.01 12.12 8.62 12.4 7.97 12.4c-0.85 0 -1.46 -0.49 -1.46 -1.43V8.23h0.68v2.55c0 0.77 0.44 1.01 0.98 1.01c0.59 0 1 -0.37 1 -1.02V8.23h0.68zm1.27 4.41c0.08 0.33 0.43 0.63 0.99 0.63c0.65 0 1.07 -0.37 1.07 -1.02v-0.6h-0.02C13 12 12.55 12.29 11.99 12.29c-0.96 0 -1.64 -0.67 -1.64 -1.9v-0.34c0 -1.21 0.67 -1.89 1.64 -1.89c0.56 0 1 0.3 1.19 0.64h0.02V8.23h0.65v4.03c0 1.05 -0.82 1.58 -1.75 1.58c-1.04 0 -1.57 -0.52 -1.66 -1.2h0.68zm2.06 -2.54c0 -0.83 -0.42 -1.36 -1.06 -1.36c-0.7 0 -1.1 0.49 -1.1 1.36v0.26c0 0.85 0.4 1.36 1.1 1.36c0.67 0 1.06 -0.52 1.06 -1.36V10.1zM4 0.5a0.5 0.5 0 0 0 -1 0V1H2A2 2 0 0 0 0 3v1h16V3A2 2 0 0 0 14 1h-1V0.5a0.5 0.5 0 0 0 -1 0V1H4V0.5z",
-    "M5.5 0.5A0.5 0.5 0 0 1 6 0h4a0.5 0.5 0 0 1 0 1H9v1.07a7 7 0 0 1 3.54 12.26l0.81 0.82a0.5 0.5 0 0 1 -0.7 0.7l-0.93 -0.92A6.97 6.97 0 0 1 8 16A6.97 6.97 0 0 1 4.28 14.93l-0.93 0.92a0.5 0.5 0 0 1 -0.7 -0.7l0.81 -0.82A7 7 0 0 1 7 2.07V1H6A0.5 0.5 0 0 1 5.5 0.5zM0.86 5.39A2.5 2.5 0 1 1 4.39 1.86A8.04 8.04 0 0 0 0.86 5.39zM13.5 1c-0.75 0 -1.43 0.33 -1.89 0.86a8.04 8.04 0 0 1 3.53 3.53A2.5 2.5 0 0 0 13.5 1zm-5 4a0.5 0.5 0 0 0 -1 0v3.88l-1.45 2.9a0.5 0.5 0 1 0 0.9 0.44l1.5 -3A0.5 0.5 0 0 0 8.5 9V5z",
-    "M2 0h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2H2A2 2 0 0 1 0 14V2A2 2 0 0 1 2 0zm3.35 4.65a0.5 0.5 0 1 0 -0.7 0.7L7.29 8l-2.64 2.65a0.5 0.5 0 0 0 0.7 0.7L8 8.71l2.65 2.64a0.5 0.5 0 0 0 0.7 -0.7L8.71 8l2.64 -2.65a0.5 0.5 0 0 0 -0.7 -0.7L8 7.29L5.35 4.65z",
+    "M16 8C16 4.13 12.42 1 8 1S0 4.13 0 8c0 1.76 0.74 3.37 1.97 4.6c-0.1 1.02 -0.42 2.13 -0.77 2.97c-0.08 0.19 0.07 0.39 0.27 0.36c2.26 -0.37 3.6 -0.94 4.18 -1.23A9.06 9.06 0 0 0 8 15c4.42 0 8 -3.13 8 -7zM7.19 6.77c0.09 0.12 0.16 0.26 0.23 0.4c0.43 0.95 0.39 2.38 -0.94 3.71a0.45 0.45 0 0 1 -0.61 0.01A0.41 0.41 0 0 1 5.86 10.29C6.27 9.88 6.53 9.46 6.67 9.07C6.4 9.24 6.08 9.33 5.74 9.33C4.78 9.33 4 8.59 4 7.67S4.78 6 5.73 6c0.27 0 0.53 0.06 0.76 0.17l0.01 0c0.17 0.07 0.33 0.18 0.47 0.32c0.08 0.08 0.16 0.17 0.23 0.27zM11 9.07c-0.27 0.16 -0.59 0.26 -0.93 0.26C9.11 9.33 8.34 8.59 8.34 7.67S9.11 6 10.07 6c0.27 0 0.53 0.06 0.76 0.17l0.01 0C11 6.24 11.16 6.35 11.3 6.49c0.09 0.08 0.16 0.17 0.23 0.27c0.09 0.12 0.16 0.26 0.23 0.4c0.43 0.95 0.39 2.38 -0.94 3.71a0.45 0.45 0 0 1 -0.61 0.01a0.41 0.41 0 0 1 -0.01 -0.59C10.61 9.87 10.86 9.46 11 9.07z",
+    "M16 14V5H0v9a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2zM2.56 12.33H1.85L3.75 7h0.7l1.9 5.33H5.62l-0.54 -1.6H3.1l-0.54 1.6zM4.1 7.81H4.08l-0.8 2.38H4.9L4.1 7.81zm5.75 0.42v4.11H9.18v-0.54H9.16C9.01 12.12 8.62 12.4 7.97 12.4c-0.85 0 -1.45 -0.48 -1.45 -1.43V8.23h0.68v2.55c0 0.77 0.44 1.01 0.98 1.01c0.59 0 1 -0.37 1 -1.02V8.23h0.68zm1.27 4.41c0.07 0.33 0.42 0.64 0.98 0.64c0.65 0 1.07 -0.38 1.07 -1.02v-0.61h-0.02C13 12 12.55 12.29 11.99 12.29c-0.96 0 -1.64 -0.67 -1.64 -1.9v-0.34c0 -1.21 0.68 -1.89 1.64 -1.89c0.56 0 1 0.29 1.2 0.64h0.02V8.23h0.65v4.03c0 1.05 -0.82 1.58 -1.75 1.58c-1.04 0 -1.57 -0.52 -1.67 -1.2h0.69zm2.06 -2.53c0 -0.83 -0.41 -1.36 -1.06 -1.36c-0.69 0 -1.1 0.49 -1.1 1.36v0.25c0 0.85 0.41 1.36 1.1 1.36c0.67 0 1.06 -0.52 1.06 -1.36V10.1zM4 0.5a0.5 0.5 0 0 0 -1 0V1H2A2 2 0 0 0 0 3v1h16V3A2 2 0 0 0 14 1h-1V0.5a0.5 0.5 0 0 0 -1 0V1H4V0.5z",
+    "M5.5 0.5A0.5 0.5 0 0 1 6 0h4a0.5 0.5 0 0 1 0 1H9v1.07a7 7 0 0 1 3.54 12.26l0.82 0.82a0.5 0.5 0 0 1 -0.71 0.71l-0.92 -0.93A6.97 6.97 0 0 1 8 16A6.97 6.97 0 0 1 4.28 14.93l-0.92 0.92A0.5 0.5 0 0 1 2.65 15.15l0.82 -0.82A7 7 0 0 1 7 2.07V1H6A0.5 0.5 0 0 1 5.5 0.5zM0.86 5.39A2.5 2.5 0 1 1 4.39 1.86A8.04 8.04 0 0 0 0.86 5.39zM13.5 1c-0.75 0 -1.43 0.33 -1.89 0.86a8.04 8.04 0 0 1 3.53 3.53A2.5 2.5 0 0 0 13.5 1zm-5 4a0.5 0.5 0 0 0 -1 0v3.88l-1.45 2.89a0.5 0.5 0 1 0 0.89 0.45l1.5 -3A0.5 0.5 0 0 0 8.5 9V5z",
+    "M2 0h12a2 2 0 0 1 2 2v12a2 2 0 0 1 -2 2H2A2 2 0 0 1 0 14V2A2 2 0 0 1 2 0zm3.35 4.65A0.5 0.5 0 1 0 4.65 5.35L7.29 8l-2.65 2.65a0.5 0.5 0 0 0 0.71 0.71L8 8.71l2.65 2.65a0.5 0.5 0 0 0 0.71 -0.71L8.71 8l2.65 -2.65A0.5 0.5 0 0 0 10.65 4.65L8 7.29L5.35 4.65z",
     "M2 4A2 2 0 0 0 0 6v6a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2V6A2 2 0 0 0 14 4h-1.17A2 2 0 0 1 11.41 3.41L10.59 2.59A2 2 0 0 0 9.17 2H6.83A2 2 0 0 0 5.41 2.59L4.59 3.41A2 2 0 0 1 3.17 4H2zm8.5 4.5a2.5 2.5 0 0 0 -5 0a2.5 2.5 0 1 0 5 0zM2.5 6a0.5 0.5 0 0 1 0 -1a0.5 0.5 0 1 1 0 1zm9 2.5a3.5 3.5 0 1 1 -7 0a3.5 3.5 0 0 1 7 0z",
-    "M2 0A2 2 0 0 0 0 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2V2A2 2 0 0 0 14 0H2zm7.5 11h-4A0.5 0.5 0 0 1 5 10.5v-4a0.5 0.5 0 0 1 1 0v2.79l4.15 -4.14a0.5 0.5 0 0 1 0.7 0.7L6.71 10H9.5a0.5 0.5 0 0 1 0 1z",
+    "M2 0A2 2 0 0 0 0 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2 -2V2A2 2 0 0 0 14 0H2zm7.5 11h-4A0.5 0.5 0 0 1 5 10.5v-4a0.5 0.5 0 0 1 1 0v2.79l4.15 -4.15a0.5 0.5 0 0 1 0.71 0.71L6.71 10H9.5a0.5 0.5 0 0 1 0 1z",
     "M15.98 8.51c-0.38 6.15 -7.27 9.57 -12.4 6.17C3.27 14.47 2.98 14.25 2.71 14.01l5.5 -5.5h7.78zM2 13.3L7.5 7.8V0.03C1.35 0.41 -2.07 7.3 1.33 12.43c0.2 0.3 0.42 0.59 0.67 0.87zM8.5 0.03c4.02 0.25 7.23 3.46 7.49 7.49H8.5V0.03z",
     "M8.66 8.66v-4H7.34v4h1.31zm0 2.68V10H7.34v1.34h1.31zM8 1.34q2.75 0 4.7 1.95T14.66 8t-1.95 4.7T8 14.66T3.3 12.7T1.34 8T3.3 3.3T8 1.34z"
   ],

package/test/static.test.ts

@@ -1,5 +1,5 @@
 import { expect, it, describe, beforeEach, vi } from 'vitest';
-import SVGPathCommander, { type CurveArray, type ShapeTypes } from '~/index';
+import SVGPathCommander, { PathArray, type CurveArray, type ShapeTypes } from '~/index';
 import invalidPathValue from '../src/parser/invalidPathValue';
 import error from '../src/parser/error';
 
@@ -115,11 +115,12 @@ describe('SVGPathCommander Static Methods', () => {
     });
   });
 
-  it(`Can revert back to default round option`, () => {
-    const sample = [["M", 0, 0], ["L", 181.99955, 0], ["L", 91, 72], ["L", 0, 0], ["Z"]];
-    const rounded = [["M", 0, 0], ["L", 181.9996, 0], ["L", 91, 72], ["L", 0, 0], ["Z"]];
+  it(`Can disable round, use a given decimal amount or revert back to default round option`, () => {
+    const sample = [["M", 0, 0], ["L", 181.99955, 0], ["L", 91, 72], ["L", 0, 0], ["Z"]] as PathArray;
+    const rounded = [["M", 0, 0], ["L", 181.9996, 0], ["L", 91, 72], ["L", 0, 0], ["Z"]] as PathArray;
 
-    // @ts-expect-error
+    expect(SVGPathCommander.roundPath(sample, 4), `can use number setting`).to.deep.equal(rounded);
+    expect(SVGPathCommander.roundPath(sample, 'off'), `can use "off" setting`).to.deep.equal(sample);
     expect(SVGPathCommander.roundPath(sample, -1), `use 4 decimals when negative number is provided`).to.deep.equal(rounded);
     // @ts-expect-error
     expect(SVGPathCommander.roundPath(sample, 'wombat'), `use 4 decimals when string is provided`).to.deep.equal(rounded);
@@ -198,7 +199,7 @@ describe('SVGPathCommander Static Methods', () => {
     const propsPoint0 = getPropertiesAtPoint(simpleShapes.initial[1], { "x": 10, "y": 90 });
     expect(propsPoint0.closest).to.deep.equal({ x: 10, y: 90 });
     expect(propsPoint0.distance).to.equal(0);
-    expect(propsPoint0.segment).to.deep.equal({ segment: ["M", 10, 90], index: 0, length: 0, point: { x: 10, y: 90 }, lengthAtSegment: 0 })
+    expect(propsPoint0.segment).to.deep.equal({ segment: ["M", 10, 90], index: 0, length: 0, lengthAtSegment: 0 })
 
     // getPropertiesAtPoint mid point
     const propsPoint50 = getPropertiesAtPoint(simpleShapes.initial[1], { x: 30.072453006153214, y: 41.42818552481854 });
@@ -224,7 +225,7 @@ describe('SVGPathCommander Static Methods', () => {
   it(`Can do getSegmentOfPoint`, () => {
     const { getSegmentOfPoint } = SVGPathCommander;
     // first point
-    expect(getSegmentOfPoint(simpleShapes.initial[1], { x: 10, y: 90 })).to.deep.equal({ segment: ["M", 10, 90], index: 0, length: 0, point: { x: 10, y: 90 }, lengthAtSegment: 0 });
+    expect(getSegmentOfPoint(simpleShapes.initial[1], { x: 10, y: 90 })).to.deep.equal({ segment: ["M", 10, 90], index: 0, length: 0, lengthAtSegment: 0 });
     // mid point
     expect(getSegmentOfPoint(simpleShapes.initial[3], { x: 9, y: 9 })).to.deep.equal({ segment: ["a", 6, 4, 10, 0, 1, 8, 0], index: 5, length: 7.498916687913066,/* point: { x: 6, y: 10 },*/ lengthAtSegment: 48.11479095890485 });
   });
@@ -267,13 +268,13 @@ describe('SVGPathCommander Static Methods', () => {
   });
 
   it(`Can do polygonLength`, () => {
-    const { polygonLength } = SVGPathCommander;
-    expect(polygonLength([[100, 100], [150, 25], [150, 75], [200, 0]])).to.equal(230.27756377319946);
+    const { polygonTools } = SVGPathCommander;
+    expect(polygonTools.polygonLength([[100, 100], [150, 25], [150, 75], [200, 0]])).to.equal(230.27756377319946);
   });
 
   it(`Can do polygonArea`, () => {
-    const { polygonArea } = SVGPathCommander;
-    expect(polygonArea([[107.4, 13], [113.7, 28.8], [127.9, 31.3], [117.6, 43.5], [120.1, 60.8], [107.4, 52.6], [94.6, 60.8], [97.1, 43.5], [86.8, 31.3], [101, 28.8]])).to.equal(-836.69);
+    const { polygonTools } = SVGPathCommander;
+    expect(polygonTools.polygonArea([[107.4, 13], [113.7, 28.8], [127.9, 31.3], [117.6, 43.5], [120.1, 60.8], [107.4, 52.6], [94.6, 60.8], [97.1, 43.5], [86.8, 31.3], [101, 28.8]])).to.equal(-836.69);
   });
 
   it(`Can do transformPath with empty object`, () => {
@@ -304,7 +305,7 @@ describe('SVGPathCommander Static Methods', () => {
   });
 
   it(`Can cover all remaining branches`, () => {
-    const { splitPath, parsePathString, getPathBBox, getPointAtLength, getTotalLength } = SVGPathCommander;
+    const { splitPath, pathToString, optimizePath, parsePathString, getPathBBox, getPointAtLength, getTotalLength } = SVGPathCommander;
     expect(getPointAtLength(simpleShapes.normalized[3], 24.057395479452424)).to.deep.equal({ x: 14, y: 10 });
     expect(getPointAtLength(simpleShapes.normalized[0], 0)).to.deep.equal({ x: 10, y: 10 });
     expect(getPointAtLength(simpleShapes.normalized[3], undefined)).to.deep.equal({ x: 6, y: 10 });
@@ -320,5 +321,10 @@ describe('SVGPathCommander Static Methods', () => {
       "x": 10, "y": 10, "x2": 170,"y2": 90,
     });
     expect(splitPath(parsePathString(shapes.relative[1])).length).to.equal(7);
+    expect(pathToString(optimizePath(parsePathString(
+      // 'M10 50q15 -25 30 0Q55 75 70 50Q85 25 100 50T130 50Q145 25 160 50t30 0'
+      simpleShapes.normalized[2]
+    ), 2))).to.equal(simpleShapes.initial[2]);
+    // M10 50q15 -25 30 0t30 0t30 0t30 0t30 0t30 0
   });
 });

package/src/math/polygonArea.ts

@@ -1,29 +0,0 @@
-import { type PointTuple } from '../types';
-
-/**
- * d3-polygon-area
- * https://github.com/d3/d3-polygon
- *
- * Returns the area of a polygon.
- *
- * @param polygon an array of coordinates
- * @returns the polygon area
- */
-const polygonArea = (polygon: PointTuple[]): number => {
-  const n = polygon.length;
-  let i = -1;
-  let a;
-  let b = polygon[n - 1];
-  let area = 0;
-
-  /* eslint-disable-next-line */
-  while (++i < n) {
-    a = b;
-    b = polygon[i];
-    area += a[1] * b[0] - a[0] * b[1];
-  }
-
-  return area / 2;
-};
-
-export default polygonArea;

package/src/math/polygonLength.ts

@@ -1,22 +0,0 @@
-import { type PointTuple } from '../types';
-import distanceSquareRoot from './distanceSquareRoot';
-
-/**
- * d3-polygon-length
- * https://github.com/d3/d3-polygon
- *
- * Returns the perimeter of a polygon.
- *
- * @param polygon an array of coordinates
- * @returns {number} the polygon length
- */
-const polygonLength = (polygon: PointTuple[]): number => {
-  return polygon.reduce((length, point, i) => {
-    if (i) {
-      return length + distanceSquareRoot(polygon[i - 1], point);
-    }
-    return 0;
-  }, 0);
-};
-
-export default polygonLength;