flo-mat 4.1.5 → 5.0.1

package/node/cp-node/fs/get-branch-beziers.js

@@ -1,12 +1,13 @@
 import { getBranch } from './get-branch.js';
 import { getMatCurveToNext } from './get-mat-curve-to-next.js';
 /**
- * Returns the branch associated with the give cpNode
+ * Returns the (flattened) array of bezier curves (lines or quadratics)
+ * representing the branch associated with the given cpNode
  *
  * @param cpNode `CpNode` representing the start vertex.
  */
 function getBranchBeziers(cpNode) {
-    return getBranch(cpNode).map(b => getMatCurveToNext(b));
+    return getBranch(cpNode).flatMap(getMatCurveToNext);
 }
 export { getBranchBeziers };
 //# sourceMappingURL=get-branch-beziers.js.map

package/node/cp-node/fs/get-branch-beziers.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-branch-beziers.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-branch-beziers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/D;;;;GAIG;AACH,SAAS,gBAAgB,CACjB,MAAc;IAElB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"get-branch-beziers.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-branch-beziers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/D;;;;;GAKG;AACH,SAAS,gBAAgB,CACjB,MAAc;IAElB,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACxD,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

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

@@ -1,5 +1,4 @@
 import { getRealProngCount } from './get-real-prong-count.js';
-import { isFullyTerminating } from './is-fully-terminating.js';
 import { isTerminating } from './is-terminating.js';
 import { isTrivial } from './is-trivial.js';
 /**
@@ -26,7 +25,7 @@ function getBranch(cpNode) {
     do {
         branch.push(cpNode);
         cpNode = cpNode.next;
-    } while (!isFullyTerminating(cpNode) && getRealProngCount(cpNode) === 2);
+    } while (getRealProngCount(cpNode) === 2);
     return branch;
 }
 export { getBranch };

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

@@ -1 +1 @@
-{"version":3,"file":"get-branch.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-branch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;;;;GAMG;AACH,SAAS,SAAS,CACV,MAAc;IAElB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,+BAA+B;IAC/B,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;IACjC,CAAC;IAED,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACrB,OAAO,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IACD,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;IAE7B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,GAAG,CAAC;QACA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;IAExE,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"get-branch.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-branch.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;;;;GAMG;AACH,SAAS,SAAS,CACV,MAAc;IAElB,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,+BAA+B;IAC/B,OAAO,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;IACjC,CAAC;IAED,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACrB,OAAO,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IACD,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC;IAE7B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,GAAG,CAAC;QACA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC,QAAQ,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAC;IAEzC,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

package/node/cp-node/fs/get-distance-to-next.js

@@ -2,8 +2,10 @@ import { totalLength } from "flo-bezier3";
 import { memoize } from "flo-memoize";
 import { getMatCurveToNext } from "./get-mat-curve-to-next.js";
 function getMatDistanceToNext(cpNode) {
-    const ps = getMatCurveToNext(cpNode);
-    const l = totalLength(ps);
+    let l = 0;
+    for (const ps of getMatCurveToNext(cpNode)) {
+        l += totalLength(ps);
+    }
     return l;
 }
 const getMatDistanceToNext$ = memoize(getMatDistanceToNext);

package/node/cp-node/fs/get-distance-to-next.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-distance-to-next.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-distance-to-next.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/D,SAAS,oBAAoB,CACrB,MAAc;IAElB,MAAM,EAAE,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IAE1B,OAAO,CAAC,CAAC;AACb,CAAC;AAGD,MAAM,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE3D,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"get-distance-to-next.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-distance-to-next.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAG/D,SAAS,oBAAoB,CACrB,MAAc;IAElB,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,EAAE,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QACzC,CAAC,IAAI,WAAW,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,CAAC;AACb,CAAC;AAGD,MAAM,qBAAqB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAE3D,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,CAAA"}

package/node/cp-node/fs/get-first-exit.d.ts

@@ -1,7 +1,11 @@
-import { CpNode } from "../cp-node.js";
+import type { CpNode } from "../cp-node.js";
 /**
- * Returns the first `CpNode` (from this one by successively applying
- * .nextOnCircle) that exits the circle.
+ * Returns the first `CpNode` *after* the given one (by successively applying
+ * `.nextOnCircle`) that exits the circle, i.e. the first one that is not
+ * terminating - the given `CpNode` itself is never returned.
+ *
+ * * returns `undefined` if no other `CpNode` on the circle exits (e.g. the
+ *   other `CpNode` of a 1-prong, or the MAT is a single point)
  */
 declare function getFirstExit(cpNode: CpNode): CpNode | undefined;
 export { getFirstExit };

