flo-mat 3.0.14 → 4.0.1

package/node/corner/corner.d.ts

@@ -1,36 +1,37 @@
 /**
- * @internal
  * Represents a corner on the shape boundary, i.e. a point where two bezier
  * curves meet. Typically used internally only.
+ *
+ * @internal
  */
 interface Corner {
     /**
      * The unit tangents at the points t === 1 of the first curve and at
      * t === 0 of the second respectively.
      */
-    tangents: number[][];
+    readonly tangents: number[][];
     /** The cross of the unit tangents. */
     /**
      * True if the corner is sharp, i.e. > 0 radians as one goes in a positive
      * direction around the shape boundary.
      */
-    isSharp: boolean;
+    readonly isSharp: boolean;
     /**
      * True if the corner is dull, i.e. < 0 radians as one goes in a positive
      * direction around the shape boundary.
      */
-    isDull: boolean;
+    readonly isDull: boolean;
     /**
      * True if the corner is quite sharp, i.e. > δ radians as one goes in a
      * positive direction around the shape boundary where δ is some
      * pre-determined parameter.
      */
-    isQuiteSharp: boolean;
+    readonly isQuiteSharp: boolean;
     /**
      * True if the corner is quite dull, i.e. < δ radians as one goes in a
      * positive direction around the shape boundary where δ is some
      * pre-determined parameter.
      */
-    isQuiteDull: boolean;
+    readonly isQuiteDull: boolean;
 }
 export { Corner };

package/node/corner/get-corner.d.ts

@@ -1,13 +1,8 @@
-import { Corner } from "./corner.js";
+import type { Corner } from "./corner.js";
 /**
  * @internal
  * Returns a new corner with properties.
  *
- * PRECONDITION: The beziers has control points with max bit-length of 26 and
- * aligned to a 'grid' to have the same exponent. This is so the vectors between
- * control points can be calculated exactly without resorting to adaptive
- * infinite precision floating point operations.
- *
  * @param psI The incoming bezier that ends in the corner
  * @param psO The outgoing bezier that starts at the corner
  */

package/node/corner/get-corner.js

@@ -19,17 +19,12 @@ const DEGREE_LIMIT = DEGREES[4];
  * @internal
  * Returns a new corner with properties.
  *