package/node/cp-node/fs/get-first-exit.js

@@ -1,19 +1,21 @@
+import { isTerminating } from "./is-terminating.js";
 /**
- * Returns the first `CpNode` (from this one by successively applying
- * .nextOnCircle) that exits the circle.
+ * Returns the first `CpNode` *after* the given one (by successively applying
+ * `.nextOnCircle`) that exits the circle, i.e. the first one that is not
+ * terminating - the given `CpNode` itself is never returned.
+ *
+ * * returns `undefined` if no other `CpNode` on the circle exits (e.g. the
+ *   other `CpNode` of a 1-prong, or the MAT is a single point)
  */
 function getFirstExit(cpNode) {
-    // const startNode = this as CpNode;
-    const startNode = cpNode;
-    let cpNode_ = startNode;
-    while (cpNode_.next === cpNode_.prevOnCircle) {
-        cpNode_ = cpNode_.next;
-        if (cpNode_ === startNode) {
-            // The very special case the MAT is a single point.
-            return undefined;
+    let cpNode_ = cpNode.nextOnCircle;
+    while (cpNode_ !== cpNode) {
+        if (!isTerminating(cpNode_)) {
+            return cpNode_;
         }
+        cpNode_ = cpNode_.nextOnCircle;
     }
-    return cpNode_;
+    return undefined;
 }
 export { getFirstExit };
 //# sourceMappingURL=get-first-exit.js.map

package/node/cp-node/fs/get-first-exit.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-first-exit.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-first-exit.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,SAAS,YAAY,CAAC,MAAc;IAChC,oCAAoC;IACpC,MAAM,SAAS,GAAG,MAAM,CAAC;IACzB,IAAI,OAAO,GAAG,SAAS,CAAC;IAExB,OAAO,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC;QAC3C,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;QAEvB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YACxB,mDAAmD;YACnD,OAAO,SAAS,CAAC;QACrB,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}
+{"version":3,"file":"get-first-exit.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-first-exit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,MAAc;IAChC,IAAI,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC;IAElC,OAAO,OAAO,KAAK,MAAM,EAAE,CAAC;QACxB,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,OAAO,OAAO,CAAC;QACnB,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IACnC,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,YAAY,EAAE,CAAA"}

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

@@ -1,3 +1,11 @@
 import type { CpNode } from '../cp-node.js';
-declare function getImpliedBoundaryBezierBetween(cpNodeA: CpNode, cpNodeB: CpNode): number[][] | undefined;
+/**
+ * Returns the bezier curves (an array of 1 or 2 lines or quadratics joined
+ * smoothly) approximating the shape boundary between the contact points of
+ * two `CpNode`s.
+ *
+ * @param cpNodeA
+ * @param cpNodeB
+ */
+declare function getImpliedBoundaryBezierBetween(cpNodeA: CpNode, cpNodeB: CpNode): number[][][];
 export { getImpliedBoundaryBezierBetween };

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

@@ -1,59 +1,15 @@
-import { tangent } from 'flo-bezier3';
-import { fromTo, dot, cross, translate, lineLineIntersection, toUnitVector } from 'flo-vector2d';
-const { abs } = Math;
-/** @internal */
-const TOLERANCE_ADD_2PRONG = 0.01;
-/** @internal */
-const TOLERANCE_USE_LINE = 0.0001; // else cubic
+import { getBoundaryTangentLine } from '../../point-on-shape/get-boundary-tangent-line.js';
+import { getBeziersFromTangents } from '../../utils/get-beziers-from-tangents.js';
+/**
+ * Returns the bezier curves (an array of 1 or 2 lines or quadratics joined
+ * smoothly) approximating the shape boundary between the contact points of
+ * two `CpNode`s.
+ *
+ * @param cpNodeA
+ * @param cpNodeB
+ */
 function getImpliedBoundaryBezierBetween(cpNodeA, cpNodeB) {
-    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]) {
-        return [pA];
-    }
-    if (tA === 1) {
-        tA = 0;
-        curveA = curveA.next;
-    }
-    if (tB === 0) {
-        tB = 1;
-        curveB = curveB.prev;
-    }
-    const { ps: psA } = curveA;
-    const { ps: psB } = curveB;
-    const lA = [pA, translate(pA)(toUnitVector(tangent(psA, tA)))];
-    const lB = [pB, translate(pB)(toUnitVector(tangent(psB, tB)))];
-    const mid = lineLineIntersection(lA, lB);
-    const c = fromTo(pA, pB);
-    let twisted;
-    if (!mid) {
-        twisted = true;
-    }
-    else {
-        const a = fromTo(pA, mid);
-        const b = fromTo(pB, mid);
-        twisted = dot(a, c) < 0 || dot(b, c) > 0;
-    }
-    if (!twisted) {
-        // drawFs.bezier(g, [pA, mid!, pB], 'thin10 pink nofill', 0)
-        return [pA, mid, pB];
-    }
-    const w1 = fromTo(lA[0], lA[1]); // This is a unit vector
-    const w2 = fromTo(lB[0], lB[1]); // This is a unit vector
-    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) {
-        // not within tolerance
-        return undefined;
-    }
-    if (d1 > TOLERANCE_USE_LINE || d2 > TOLERANCE_USE_LINE) {
-        // approximate with cubic bezier?
-        return undefined; // add 2-prong
-    }
-    // Within tolerance - approximate with a straight line.
-    return [pA, pB];
+    return getBeziersFromTangents(getBoundaryTangentLine(cpNodeA.pointOnShape, true), getBoundaryTangentLine(cpNodeB.pointOnShape, false));
 }
 export { getImpliedBoundaryBezierBetween };
 //# sourceMappingURL=get-implied-boundary-bezier-between.js.map

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":"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"}
+{"version":3,"file":"get-implied-boundary-bezier-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-implied-boundary-bezier-between.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAC3F,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAGlF;;;;;;;GAOG;AACH,SAAS,+BAA+B,CAChC,OAAe,EACf,OAAe;IAEnB,OAAO,sBAAsB,CACzB,sBAAsB,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,EAClD,sBAAsB,CAAC,OAAO,CAAC,YAAY,EAAE,KAAK,CAAC,CACtD,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,+BAA+B,EAAE,CAAA"}

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