- * PRECONDITION: The beziers has control points with max bit-length of 26 and
- * aligned to a 'grid' to have the same exponent. This is so the vectors between
- * control points can be calculated exactly without resorting to adaptive
- * infinite precision floating point operations.
- *
  * @param psI The incoming bezier that ends in the corner
  * @param psO The outgoing bezier that starts at the corner
  */
 function getCorner(psI, psO) {
-    // getInterfaceCcw must return a number !== 0 if psI and psO are not the
-    // same as seen as a curve extension with t ∈ [-∞,+∞]
+    // `getInterfaceCcw` must return a number !== 0 if `psI` and `psO` are not
+    // the same up to a curve extension with `t ∈ [-∞,+∞]`
     const { ccw, tangentI, tangentO, dotTangents } = getInterfaceCcw(psI, psO);
     const isSharp = ccw < 0;
     const isDull = ccw > 0;
@@ -43,7 +38,6 @@ function getCorner(psI, psO) {
     const crossTangents = cross(unitTangents[0], unitTangents[1]);
     let isQuiteSharp;
     let isQuiteDull;
-    // const dotTangents = dot(tangentAtIncoming, tangentAtOutgoing);
     if (dotTangents > 0) {
         // Curves go in same direction
         isQuiteSharp = crossTangents < -DEGREE_LIMIT;
@@ -55,7 +49,6 @@ function getCorner(psI, psO) {
     }
     return {
         tangents: unitTangents,
-        // crossTangents, 
         isSharp,
         isDull,
         isQuiteSharp,

package/node/corner/get-corner.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-corner.js","sourceRoot":"","sources":["../../src/corner/get-corner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAO,YAAY,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,MAAM,OAAO,GAAG;IACZ,kBAAkB;IAClB,IAAI,EAAG,MAAM;IACb,CAAC,EAAM,MAAM;IACb,CAAC,EAAM,MAAM;IACb,EAAE,EAAK,MAAM;CAChB,CAAC;AAGF,gBAAgB;AAChB,kCAAkC;AAClC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAChC,oCAAoC;AAGpC;;;;;;;;;;;GAWG;AACH,SAAS,SAAS,CACV,GAAe,EACf,GAAe;IAEnB,wEAAwE;IACxE,qDAAqD;IACrD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAI,GAAG,GAAG,CAAC,CAAC;IAExB,+CAA+C;IAC/C,MAAM,YAAY,GAAG;QACjB,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC,CAAC;IAEF,wEAAwE;IACxE,cAAc;IACd,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAI,YAAqB,CAAC;IAC1B,IAAI,WAAoB,CAAC;IACzB,iEAAiE;IACjE,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QAClB,8BAA8B;QAC9B,YAAY,GAAG,aAAa,GAAG,CAAC,YAAY,CAAC;QAC7C,WAAW,GAAG,aAAa,GAAG,CAAC,YAAY,CAAC;IAChD,CAAC;SAAM,CAAC;QACJ,YAAY,GAAG,OAAO,CAAC;QACvB,WAAW,GAAI,MAAM,CAAC;IAC1B,CAAC;IAED,OAAO;QACH,QAAQ,EAAE,YAAY;QACtB,kBAAkB;QAClB,OAAO;QACP,MAAM;QACN,YAAY;QACZ,WAAW;KACd,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"get-corner.js","sourceRoot":"","sources":["../../src/corner/get-corner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAGzD;;;GAGG;AACH,MAAM,OAAO,GAAG;IACZ,kBAAkB;IAClB,IAAI,EAAG,MAAM;IACb,CAAC,EAAM,MAAM;IACb,CAAC,EAAM,MAAM;IACb,EAAE,EAAK,MAAM;CAChB,CAAC;AAGF,gBAAgB;AAChB,kCAAkC;AAClC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAChC,oCAAoC;AAGpC;;;;;;GAMG;AACH,SAAS,SAAS,CACV,GAAe,EACf,GAAe;IAEnB,0EAA0E;IAC1E,sDAAsD;IACtD,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3E,MAAM,OAAO,GAAG,GAAG,GAAG,CAAC,CAAC;IACxB,MAAM,MAAM,GAAI,GAAG,GAAG,CAAC,CAAC;IAExB,+CAA+C;IAC/C,MAAM,YAAY,GAAG;QACjB,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACxC,CAAC;IAEF,wEAAwE;IACxE,cAAc;IACd,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAI,YAAqB,CAAC;IAC1B,IAAI,WAAoB,CAAC;IACzB,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;QAClB,8BAA8B;QAC9B,YAAY,GAAG,aAAa,GAAG,CAAC,YAAY,CAAC;QAC7C,WAAW,GAAG,aAAa,GAAG,CAAC,YAAY,CAAC;IAChD,CAAC;SAAM,CAAC;QACJ,YAAY,GAAG,OAAO,CAAC;QACvB,WAAW,GAAI,MAAM,CAAC;IAC1B,CAAC;IAED,OAAO;QACH,QAAQ,EAAE,YAAY;QACtB,OAAO;QACP,MAAM;QACN,YAAY;QACZ,WAAW;KACd,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/corner/get-interface-ccw.d.ts

@@ -11,8 +11,8 @@
  * Preconditions (for robustness):
  * * The bezier does not have infinite curvature at either endpoint
  *
- * @param psI The incoming bezier that ends at the interface
- * @param psO The outgoing bezier that starts at the interface
+ * @param psI the incoming bezier that ends at the interface
+ * @param psO the outgoing bezier that starts at the interface
  */
 declare function getInterfaceCcw(psI: number[][], psO: number[][]): {
     ccw: number;

package/node/corner/get-interface-ccw.js

@@ -13,8 +13,8 @@ import { compareCurvaturesAtInterface } from "./compare-curvatures-at-interface.
  * Preconditions (for robustness):
  * * The bezier does not have infinite curvature at either endpoint
  *
- * @param psI The incoming bezier that ends at the interface
- * @param psO The outgoing bezier that starts at the interface
+ * @param psI the incoming bezier that ends at the interface
+ * @param psO the outgoing bezier that starts at the interface
  */
 function getInterfaceCcw(psI, psO) {
     const lenI = psI.length;
@@ -52,9 +52,9 @@ function getInterfaceCcw(psI, psO) {
     // same tangent - look now at curvature to see which has the largest 
     // curvature so we can base the clock or anti-clockwise result on that
     // Look at curvature
-    // TODO2
+    // FUTURE
     // The line below is probably not working correctly for infinite
-    // curvature but it should be rare to get here - investiagte.
+    // curvature but it should be rare to get here - investigate.
     // Probably need to resort to length of tangents and then if this is
     // also the same simply look at the last point's ccw wrt the 1st or
     // the second?
@@ -62,7 +62,6 @@ function getInterfaceCcw(psI, psO) {
         ccw: compareCurvaturesAtInterface(psI.slice().reverse(), psO),
         tangentI,
         tangentO,
-        // crossTangents,
         dotTangents
     };
 }

package/node/corner/get-interface-ccw.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-interface-ccw.js","sourceRoot":"","sources":["../../src/corner/get-interface-ccw.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-interface-ccw.js","sourceRoot":"","sources":["../../src/corner/get-interface-ccw.ts"],"names":[],"mappings":"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"}

package/node/cp-node/cp-node-fs.d.ts

@@ -1,6 +1,4 @@
-import { CpNode } from "./cp-node.js";
 import { getHoleClosers } from "./fs/get-hole-closers.js";
-import { getSpeed } from "./fs/get-speed.js";
 import { enhanceCpNode } from "./fs/enhance-cp-node.js";
 import { traverseCp } from './fs/traverse-cp.js';
 import { traverseEdges } from './fs/traverse-edges.js';
@@ -218,19 +216,6 @@ declare const CpNodeFs: {
     getBoundaryBeziersBetween: typeof getBoundaryBeziersBetween;
     getMatCurvesBetween: typeof getMatCurvesBetween;
     getHoleClosers: typeof getHoleClosers;
-    getSpeed: typeof getSpeed;
-    getSmoothedSpeed$: (a: number) => ((cpNode: CpNode) => number | undefined) & {
-        readonly weakMapS: WeakMap<object, {
-            readonly weakMap: WeakMap<object, any>;
-            readonly map: Map<object, any>;
-        }>;
-        readonly mapS: Map<object, {
-            readonly weakMap: WeakMap<object, any>;
-            readonly map: Map<object, any>;
-        }>;
-        readonly clearCache: () => void;
-        readonly addToCache: (r: unknown, ...args: any) => void;
-    };
     getInitialDegAngleBetweenMatCurves: typeof getInitialDegAngleBetweenMatCurves;
     getAllVertices: typeof getAllVertices;
 };

package/node/cp-node/cp-node-fs.js

@@ -1,6 +1,4 @@
 import { getHoleClosers } from "./fs/get-hole-closers.js";
-import { getSpeed } from "./fs/get-speed.js";
-import { getSmoothedSpeed$ } from "./fs/get-smoothed-speed.js";
 import { enhanceCpNode } from "./fs/enhance-cp-node.js";
 import { traverseCp } from './fs/traverse-cp.js';
 import { traverseEdges } from './fs/traverse-edges.js';
@@ -218,8 +216,6 @@ const CpNodeFs = {
     getBoundaryBeziersBetween,
     getMatCurvesBetween,
     getHoleClosers,
-    getSpeed,
-    getSmoothedSpeed$,
     getInitialDegAngleBetweenMatCurves,
     getAllVertices
 };

package/node/cp-node/cp-node-fs.js.map

@@ -1 +1 @@
-{"version":3,"file":"cp-node-fs.js","sourceRoot":"","sources":["../../src/cp-node/cp-node-fs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AACzF,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,kCAAkC,EAAE,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAG9D,MAAM,QAAQ,GAAG;IACb;;;;;OAKG;IACH,WAAW;IACX;;;;;;;OAOG;IACH,wBAAwB;IACxB;;;OAGG;IACH,YAAY;IACZ;;;;;OAKG;IACH,cAAc;IACd;;;;;OAKG;IACH,cAAc;IACd;;;;;;;;;;;;OAYG;IACH,aAAa;IACb;;;OAGG;IACH,kBAAkB;IAClB;;;OAGG;IACH,YAAY;IACZ;;;;;;OAMG;IACH,OAAO;IACP;;;;;;;OAOG;IACH,UAAU;IACV;;;;;;;OAOG;IACH,aAAa;IACb;;;;;OAKG;IACH,iBAAiB;IACjB;;;;;OAKG;IACH,gBAAgB;IAChB;;;OAGG;IACH,aAAa;IACb;;;;;;;;OAQG;IACH,UAAU;IACV;;;;;;OAMG;IACH,aAAa;IACb;;;;;;;;OAQG;IACH,gBAAgB;IAChB;;;;OAIG;IACH,KAAK;IACL;;;;OAIG;IACH,4BAA4B;IAC5B;;;;OAIG;IACH,wBAAwB;IACxB;;;;OAIG;IACH,YAAY;IACZ;;;;;OAKG;IACH,iBAAiB;IACjB,UAAU;IACV,SAAS;IACT,gBAAgB;IAChB,WAAW;IACX;;;;;OAKG;IACH,kBAAkB;IAClB;;;;;OAKG;IACH,gBAAgB;IAChB,yBAAyB;IACzB,mBAAmB;IACnB,cAAc;IACd,QAAQ;IACR,iBAAiB;IACjB,kCAAkC;IAClC,cAAc;CACjB,CAAA;AAGD,OAAO,EAAE,QAAQ,EAAE,CAAA"}
+{"version":3,"file":"cp-node-fs.js","sourceRoot":"","sources":["../../src/cp-node/cp-node-fs.ts"],"names":[],"mappings":"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"}

package/node/cp-node/cp-node.d.ts

@@ -1,4 +1,4 @@
-import { ContactPoint } from '../contact-point/contact-point.js';
+import { PointOnShape } from '../point-on-shape/point-on-shape.js';
 /**
  * The primary interface of the library.
  *
@@ -48,33 +48,33 @@ import { ContactPoint } from '../contact-point/contact-point.js';
  * in opposite directions.
  */
 interface CpNode {
+    /** For debugging / easy identification only */
+    readonly id: number;
     /** The shape boundary contact point, i.e. a `CpNode` without its edges. */
-    cp: ContactPoint;
+    readonly pointOnShape: PointOnShape;
     /** If true, this `CpNode` belongs to a hole-closing maximal disk. */
-    isHoleClosing: boolean;
+    readonly isHoleClosing: boolean;
     /** true if this `CpNode` is at a shape boundary intersection point, false otherwise */
-    isIntersection: boolean;
+    readonly isIntersection: boolean;
     /** The previous (going clockwise around the boundary) contact point `CpNode`. */
-    prev: CpNode;
+    readonly prev: CpNode;
     /** The next (going anti-clockwise around the boundary) contact point `CpNode`. */
-    next: CpNode;
+    readonly next: CpNode;
     /**
      * The previous `CpNode` (going clockwise around the inscribed circle
      * defined by the maximal disk).
      */
-    prevOnCircle: CpNode;
+    readonly prevOnCircle: CpNode;
     /**
      * The next `CpNode` (going anti-clockwise around
      * the inscribed circle defined by the maximal disk).
      */
-    nextOnCircle: CpNode;
+    readonly nextOnCircle: CpNode;
     /**
      * For hole closers only - the twin `CpNode` at the same point, e.g.
      * use `cpNode.holeCloserTwin.next` to skip the hole closer and get to the
      * next `CpNode` on the same loop.
      */
-    holeCloserTwin?: CpNode | undefined;
-    /** For debugging / easy identification only */
-    id: number;
+    readonly holeCloserTwin?: CpNode | undefined;
 }
 export { CpNode };

package/node/cp-node/fs/clone.js

@@ -7,7 +7,7 @@ const EDGES = ['prev', 'next', 'prevOnCircle', 'nextOnCircle', 'holeCloserTwin']
  */
 function clone(cpNode) {
     // Don't change this function to be recursive, the call stack may 
-    // overflow if there are too many CpNodes.
+    // overflow if there are too many `CpNode`s.
     const nodeMap = new Map();
     const newCpNode = cloneWithoutEdges(cpNode);
     nodeMap.set(cpNode, newCpNode);
@@ -31,7 +31,7 @@ function clone(cpNode) {
     return newCpNode;
 }
 function cloneWithoutEdges(cpNode) {
-    const newNode = {
+    const cpNode_ = {
         ...cpNode,
         ...{
             prev: undefined,
@@ -41,7 +41,7 @@ function cloneWithoutEdges(cpNode) {
             holeCloserTwin: undefined
         }
     };
-    return newNode;
+    return cpNode_;
 }
 export { clone };
 //# sourceMappingURL=clone.js.map

package/node/cp-node/fs/clone.js.map

@@ -1 +1 @@
-{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../../src/cp-node/fs/clone.ts"],"names":[],"mappings":"AAWA,gBAAgB;AAChB,MAAM,KAAK,GAAW,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;AAOzF;;;;GAIG;AACH,SAAS,KAAK,CACN,MAAc;IAElB,kEAAkE;IAClE,0CAA0C;IAE1C,MAAM,OAAO,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE3D,MAAM,SAAS,GAAuB,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAEhE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAExC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,EAAG,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAErC,IAAI,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBAEhC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YACrD,CAAC;YACA,SAAoB,CAAC,IAAI,CAAC,GAAG,KAAe,CAAC;QAClD,CAAC;IACL,CAAC;IAED,OAAO,SAAmB,CAAC;AAC/B,CAAC;AAGD,SAAS,iBAAiB,CAAC,MAAc;IACrC,MAAM,OAAO,GAAG;QACZ,GAAG,MAAM;QACT,GAAG;YACC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,SAAS;YACvB,cAAc,EAAE,SAAS;SAC5B;KACJ,CAAC;IAEF,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,KAAK,EAAE,CAAA"}
+{"version":3,"file":"clone.js","sourceRoot":"","sources":["../../../src/cp-node/fs/clone.ts"],"names":[],"mappings":"AAYA,gBAAgB;AAChB,MAAM,KAAK,GAAW,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;AAOzF;;;;GAIG;AACH,SAAS,KAAK,CACN,MAAc;IAElB,kEAAkE;IAClE,4CAA4C;IAE5C,MAAM,OAAO,GAAoC,IAAI,GAAG,EAAE,CAAC;IAE3D,MAAM,SAAS,GAAuB,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAEhE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAExC,OAAO,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,GAAG,EAAG,CAAC;QAE7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YAErC,IAAI,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBAEhC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;YACrD,CAAC;YACA,SAA6B,CAAC,IAAI,CAAC,GAAG,KAAe,CAAC;QAC3D,CAAC;IACL,CAAC;IAED,OAAO,SAAmB,CAAC;AAC/B,CAAC;AAGD,SAAS,iBAAiB,CAAC,MAAc;IACrC,MAAM,OAAO,GAAG;QACZ,GAAG,MAAM;QACT,GAAG;YACC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,SAAS;YACvB,cAAc,EAAE,SAAS;SAC5B;KACJ,CAAC;IAEF,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/node/cp-node/fs/cp-node-comparator.js

@@ -1,4 +1,4 @@
-import { compareCps } from "../../contact-point/contact-point.js";
+import { comparePoss } from "../../point-on-shape/compare-poss.js";
 /**
  * Primarily for internal use.
  *
@@ -6,7 +6,7 @@ import { compareCps } from "../../contact-point/contact-point.js";
  * on a `CpNode`'s relative position along the shape boundary.
  */
 function cpNodeComparator(a, b) {
-    return compareCps(a.cp, b.cp);
+    return comparePoss(a.pointOnShape, b.pointOnShape);
 }
 export { cpNodeComparator };
 //# sourceMappingURL=cp-node-comparator.js.map

package/node/cp-node/fs/cp-node-comparator.js.map

@@ -1 +1 @@
-{"version":3,"file":"cp-node-comparator.js","sourceRoot":"","sources":["../../../src/cp-node/fs/cp-node-comparator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAGlE;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,CAAS,EACT,CAAS;IAEb,OAAO,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAClC,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"cp-node-comparator.js","sourceRoot":"","sources":["../../../src/cp-node/fs/cp-node-comparator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,CAAS,EACT,CAAS;IAEb,OAAO,WAAW,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC;AACvD,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/cp-node/fs/enhance-cp-node.d.ts

@@ -18,9 +18,10 @@ declare function enhanceCpNode(cpNode: CpNode): {
         order: number;
         order2: number;
     };
-    curve: import("../../index.js").Curve;
+    curve: import("flo-boolean").Curve;
     loop: import("flo-boolean").Loop;
-    cp: import("../../index.js").ContactPoint;
+    id: number;
+    pointOnShape: import("../../index.js").PointOnShape;
     isHoleClosing: boolean;
     isIntersection: boolean;
     prev: CpNode;
@@ -28,6 +29,5 @@ declare function enhanceCpNode(cpNode: CpNode): {
     prevOnCircle: CpNode;
     nextOnCircle: CpNode;
     holeCloserTwin?: CpNode | undefined;
-    id: number;
 };
 export { enhanceCpNode };

package/node/cp-node/fs/enhance-cp-node.js

@@ -9,14 +9,14 @@ import { isTerminating } from "./is-terminating.js";
  * @param cpNode
  */
 function enhanceCpNode(cpNode) {
-    const cp = cpNode.cp;
-    const pos = cp.pointOnShape;
+    // const cp = cpNode.cp;
+    const pos = cpNode.pointOnShape;
     const curve = pos.curve;
     return {
         ...cpNode,
-        pos: cpNode.cp.pointOnShape,
-        p: cpNode.cp.pointOnShape.p,
-        t: cpNode.cp.pointOnShape.t,
+        pos, //: cpNode.cp.pointOnShape,
+        p: pos.p,
+        t: pos.t,
         isTerminating: isTerminating(cpNode),
         isFullyTerminating: isFullyTerminating(cpNode),
         isSharp: isSharp(cpNode),

package/node/cp-node/fs/enhance-cp-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"enhance-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/enhance-cp-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;GAGG;AACH,SAAS,aAAa,CAAC,MAAc;IACjC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACrB,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC;IAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;IAExB,OAAO;QACH,GAAG,MAAM;QACT,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC,YAAY;QAC3B,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC,EAAE,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QAC3B,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;QACpC,kBAAkB,EAAE,kBAAkB,CAAC,MAAM,CAAC;QAC9C,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC;QACxB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC;QACjC,iBAAiB,EAAE,iBAAiB,CAAC,MAAM,CAAC;QAC5C,QAAQ,EAAE,iBAAiB,CAAC,MAAM,CAAC;QACnC,KAAK;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;KACnB,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"enhance-cp-node.js","sourceRoot":"","sources":["../../../src/cp-node/fs/enhance-cp-node.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;GAGG;AACH,SAAS,aAAa,CAAC,MAAc;IACjC,wBAAwB;IACxB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;IAChC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;IAExB,OAAO;QACH,GAAG,MAAM;QACT,GAAG,EAAC,2BAA2B;QAC/B,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,CAAC,EAAE,GAAG,CAAC,CAAC;QACR,aAAa,EAAE,aAAa,CAAC,MAAM,CAAC;QACpC,kBAAkB,EAAE,kBAAkB,CAAC,MAAM,CAAC;QAC9C,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC;QACxB,UAAU,EAAE,aAAa,CAAC,MAAM,CAAC;QACjC,iBAAiB,EAAE,iBAAiB,CAAC,MAAM,CAAC;QAC5C,QAAQ,EAAE,iBAAiB,CAAC,MAAM,CAAC;QACnC,KAAK;QACL,IAAI,EAAE,KAAK,CAAC,IAAI;KACnB,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/node/cp-node/fs/find-first.d.ts

@@ -1,3 +1,10 @@
-import { CpNode } from "../cp-node.js";
-declare function findFirst(f: (cpNode: CpNode) => CpNode | undefined, cpNode: CpNode): CpNode | undefined;
+import type { CpNode } from "../cp-node.js";
+/**
+ * Finds the first `CpNode` in the same MAT tree for which `f` returns a
+ * truthy value. Returns `undefined` if no such `CpNode` exists.
+ *
+ * @param f a function that takes a `CpNode` and returns a `CpNode` or `undefined`
+ * @param cpNode a `CpNode` on the MAT tree to search from
+ */
+declare function findFirst(f: (cpNode: CpNode) => boolean, cpNode: CpNode): CpNode | undefined;
 export { findFirst };

package/node/cp-node/fs/find-first.js

@@ -1,15 +1,18 @@
+/**
+ * Finds the first `CpNode` in the same MAT tree for which `f` returns a
+ * truthy value. Returns `undefined` if no such `CpNode` exists.
+ *
+ * @param f a function that takes a `CpNode` and returns a `CpNode` or `undefined`
+ * @param cpNode a `CpNode` on the MAT tree to search from
+ */
 function findFirst(f, cpNode) {
     const cpStart = cpNode;
-    if (f(cpStart)) {
-        return cpStart;
-    }
-    let cpNode_ = cpNode.next;
-    while (cpNode_ !== cpStart) {
-        if (f(cpNode_)) {
-            return cpNode_;
+    do {
+        if (f(cpNode)) {
+            return cpNode;
         }
-        cpNode_ = cpNode_.next;
-    }
+        cpNode = cpNode.next;
+    } while (cpNode !== cpStart);
     return undefined;
 }
 export { findFirst };

package/node/cp-node/fs/find-first.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-first.js","sourceRoot":"","sources":["../../../src/cp-node/fs/find-first.ts"],"names":[],"mappings":"AAIA,SAAS,SAAS,CACV,CAAyC,EACzC,MAAc;IAElB,MAAM,OAAO,GAAG,MAAM,CAAC;IAEvB,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;QAAC,OAAO,OAAO,CAAC;IAAC,CAAC;IAEnC,IAAI,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;IAC1B,OAAO,OAAO,KAAK,OAAO,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;YACb,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"find-first.js","sourceRoot":"","sources":["../../../src/cp-node/fs/find-first.ts"],"names":[],"mappings":"AAGA;;;;;;GAMG;AACH,SAAS,SAAS,CACV,CAA8B,EAC9B,MAAc;IAElB,MAAM,OAAO,GAAG,MAAM,CAAC;IAEvB,GAAG,CAAC;QACA,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC,QAAQ,MAAM,KAAK,OAAO,EAAE;IAE7B,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/cp-node/fs/get-all-on-loop.js

@@ -4,12 +4,11 @@
  */
 function getAllOnLoop(cpNode) {
     const cpStart = cpNode;
-    const cpNodes = [cpStart];
-    let cpNode_ = cpNode.next;
-    while (cpNode_ !== cpStart) {
-        cpNodes.push(cpNode_);
-        cpNode_ = cpNode_.next;
-    }
+    const cpNodes = [];
+    do {
+        cpNodes.push(cpNode);
+        cpNode = cpNode.next;
+    } while (cpNode !== cpStart);
     return cpNodes;
 }
 export { getAllOnLoop };

package/node/cp-node/fs/get-all-on-loop.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-all-on-loop.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-all-on-loop.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,SAAS,YAAY,CACb,MAAc;IAElB,MAAM,OAAO,GAAG,MAAM,CAAC;IACvB,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC;IAC1B,IAAI,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC;IAE1B,OAAO,OAAO,KAAK,OAAO,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"get-all-on-loop.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-all-on-loop.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,SAAS,YAAY,CACb,MAAc;IAElB,MAAM,OAAO,GAAG,MAAM,CAAC;IACvB,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,GAAG,CAAC;QACA,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC,QAAQ,MAAM,KAAK,OAAO,EAAE;IAE7B,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

package/node/cp-node/fs/get-boundary-bezier-parts-to-next.js

@@ -11,8 +11,8 @@
 function getBoundaryBezierPartsToNext(cpNode) {
     const cpThis = cpNode;
     const cpNext = cpNode.next;
-    const posThis = cpThis.cp.pointOnShape;
-    const posNext = cpNext.cp.pointOnShape;
+    const posThis = cpThis.pointOnShape;
+    const posNext = cpNext.pointOnShape;
     const curveThis = posThis.curve;
     const curveNext = posNext.curve;
     if (curveThis.loop !== curveNext.loop) {

package/node/cp-node/fs/get-boundary-bezier-parts-to-next.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-boundary-bezier-parts-to-next.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-boundary-bezier-parts-to-next.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,SAAS,4BAA4B,CAC7B,MAAc;IAElB,MAAM,MAAM,GAAG,MAAM,CAAC;IACtB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IAE3B,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;IACvC,MAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;IAEvC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAChC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAEhC,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;QACpC,wEAAwE;QACxE,UAAU;QACV,oBAAoB;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAkB,EAAE,CAAC;IAEvC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,YAAY,CAAC,IAAI,CACb,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CACvD,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,YAAY,CAAC,IAAI,CACb,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAC/C,CAAC;QAEF,uBAAuB,CACnB,YAAY,EACZ,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,CAAC,CACZ,CAAC;IACN,CAAC;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAGD;;;GAGG;AACH,SAAS,uBAAuB,CACxB,YAA2B,EAC3B,UAAiB,EACjB,QAAe,EACf,EAAU;IAEd,IAAI,SAAS,GAAG,UAAU,CAAC;IAC3B,GAAG,CAAC;QACA,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC;QAC3B,MAAM,IAAI,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC;YACd,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC;SAClC,CAAC,CAAC;IACP,CAAC,QAAQ,SAAS,KAAK,QAAQ,EAAE;AACrC,CAAC;AAGD,OAAO,EAAE,4BAA4B,EAAE,CAAA"}
+{"version":3,"file":"get-boundary-bezier-parts-to-next.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-boundary-bezier-parts-to-next.ts"],"names":[],"mappings":"AAKA;;;;;;;;;GASG;AACH,SAAS,4BAA4B,CAC7B,MAAc;IAElB,MAAM,MAAM,GAAG,MAAM,CAAC;IACtB,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IAE3B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC;IAEpC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAChC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAEhC,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;QACpC,wEAAwE;QACxE,UAAU;QACV,oBAAoB;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,MAAM,YAAY,GAAkB,EAAE,CAAC;IAEvC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,YAAY,CAAC,IAAI,CACb,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CACvD,CAAC;IACN,CAAC;SAAM,CAAC;QACJ,YAAY,CAAC,IAAI,CACb,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAC/C,CAAC;QAEF,uBAAuB,CACnB,YAAY,EACZ,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,CAAC,CACZ,CAAC;IACN,CAAC;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAGD;;;GAGG;AACH,SAAS,uBAAuB,CACxB,YAA2B,EAC3B,UAAiB,EACjB,QAAe,EACf,EAAU;IAEd,IAAI,SAAS,GAAG,UAAU,CAAC;IAC3B,GAAG,CAAC;QACA,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC;QAC3B,MAAM,IAAI,GAAG,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7C,YAAY,CAAC,IAAI,CAAC;YACd,EAAE,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC;SAClC,CAAC,CAAC;IACP,CAAC,QAAQ,SAAS,KAAK,QAAQ,EAAE;AACrC,CAAC;AAGD,OAAO,EAAE,4BAA4B,EAAE,CAAA"}

package/node/cp-node/fs/get-cp-node-ordering.js

@@ -3,13 +3,13 @@
  * @param cpNode
  */
 function getCpNodeOrdering(cpNode) {
-    const cp = cpNode.cp;
-    const pos = cp.pointOnShape;
+    // const cp = cpNode.cp;
+    const pos = cpNode.pointOnShape;
     return {
         'idx': pos.curve.idx,
         't': pos.t,
-        'order': cp.order,
-        'order2': cp.order2
+        'order': pos.order,
+        'order2': pos.order2
     };
 }
 export { getCpNodeOrdering };

package/node/cp-node/fs/get-cp-node-ordering.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-cp-node-ordering.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-cp-node-ordering.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,SAAS,iBAAiB,CAAC,MAAc;IACrC,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC;IACrB,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC;IAE5B,OAAO;QACH,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG;QACpB,GAAG,EAAE,GAAG,CAAC,CAAC;QACV,OAAO,EAAE,EAAE,CAAC,KAAK;QACjB,QAAQ,EAAE,EAAE,CAAC,MAAM;KACtB,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"get-cp-node-ordering.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-cp-node-ordering.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,SAAS,iBAAiB,CAAC,MAAc;IACrC,wBAAwB;IACxB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;IAEhC,OAAO;QACH,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG;QACpB,GAAG,EAAE,GAAG,CAAC,CAAC;QACV,OAAO,EAAE,GAAG,CAAC,KAAK;QAClB,QAAQ,EAAE,GAAG,CAAC,MAAM;KACvB,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

package/node/cp-node/fs/get-edge-direction.d.ts

@@ -1,4 +1,4 @@
-import { CpNode } from '../cp-node.js';
+import type { CpNode } from '../cp-node.js';
 /**
  * @internal
  * Returns a line segment of unit length starting in the given Vertex center and

package/node/cp-node/fs/get-edge-direction.js

@@ -8,11 +8,11 @@ import { isPosSharpCorner } from '../../point-on-shape/is-pos-sharp-corner.js';
  * @param cpNode
  */
 function getEdgeDirection(cpNode) {
-    const circleCenter = cpNode.cp.circle.center;
+    const circleCenter = cpNode.pointOnShape.circle.center;
     const cp1 = cpNode;
     const cp2 = cpNode.nextOnCircle;
-    const pos1 = cp1.cp.pointOnShape;
-    const pos2 = cp2.cp.pointOnShape;
+    const pos1 = cp1.pointOnShape;
+    const pos2 = cp2.pointOnShape;
     const p1 = pos1.p;
     const p2 = pos2.p;
     let vDir;

package/node/cp-node/fs/get-edge-direction.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-edge-direction.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-edge-direction.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,EACzE,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAI/E;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,MAAc;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;IAE7C,MAAM,GAAG,GAAG,MAAM,CAAC;IACnB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;IAEhC,MAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC;IACjC,MAAM,IAAI,GAAG,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC;IAEjC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAClB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAElB,IAAI,IAAI,CAAC;IAET,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrC,IAAI,GAAG,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY;QACjD,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,eAAe,CAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAE,CAAC,CAAC,iBAAiB;QAC/D,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,MAAa,CAAC;QAClB,IAAI,MAAa,CAAC;QAElB,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACf,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;YACpB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,CAAC;aAAM,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACzB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,MAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,OAAO,CAAE,YAAY,CAAC,OAAO,CAAC,MAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAE7D,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1B,+DAA+D;QAC/D,oEAAoE;QACpE,iBAAiB;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;QAElC,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,GAAG,SAAS,CACf,YAAY,CAAC,IAAI,CAAC,EAClB,YAAY,CACf,CAAC;IAEF,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;AAC7B,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"get-edge-direction.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-edge-direction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACtG,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAG/E;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,MAAc;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;IAEvD,MAAM,GAAG,GAAG,MAAM,CAAC;IACnB,MAAM,GAAG,GAAG,MAAM,CAAC,YAAY,CAAC;IAEhC,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC;IAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC;IAE9B,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAClB,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAElB,IAAI,IAAI,CAAC;IAET,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrC,IAAI,GAAG,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC,CAAC,YAAY;QACjD,CAAC;aAAM,CAAC;YACJ,IAAI,GAAG,eAAe,CAAE,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAE,CAAC,CAAC,iBAAiB;QAC/D,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,IAAI,MAAa,CAAC;QAClB,IAAI,MAAa,CAAC;QAElB,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACf,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;YACpB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;QAC7B,CAAC;aAAM,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACzB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,MAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,IAAI,GAAG,OAAO,CAAE,YAAY,CAAC,OAAO,CAAC,MAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;QAE7D,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC1B,+DAA+D;QAC/D,oEAAoE;QACpE,iBAAiB;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;QAElC,IAAI,GAAG,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,GAAG,SAAS,CACf,YAAY,CAAC,IAAI,CAAC,EAClB,YAAY,CACf,CAAC;IAEF,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;AAC7B,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/cp-node/fs/get-hole-closers.d.ts

@@ -1,3 +1,3 @@
-import { CpNode } from "../cp-node.js";
+import type { CpNode } from "../cp-node.js";
 declare function getHoleClosers(cpNode: CpNode): CpNode[];
 export { getHoleClosers };

package/node/cp-node/fs/get-implied-boundary-bezier-between.js

@@ -5,8 +5,8 @@ const TOLERANCE_ADD_2PRONG = 0.01;
 /** @internal */
 const TOLERANCE_USE_LINE = 0.0001; // else cubic
 function getImpliedBoundaryBezierBetween(cpNodeA, cpNodeB) {
-    const posA = cpNodeA.cp.pointOnShape;
-    const posB = cpNodeB.cp.pointOnShape;
+    const posA = cpNodeA.pointOnShape;
+    const posB = cpNodeB.pointOnShape;
     let { curve: curveA, p: pA, t: tA } = posA;
     let { curve: curveB, p: pB, t: tB } = posB;
     if (pA[0] === pB[0] && pA[1] === pB[1]) {

package/node/cp-node/fs/get-implied-boundary-bezier-between.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-implied-boundary-bezier-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-implied-boundary-bezier-between.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EACH,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EACpE,MAAM,cAAc,CAAC;AAItB,gBAAgB;AAChB,MAAM,oBAAoB,GAAG,IAAI,CAAC;AAClC,gBAAgB;AAChB,MAAM,kBAAkB,GAAG,MAAM,CAAC,CAAC,aAAa;AAGhD,SAAS,+BAA+B,CAChC,OAAe,EACf,OAAe;IAEnB,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;IACrC,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC;IAErC,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAE3C,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrC,OAAO,CAAC,EAAE,CAAC,CAAC;IAChB,CAAC;IAED,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC;QAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IAAC,CAAC;IAC/C,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAAC,EAAE,GAAG,CAAC,CAAC;QAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IAAC,CAAC;IAE/C,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAC3B,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;IAE3B,MAAM,EAAE,GAAG,CAAC,EAAE,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,MAAM,EAAE,GAAG,CAAC,EAAE,EAAC,SAAS,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,MAAM,GAAG,GAAG,oBAAoB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEzC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;IAExB,IAAI,OAAgB,CAAC;IACrB,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,GAAG,IAAI,CAAC;IACnB,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC1B,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAE1B,OAAO,GAAG,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,EAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,4DAA4D;QAC5D,OAAO,CAAC,EAAE,EAAE,GAAI,EAAE,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,wBAAwB;IAC1D,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,wBAAwB;IAE1D,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;IAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAC,CAAC,CAAC,CAAC;IAE1C,IAAI,EAAE,GAAG,oBAAoB,IAAI,EAAE,GAAG,oBAAoB,EAAE,CAAC;QACzD,uBAAuB;QACvB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,EAAE,GAAG,kBAAkB,IAAI,EAAE,GAAG,kBAAkB,EAAE,CAAC;QACrD,iCAAiC;QACjC,OAAO,SAAS,CAAC,CAAE,cAAc;IACrC,CAAC;IAED,uDAAuD;IACvD,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AACpB,CAAC;AAGD,OAAO,EAAE,+BAA+B,EAAE,CAAA"}
+{"version":3,"file":"get-implied-boundary-bezier-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-implied-boundary-bezier-between.ts"],"names":[],"mappings":"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"}

package/node/cp-node/fs/get-mat-curve-between.d.ts

@@ -1,4 +1,4 @@
-import { CpNode } from '../cp-node.js';
+import type { CpNode } from '../cp-node.js';
 /**
  * Returns the bezier curve from the maximal disk of one `CpNode` to another
  * `CpNode`'s maximal disk.

package/node/cp-node/fs/get-mat-curve-between.js

@@ -1,5 +1,6 @@
 import { fromTo, dot, cross, rotate90Degrees, interpolate, translate, lineLineIntersection } from 'flo-vector2d';
 import { getEdgeDirection } from './get-edge-direction.js';
+const { abs } = Math;
 /** @internal */
 const TOLERANCE_ADD_2PRONG = 0.01;
 /** @internal */
@@ -11,9 +12,9 @@ const TOLERANCE_USE_LINE = 0.0001; // else cubic
  * @param cpNodeTo
  */
 function getMatCurveBetween(cpNodeFrom, cpNodeTo) {
-    const fromCc = cpNodeFrom.cp.circle.center;
+    const fromCc = cpNodeFrom.pointOnShape.circle.center;
     const fromL = getEdgeDirection(cpNodeFrom);
-    const toCc = cpNodeTo.cp.circle.center;
+    const toCc = cpNodeTo.pointOnShape.circle.center;
     const toL = getEdgeDirection(cpNodeTo.prevOnCircle);
     const mid = lineLineIntersection(fromL, toL);
     const c = fromTo(fromCc, toCc);
@@ -32,10 +33,10 @@ function getMatCurveBetween(cpNodeFrom, cpNodeTo) {
     const r = rotate90Degrees(c);
     const w1 = fromTo(fromL[0], fromL[1]); // This is a unit vector
     const w2 = fromTo(toL[0], toL[1]); // This is a unit vector
-    const d1 = Math.abs(cross(c, w1)) / (3 * 3);
-    const d2 = Math.abs(cross(c, w2)) / (3 * 3);
+    const d1 = abs(cross(c, w1)) / (3 * 3);
+    const d2 = abs(cross(c, w2)) / (3 * 3);
     if (d1 > TOLERANCE_ADD_2PRONG || d2 > TOLERANCE_ADD_2PRONG) {
-        // TODO - not within tolerance - must add additional 2-prong
+        // FUTURE - not within tolerance - must add additional 2-prong
         return [fromCc, toCc];
     }
     if (d1 > TOLERANCE_USE_LINE || d2 > TOLERANCE_USE_LINE) {