@@ -1,10 +1,11 @@
 import type { CpNode } from '../cp-node.js';
 /**
- * Returns the bezier curve from the maximal disk of one `CpNode` to another
- * `CpNode`'s maximal disk.
+ * Returns the bezier curves (an array of 1 or 2 lines or quadratics joined
+ * smoothly) from the maximal disk of one `CpNode` to another `CpNode`'s
+ * maximal disk.
  *
  * @param cpNodeFrom
  * @param cpNodeTo
  */
-declare function getMatCurveBetween(cpNodeFrom: CpNode, cpNodeTo: CpNode): number[][];
+declare function getMatCurveBetween(cpNodeFrom: CpNode, cpNodeTo: CpNode): number[][][];
 export { getMatCurveBetween };

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

@@ -1,59 +1,15 @@
-import { fromTo as fromToVec, 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 */
-const TOLERANCE_USE_LINE = 0.0001; // else cubic
+import { getBeziersFromTangents } from '../../utils/get-beziers-from-tangents.js';
 /**
- * Returns the bezier curve from the maximal disk of one `CpNode` to another
- * `CpNode`'s maximal disk.
+ * Returns the bezier curves (an array of 1 or 2 lines or quadratics joined
+ * smoothly) from the maximal disk of one `CpNode` to another `CpNode`'s
+ * maximal disk.
  *
  * @param cpNodeFrom
  * @param cpNodeTo
  */
 function getMatCurveBetween(cpNodeFrom, cpNodeTo) {
-    const fromCc = cpNodeFrom.pointOnShape.circle.center;
-    const fromL = getEdgeDirection(cpNodeFrom);
-    const toCc = cpNodeTo.pointOnShape.circle.center;
-    const toL = getEdgeDirection(cpNodeTo.prevOnCircle);
-    const mid = lineLineIntersection(fromL, toL);
-    const c = fromToVec(fromCc, toCc);
-    let twisted;
-    if (!mid) {
-        twisted = true;
-    }
-    else {
-        const a = fromToVec(fromCc, mid);
-        const b = fromToVec(toCc, mid);
-        twisted = dot(a, c) < 0 || dot(b, c) > 0;
-    }
-    if (!twisted) {
-        return [fromCc, mid, toCc];
-    }
-    const r = rotate90Degrees(c);
-    const w1 = fromToVec(fromL[0], fromL[1]); // This is a unit vector
-    const w2 = fromToVec(toL[0], toL[1]); // This is a unit vector
-    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) {
-        // FUTURE - not within tolerance - must add additional 2-prong
-        return [fromCc, toCc];
-    }
-    if (d1 > TOLERANCE_USE_LINE || d2 > TOLERANCE_USE_LINE) {
-        // approximate with cubic bezier
-        const m1 = interpolate(fromCc, toCc, 1 / 3);
-        const m2 = interpolate(fromCc, toCc, 2 / 3);
-        const v1 = translate(r, m1);
-        const v2 = translate(r, m2);
-        const l1 = [m1, v1];
-        const l2 = [m2, v2];
-        const mid1 = lineLineIntersection(fromL, l1);
-        const mid2 = lineLineIntersection(toL, l2);
-        return [fromCc, mid1, mid2, toCc];
-    }
-    // Within tolerance - approximate with a straight line.
-    return [fromCc, toCc];
+    return getBeziersFromTangents(getEdgeDirection(cpNodeFrom), getEdgeDirection(cpNodeTo.prevOnCircle));
 }
 export { getMatCurveBetween };
 //# sourceMappingURL=get-mat-curve-between.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"get-mat-curve-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-mat-curve-between.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"get-mat-curve-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-mat-curve-between.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAGlF;;;;;;;GAOG;AACH,SAAS,kBAAkB,CACnB,UAAkB,EAClB,QAAgB;IAEpB,OAAO,sBAAsB,CACzB,gBAAgB,CAAC,UAAU,CAAC,EAC5B,gBAAgB,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC1C,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,kBAAkB,EAAE,CAAA"}

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

@@ -5,7 +5,7 @@ import { CpNode } from '../cp-node.js';
  * medial axis.
  * @param cpNode
  */
-declare function getMatCurveToNext(cpNode: CpNode): number[][];
+declare function getMatCurveToNext(cpNode: CpNode): number[][][];
 declare const getMatCurveToNext$: typeof getMatCurveToNext & {
     readonly weakMapS: WeakMap<object, {
         readonly weakMap: WeakMap<object, any>;

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

@@ -1,3 +1,11 @@
 import { CpNode } from '../cp-node.js';
+/**
+ * Returns the (flattened) array of bezier curves (lines or quadratics)
+ * representing the medial axis from one `CpNode` to another by following
+ * `next` repeatedly.
+ *
+ * @param cpNodeS
+ * @param cpNodeE
+ */
 declare function getMatCurvesBetween(cpNodeS: CpNode, cpNodeE: CpNode): number[][][];
 export { getMatCurvesBetween };

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

@@ -1,10 +1,17 @@
 import { getMatCurveBetween } from './get-mat-curve-between.js';
+/**
+ * Returns the (flattened) array of bezier curves (lines or quadratics)
+ * representing the medial axis from one `CpNode` to another by following
+ * `next` repeatedly.
+ *
+ * @param cpNodeS
+ * @param cpNodeE
+ */
 function getMatCurvesBetween(cpNodeS, cpNodeE) {
     let cpNode = cpNodeS;
     const pss = [];
     while (cpNode !== cpNodeE) {
-        const ps = getMatCurveBetween(cpNode, cpNode.next);
-        pss.push(ps);
+        pss.push(...getMatCurveBetween(cpNode, cpNode.next));
         cpNode = cpNode.next;
     }
     return pss;

package/node/cp-node/fs/get-mat-curves-between.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-mat-curves-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-mat-curves-between.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE,SAAS,mBAAmB,CACpB,OAAe,EACf,OAAe;IAEnB,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,MAAM,GAAG,GAAiB,EAAE,CAAC;IAC7B,OAAO,MAAM,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QACnD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEb,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"get-mat-curves-between.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-mat-curves-between.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAGhE;;;;;;;GAOG;AACH,SAAS,mBAAmB,CACpB,OAAe,EACf,OAAe;IAEnB,IAAI,MAAM,GAAG,OAAO,CAAC;IACrB,MAAM,GAAG,GAAiB,EAAE,CAAC;IAC7B,OAAO,MAAM,KAAK,OAAO,EAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAErD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/node/cp-node/fs/get-real-prong-count.d.ts

@@ -1,7 +1,8 @@
 import { CpNode } from "../cp-node.js";
 /**
  * Returns the number of contact points (up to planar coordinates) on the
- * maximal disk circle implied by this `CpNode`.
+ * maximal disk circle implied by this `CpNode`, i.e. the number of
+ * non-terminating `CpNode`s on its circle.
  *
  * See also `getProngCount`.
  */

package/node/cp-node/fs/get-real-prong-count.js

@@ -1,15 +1,21 @@
-import { getAllOnCircle } from "./get-all-on-circle.js";
 import { isTerminating } from "./is-terminating.js";
 /**
  * Returns the number of contact points (up to planar coordinates) on the
- * maximal disk circle implied by this `CpNode`.
+ * maximal disk circle implied by this `CpNode`, i.e. the number of
+ * non-terminating `CpNode`s on its circle.
  *
  * See also `getProngCount`.
  */
 function getRealProngCount(cpNode) {
-    const nonTerminatingCpNodes = getAllOnCircle(cpNode)
-        .filter(cpNode => !isTerminating(cpNode));
-    return nonTerminatingCpNodes.length;
+    let count = 0;
+    let cpNode_ = cpNode;
+    do {
+        if (!isTerminating(cpNode_)) {
+            count++;
+        }
+        cpNode_ = cpNode_.nextOnCircle;
+    } while (cpNode_ !== cpNode);
+    return count;
 }
 export { getRealProngCount };
 //# sourceMappingURL=get-real-prong-count.js.map

package/node/cp-node/fs/get-real-prong-count.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-real-prong-count.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-real-prong-count.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,MAAc;IACrC,MAAM,qBAAqB,GAAG,cAAc,CAAC,MAAM,CAAC;SACnD,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1C,OAAO,qBAAqB,CAAC,MAAM,CAAC;AACxC,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}
+{"version":3,"file":"get-real-prong-count.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-real-prong-count.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,MAAc;IACrC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,GAAG,CAAC;QACA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;YAAC,KAAK,EAAE,CAAC;QAAC,CAAC;QACzC,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC;IACnC,CAAC,QAAQ,OAAO,KAAK,MAAM,EAAE;IAE7B,OAAO,KAAK,CAAC;AACjB,CAAC;AAGD,OAAO,EAAE,iBAAiB,EAAE,CAAA"}

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

@@ -1,6 +1,16 @@
 import type { CpNode } from "../cp-node.js";
 /**
+ * Returns the salience of the given `CpNode`: the ratio of the boundary length
+ * from its contact point forward to the next contact point on its circle to
+ * the straight distance between those two points.
+ *
+ * * `Infinity` if that stretch of boundary passes a hole closer
+ * * `0` if the two contact points coincide with no boundary in between (the
+ *   terminating `CpNode` of a 1-prong) - the other `CpNode` of a 1-prong,
+ *   whose stretch is the entire boundary, gives `Infinity`
+ *
  * See https://research.gold.ac.uk/id/eprint/31944/
+ *
  * @param cpNode
  */
 declare function getSalience(cpNode: CpNode): number;

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

@@ -3,7 +3,17 @@ import { totalLength } from "flo-bezier3";
 import { getBoundaryBeziersBetween } from "./get-boundary-beziers-between.js";
 import { sum } from '../../utils/sum.js';
 /**
+ * Returns the salience of the given `CpNode`: the ratio of the boundary length
+ * from its contact point forward to the next contact point on its circle to
+ * the straight distance between those two points.
+ *
+ * * `Infinity` if that stretch of boundary passes a hole closer
+ * * `0` if the two contact points coincide with no boundary in between (the
+ *   terminating `CpNode` of a 1-prong) - the other `CpNode` of a 1-prong,
+ *   whose stretch is the entire boundary, gives `Infinity`
+ *
  * See https://research.gold.ac.uk/id/eprint/31944/
+ *
  * @param cpNode
  */
 function getSalience(cpNode) {
@@ -14,7 +24,13 @@ function getSalience(cpNode) {
     const d = distanceBetween(bp1, bp2);
     const { pss, hasHoleCloser } = getBoundaryBeziersBetween(cpNode1, cpNode2);
     const s = sum(pss.map(ps => totalLength(ps)));
-    return hasHoleCloser ? Infinity : s / d;
+    if (hasHoleCloser) {
+        return Infinity;
+    }
+    if (s === 0) {
+        return 0;
+    } // (avoids `0/0` for the 1-prong case)
+    return s / d;
 }
 export { getSalience };
 //# sourceMappingURL=get-salience.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"get-salience.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-salience.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAGzC;;;GAGG;AACH,SAAS,WAAW,CAAC,MAAc;IAC/B,MAAM,OAAO,GAAG,MAAM,CAAC;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnC,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE3E,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE9C,OAAO,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAC,CAAC,CAAC;AAC1C,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}
+{"version":3,"file":"get-salience.js","sourceRoot":"","sources":["../../../src/cp-node/fs/get-salience.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAGzC;;;;;;;;;;;;;GAaG;AACH,SAAS,WAAW,CAAC,MAAc;IAC/B,MAAM,OAAO,GAAG,MAAM,CAAC;IACvB,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC;IACpC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IACnC,MAAM,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnC,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE3E,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE9C,IAAI,aAAa,EAAE,CAAC;QAAC,OAAO,QAAQ,CAAC;IAAC,CAAC;IACvC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAAC,OAAO,CAAC,CAAC;IAAC,CAAC,CAAE,sCAAsC;IAElE,OAAO,CAAC,GAAC,CAAC,CAAC;AACf,CAAC;AAGD,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/node/cp-node/fs/is-fully-terminating.d.ts

@@ -1,7 +1,9 @@
 import type { CpNode } from "../cp-node.js";
 /**
- * Like `isTerminating` but only returns true if all `CpNode`s on the circle
- * (except this.prevOnCircle) is terminating.
+ * Like `isTerminating` but only returns `true` if all `CpNode`s on the circle
+ * (except possibly the one leading back, i.e. `this.prevOnCircle`) are
+ * terminating - i.e. the `CpNode` is terminating and its vertex has at most
+ * one real prong.
  */
 declare function isFullyTerminating(cpNode: CpNode): boolean;
 export { isFullyTerminating };

package/node/cp-node/fs/is-fully-terminating.js

@@ -1,22 +1,13 @@
-import { getAllOnCircle } from "./get-all-on-circle.js";
+import { getRealProngCount } from "./get-real-prong-count.js";
 import { isTerminating } from "./is-terminating.js";
-import { isTrivial } from "./is-trivial.js";
 /**
- * Like `isTerminating` but only returns true if all `CpNode`s on the circle
- * (except this.prevOnCircle) is terminating.
+ * Like `isTerminating` but only returns `true` if all `CpNode`s on the circle
+ * (except possibly the one leading back, i.e. `this.prevOnCircle`) are
+ * terminating - i.e. the `CpNode` is terminating and its vertex has at most
+ * one real prong.
  */
 function isFullyTerminating(cpNode) {
-    if (!isTerminating(cpNode)) {
-        return false;
-    }
-    if (isTrivial(cpNode)) {
-        return true;
-    }
-    while (cpNode.prev === cpNode.prevOnCircle) {
-        cpNode = cpNode.prev;
-    }
-    return getAllOnCircle(cpNode.prevOnCircle, true)
-        .every(isTerminating);
+    return isTerminating(cpNode) && getRealProngCount(cpNode) <= 1;
 }
 export { isFullyTerminating };
 //# sourceMappingURL=is-fully-terminating.js.map

package/node/cp-node/fs/is-fully-terminating.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-fully-terminating.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-fully-terminating.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;GAGG;AACH,SAAS,kBAAkB,CAAC,MAAc;IACtC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO,cAAc,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC;SAC3C,KAAK,CAAC,aAAa,CAAC,CAAC;AAC9B,CAAC;AAGD,OAAO,EAAE,kBAAkB,EAAE,CAAA"}
+{"version":3,"file":"is-fully-terminating.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-fully-terminating.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,MAAc;IACtC,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAGD,OAAO,EAAE,kBAAkB,EAAE,CAAA"}

package/node/cp-node/fs/is-on-same-loop.d.ts

@@ -1,3 +1,3 @@
-import type { CpNode } from "flo-mat";
+import { CpNode } from "../cp-node.js";
 declare function isOnSameLoop(cpNode1: CpNode, cpNode2: CpNode): boolean;
 export { isOnSameLoop };

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

@@ -1,3 +1,10 @@
 import type { CpNode } from "../cp-node.js";
+/**
+ * Returns `true` if the given `CpNode` is on a 'special' MAT vertex, i.e. one
+ * that is not a plain 2-prong: a leaf, a 3-prong (or higher) or a hole-closer.
+ *
+ * * these are the vertices that must be kept when simplifying the MAT and
+ *   the vertices of the MAT seen as a graph
+ */
 declare function isSpecial(cpNode: CpNode): boolean;
 export { isSpecial };

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

@@ -1,7 +1,14 @@
 import { getRealProngCount } from "./get-real-prong-count.js";
+/**
+ * Returns `true` if the given `CpNode` is on a 'special' MAT vertex, i.e. one
+ * that is not a plain 2-prong: a leaf, a 3-prong (or higher) or a hole-closer.
+ *
+ * * these are the vertices that must be kept when simplifying the MAT and
+ *   the vertices of the MAT seen as a graph
+ */
 function isSpecial(cpNode) {
-    return ((getRealProngCount(cpNode) !== 2) &&
-        !cpNode.isHoleClosing);
+    return (getRealProngCount(cpNode) !== 2 ||
+        cpNode.isHoleClosing);
 }
 export { isSpecial };
 //# sourceMappingURL=is-special.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"is-special.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-special.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D,SAAS,SAAS,CACV,MAAc;IAElB,OAAO,CACH,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,MAAM,CAAC,aAAa,CACxB,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}
+{"version":3,"file":"is-special.js","sourceRoot":"","sources":["../../../src/cp-node/fs/is-special.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAG9D;;;;;;GAMG;AACH,SAAS,SAAS,CAAC,MAAc;IAC7B,OAAO,CACH,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC;QAC/B,MAAM,CAAC,aAAa,CACvB,CAAC;AACN,CAAC;AAGD,OAAO,EAAE,SAAS,EAAE,CAAA"}

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

@@ -1,3 +1,3 @@
-import { CpNode } from "../cp-node.js";
+import type { CpNode } from "../cp-node.js";
 declare function isVertex(f: (cpNode: CpNode) => boolean): (cpNode: CpNode) => boolean;
 export { isVertex };

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

@@ -1,8 +1,12 @@
 import { CpNode } from '../cp-node.js';
 /**
- * Traverses all edges (depth first) of the given MAT tree starting at the given
- * vertex (represented by a `CpNode`).
- * @param cpNode Any `CpNode` representing the start vertex.
+ * Traverses all edges of the given MAT tree exactly once each, calling the
+ * callback for one of the two `CpNode`s representing each edge.
+ *
+ * * the edges are visited in boundary order starting from the given `CpNode`
+ *   (not depth first)
+ *
+ * @param cpNode Any `CpNode` on the MAT.
  * @param traverseEdgesCallback A callback function for each CpNode representing the vertex at the
  * start of an edge.
  */

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

@@ -1,9 +1,13 @@
 import { isTerminating } from './is-terminating.js';
 import { getAllOnLoop } from './get-all-on-loop.js';
 /**
- * Traverses all edges (depth first) of the given MAT tree starting at the given
- * vertex (represented by a `CpNode`).
- * @param cpNode Any `CpNode` representing the start vertex.
+ * Traverses all edges of the given MAT tree exactly once each, calling the
+ * callback for one of the two `CpNode`s representing each edge.
+ *
+ * * the edges are visited in boundary order starting from the given `CpNode`
+ *   (not depth first)
+ *
+ * @param cpNode Any `CpNode` on the MAT.
  * @param traverseEdgesCallback A callback function for each CpNode representing the vertex at the
  * start of an edge.
  */

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

@@ -1 +1 @@
-{"version":3,"file":"traverse-edges.js","sourceRoot":"","sources":["../../../src/cp-node/fs/traverse-edges.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD;;;;;;GAMG;AACH,SAAS,aAAa,CACd,MAAc,EACd,qBAA+C;IAEnD,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,IAAI,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAChE,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}
+{"version":3,"file":"traverse-edges.js","sourceRoot":"","sources":["../../../src/cp-node/fs/traverse-edges.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGpD;;;;;;;;;;GAUG;AACH,SAAS,aAAa,CACd,MAAc,EACd,qBAA+C;IAEnD,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,KAAK,MAAM,IAAI,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAChE,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,CAAC;AACL,CAAC;AAGD,OAAO,EAAE,aAAa,EAAE,CAAA"}

package/node/cp-node/stringification/from-stringifyable.d.ts

@@ -1,4 +1,4 @@
-import type { CpNode } from "../cp-node";
-import type { CpNodeStringifyable } from "./cp-node-stringifyable";
+import type { CpNode } from "../cp-node.js";
+import type { CpNodeStringifyable } from "./cp-node-stringifyable.js";
 declare function fromStringifyable(cpNodesStringifyable: CpNodeStringifyable): CpNode;
 export { fromStringifyable };

package/node/cp-node/stringification/from-stringifyable.js

@@ -1,4 +1,4 @@
-import { EDGES } from "./cp-node-stringifyable";
+import { EDGES } from "./cp-node-stringifyable.js";
 import { getAllOnCircle } from "../fs/get-all-on-circle.js";
 import { loopFromStringifyable } from './loop-from-stringifyable.js';
 function fromStringifyable(cpNodesStringifyable) {