flo-mat 3.0.14 → 4.0.1

package/node/mat/create-new-cp-trees.js

@@ -0,0 +1,24 @@
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { cpNodeComparator } from '../cp-node/fs/cp-node-comparator.js';
+import { getAllOnLoop } from '../cp-node/fs/get-all-on-loop.js';
+/**
+ * @param cpNode
+ *
+ * @internal
+ */
+function createNewCpTrees(cpNode) {
+    const cpTrees_ = new Map();
+    getAllOnLoop(cpNode).forEach(createNewCpTree_);
+    function createNewCpTree_(cpNode) {
+        const loop = cpNode.pointOnShape.curve.loop;
+        let cpTree = cpTrees_.get(loop);
+        if (!cpTree) {
+            cpTree = new LlRbTree(cpNodeComparator, false);
+            cpTrees_.set(loop, cpTree);
+        }
+        cpTree.insert(cpNode);
+    }
+    return cpTrees_;
+}
+export { createNewCpTrees };
+//# sourceMappingURL=create-new-cp-trees.js.map

package/node/mat/create-new-cp-trees.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-new-cp-trees.js","sourceRoot":"","sources":["../../src/mat/create-new-cp-trees.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAIhE;;;;GAIG;AACH,SAAS,gBAAgB,CACjB,MAAc;IAElB,MAAM,QAAQ,GAA+B,IAAI,GAAG,EAAE,CAAC;IAEvD,YAAY,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE/C,SAAS,gBAAgB,CAAC,MAAc;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5C,IAAI,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,GAAG,IAAI,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAC/C,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,CAAC;QACD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/mat/curve-piece.d.ts

@@ -1,12 +1,12 @@
-import { Curve } from '../curve/curve.js';
+import type { Curve } from 'flo-boolean';
 /**
  * @internal
  * Represents a part of a bezier within the shape boundary.
  */
 interface CurvePiece {
     /** A bezier curve within the shape boundary. */
-    curve: Curve;
+    readonly curve: Curve;
     /** The start and end t parameter values of the bezier curve. */
-    ts: number[];
+    readonly ts: number[];
 }
-export { CurvePiece };
+export type { CurvePiece };

package/node/mat/get-boundary-piece-beziers.d.ts

@@ -1,12 +1,12 @@
-import { CpNode } from '../cp-node/cp-node.js';
-import { CurvePiece } from './curve-piece.js';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { CurvePiece } from './curve-piece.js';
 /**
- * @internal
- * Returns the ordered cubic bezier pieces (i.e a bezier with a t range)
- * from the given boundary piece.
+ * Returns the ordered bezier pieces between from the given boundary piece.
  *
  * @param cpNodes - An ordered pair that represents the start and end points of
  * the boundary piece
+ *
+ * @internal
  */
 declare function getBoundaryPieceBeziers(cpNodes: CpNode[]): CurvePiece[];
 export { getBoundaryPieceBeziers };

package/node/mat/get-boundary-piece-beziers.js

@@ -1,45 +1,149 @@
-import { isPosQuiteSharpCorner } from '../point-on-shape/is-pos-quite-sharp-corner.js';
-import { compareCps } from '../contact-point/contact-point.js';
+import { comparePoss } from '../point-on-shape/compare-poss.js';
 /**
- * @internal
- * Returns the ordered cubic bezier pieces (i.e a bezier with a t range)
- * from the given boundary piece.
+ * Returns the ordered bezier pieces between from the given boundary piece.
  *
  * @param cpNodes - An ordered pair that represents the start and end points of
  * the boundary piece
+ *
+ * @internal
  */
 function getBoundaryPieceBeziers(cpNodes) {
     let cpThis = cpNodes[0];
     const cpEnd = cpNodes[1];
     const curvePieces = [];
+    // NOTE❗ Currently removed stichables; we're just checking for duplicates
+    // later in `find2Prong`; KEEP for possible future use.
+    // We have to stich curves together if they're at a hole closer or at the
+    // endpoints of a loop to avoid duplicates later within the code; the map
+    // is from curves
+    // const stichables: Map<Curve, number[]> = new Map();
     // As opposed to going around the circle and taking the last exit
     let goStraight = true;
     do {
+        const posThis = cpThis.pointOnShape;
+        const posNext = cpThis.next.pointOnShape;
+        const curveThis = posThis.curve;
+        const curveNext = posNext.curve;
         if (!goStraight) {
             goStraight = true;
+            // NOTE❗ Currently removed stichables; we're just checking for duplicates
+            // later in `find2Prong`; KEEP for possible future use.
+            // const { loop: loopThis } = curveThis;
+            // const cpPrevOnCircle = cpThis.prevOnCircle;
+            // const curvePrevOnCircle = cpPrevOnCircle.pointOnShape.curve;
+            // const { loop: loopNext } = cpPrevOnCircle.pointOnShape.curve;
+            // if (loopThis !== loopNext) {
+            //     let idxsThis = stichables.get(curveThis);
+            //     if (idxsThis === undefined) {
+            //         idxsThis = [];
+            //         stichables.set(curveThis, idxsThis);
+            //     }
+            //     idxsThis.push(curvePieces.length - 1);  // last `CurvePiece` idx
+            //     let idxsNext = stichables.get(curvePrevOnCircle);
+            //     if (idxsNext === undefined) {
+            //         idxsNext = [];
+            //         stichables.set(curvePrevOnCircle, idxsNext);
+            //     }
+            //     idxsNext.push(curvePieces.length);  // upcoming `CurvePiece` idx
+            // }
+            // cpThis = cpPrevOnCircle;  // take last exit
             cpThis = cpThis.prevOnCircle; // take last exit
             continue;
         }
         goStraight = false;
-        const posThis = cpThis.cp.pointOnShape;
-        const posNext = cpThis.next.cp.pointOnShape;
-        if (posNext.curve === posThis.curve &&
-            isPosQuiteSharpCorner(posThis) &&
-            isPosQuiteSharpCorner(posNext)) {
-            // Do nothing
-        }
-        else if (posNext.curve === posThis.curve &&
-            compareCps(cpThis.next.cp, cpThis.cp) > 0) {
-            curvePieces.push({ curve: posThis.curve, ts: [posThis.t, posNext.t] });
+        if (curveNext === curveThis &&
+            comparePoss(posNext, posThis) > 0) {
+            // The boundary stays on the same curve segment *and* the next pos
+            // is further along the *linear* boundary. If it is *not* further
+            // on the *linear* boundary then this pos precedes the abrupt break
+            // in the ordering and next pos comes after the break so the code in
+            // the next `else` statement is called to skip over the break.
+            // The other case in which `comparePoss(posNext, posThis) <= 0` is
+            // possible for hole closers where the oderering of this and next
+            // are the same except for `order2`
+            curvePieces.push({
+                curve: curveThis, ts: [posThis.t, posNext.t]
+            });
+            cpThis = cpThis.next;
+            continue;
         }
-        else {
-            curvePieces.push({ curve: posThis.curve, ts: [posThis.t, 1] });
-            if (posThis.curve.loop === posNext.curve.loop) {
-                addSkippedBeziers(curvePieces, posThis.curve, posNext.curve, posNext.t);
-            }
+        // The segment crosses a curve boundary because either:
+        // 1. `this` and `next` are not on the same curve OR
+        // 2. `this` comes after `next` by ordering
+        // so split at t = 1.
+        if (curveThis.loop === curveNext.loop) {
+            const initialCurvePiece = {
+                curve: curveThis, ts: [posThis.t, 1]
+            };
+            curvePieces.push(initialCurvePiece);
+            // Fill in any curves skipped between the two points.
+            addSkippedBeziers(curvePieces, curveThis, curveNext, posNext.t);
+            // NOTE❗ Currently removed stichables; we're just checking for duplicates
+            // later in `find2Prong`; KEEP for possible future use.
+            // const finalCurvePiece = curvePieces[curvePieces.length - 1];
+            // if (initialCurvePiece.curve === finalCurvePiece!.curve) {
+            //     const { ts: tsS } = initialCurvePiece;
+            //     const { ts: tsE } = finalCurvePiece!;
+            //     // If it is a closed loop we must join the endpoints to prevent duplicate
+            //     // antipodal points later
+            //     if (tsS[0] === tsE[1]) {
+            //         initialCurvePiece.ts[0] = tsE[0];
+            //         if (curvePieces.length > 1) {
+            //             curvePieces.pop();
+            //         }
+            //         // console.log('was inner closed loop')
+            //     }
+            // }
         }
         cpThis = cpThis.next;
     } while (cpThis !== cpEnd);
+    // NOTE❗ Currently removed stichables; we're just checking for duplicates
+    // later in `find2Prong`; KEEP for possible future use.
+    // if (stichables.size > 0) {
+    //     for (const [loop,idxs] of stichables.entries()) {
+    //         if (idxs.length === 2) {
+    //             const curvePieceS = curvePieces[idxs[0]]!;
+    //             const curvePieceE = curvePieces[idxs[1]]!;
+    //             if (curvePieceS === undefined || curvePieceE === undefined) {
+    //                 console.log(curvePieceS);
+    //                 console.log(curvePieceE);
+    //                 continue;
+    //             }
+    //             const { curve: curveS, ts: tsS } = curvePieceS;
+    //             const { curve: curveE, ts: tsE } = curvePieceE;
+    //             if (curveS !== curveE) {
+    //                 continue;
+    //             }
+    //             // If it is a closed loop we must join the endpoints to prevent duplicate
+    //             // antipodal points later
+    //             if (tsS[0] === tsE[1]) {
+    //                 curvePieceS.ts[0] = tsE[0];
+    //                 // console.log('was closed loop 1')
+    //             } else if (tsE[0] === tsS[1]) {
+    //                 curvePieceS.ts[1] = tsE[1];
+    //                 // console.log('was closed loop 2')
+    //             }
+    //             if (idxs[0] !== idxs[1]) {
+    //                 curvePieces[idxs[1]] = undefined;
+    //             }
+    //         }
+    //     }
+    // }
+    // NOTE❗ The below endcurve check is not enough for specific cases involving
+    // multiple hole closers; KEEP for now but must use stichables instead
+    // if (curvePieces[0]!.curve === curvePieces[curvePieces.length - 1]!.curve) {
+    //     const { ts: tsS } = curvePieces[0]!;
+    //     const { ts: tsE } = curvePieces[curvePieces.length - 1]!;
+    //     // If it is a closed loop we must join the endpoints to prevent duplicate
+    //     // antipodal points later
+    //     if (tsS[0] === tsE[1]) {
+    //         curvePieces[0]!.ts[0] = tsE[0];
+    //         if (curvePieces.length > 1) {
+    //             curvePieces.pop();
+    //         }
+    //         // console.log('was closed loop')
+    //     }
+    // }
     return curvePieces;
 }
 /**
@@ -47,6 +151,7 @@ function getBoundaryPieceBeziers(cpNodes) {
  * Adds pieces of skipped beziers
  */
 function addSkippedBeziers(curvePieces, curveStart, curveEnd, t1) {
+    // Walk forward through the loop until the end curve is reached.
     let curveThis = curveStart;
     do {
         curveThis = curveThis.next;

package/node/mat/get-boundary-piece-beziers.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-boundary-piece-beziers.js","sourceRoot":"","sources":["../../src/mat/get-boundary-piece-beziers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gDAAgD,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D;;;;;;;GAOG;AACH,SAAS,uBAAuB,CAAC,OAAiB;IAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACxB,MAAM,KAAK,GAAI,OAAO,CAAC,CAAC,CAAC,CAAC;IAE1B,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,iEAAiE;IACjE,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,GAAG,CAAC;QACA,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,UAAU,GAAG,IAAI,CAAC;YAClB,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,iBAAiB;YAC/C,SAAS;QACb,CAAC;QAED,UAAU,GAAG,KAAK,CAAC;QAEnB,MAAM,OAAO,GAAG,MAAM,CAAM,EAAE,CAAC,YAAY,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC;QAE5C,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;YAC/B,qBAAqB,CAAC,OAAO,CAAC;YAC9B,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;YAEjC,aAAa;QACjB,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;YAC/B,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;YAEnD,WAAW,CAAC,IAAI,CACZ,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CACvD,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,WAAW,CAAC,IAAI,CACZ,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAC/C,CAAC;YAEF,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC5C,iBAAiB,CACT,WAAW,EACX,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,CAAC,CAChB,CAAC;YACN,CAAC;QACL,CAAC;QAED,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC;IACzB,CAAC,QAAQ,MAAM,KAAK,KAAK,EAAE;IAG3B,OAAO,WAAW,CAAC;AACvB,CAAC;AAGD;;;GAGG;AACH,SAAS,iBAAiB,CAClB,WAAyB,EACzB,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,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,QAAQ,SAAS,KAAK,QAAQ,EAAE;AACrC,CAAC;AAGD,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
+{"version":3,"file":"get-boundary-piece-beziers.js","sourceRoot":"","sources":["../../src/mat/get-boundary-piece-beziers.ts"],"names":[],"mappings":"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"}

package/node/mat/get-branches.d.ts

@@ -1,4 +1,4 @@
-import { CpNode } from '../cp-node/cp-node.js';
+import type { CpNode } from '../cp-node/cp-node.js';
 /**
  * Returns all branches associated with the give cpNode.
  *

package/node/mat/get-closeby-cp-if-exist.d.ts

@@ -1,7 +1,7 @@
-import { CpNode } from '../cp-node/cp-node.js';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { Circle } from '../geometry/circle.js';
-import { MatMeta } from './mat-meta.js';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { Circle } from '../geometry/circle.js';
+import type { MatMeta } from './mat-meta.js';
 /**
  * @internal
  * If another `CpNode` is close by (to the given implied (via `pos`, `order` and
@@ -13,5 +13,5 @@ import { MatMeta } from './mat-meta.js';
  * @param order
  * @param order2
  */
-declare function getCloseByCpIfExist(meta: MatMeta, pos: PointOnShape, circle: Circle, order: number, order2: number, forProngCount?: number): CpNode | undefined;
+declare function getCloseByCpIfExist(meta: MatMeta, pos: PrePointOnShape, circle: Circle, order: number, order2: number, forProngCount?: number): CpNode | undefined;
 export { getCloseByCpIfExist };

package/node/mat/get-closeby-cp-if-exist.js

@@ -15,9 +15,9 @@ const ANGLE_THRESHOLD = Math.cos(DEGREES * (Math.PI / 180));
  * @param order2
  */
 function getCloseByCpIfExist(meta, pos, circle, order, order2, forProngCount) {
-    const { cpTrees, maxCoordinate } = meta;
-    const DISTANCE_THRESHOLD = maxCoordinate * 2e-14;
-    const DISTANCE_THRESHOLD_2 = DISTANCE_THRESHOLD * 2e-2;
+    const { cpTrees, maxCoordPowerOf2 } = meta;
+    const DISTANCE_THRESHOLD = 2 ** (maxCoordPowerOf2 - 40); // approx. 1e-9 for 1024 x 1024 shapes
+    const DISTANCE_THRESHOLD_2 = 2 ** (maxCoordPowerOf2 - 46);
     const cpTree = cpTrees.get(pos.curve.loop);
     const cur = getCpNodeToLeftOrSame(cpTree, pos, order, order2);
     if (!cur) {
@@ -26,13 +26,14 @@ function getCloseByCpIfExist(meta, pos, circle, order, order2, forProngCount) {
     const cpNodes = [cur, cur.next];
     const { p, t } = pos;
     for (const cpNode of cpNodes) {
-        const pos2 = cpNode.cp.pointOnShape;
+        const pos2 = cpNode.pointOnShape;
         const p2 = pos2.p;
         const d = distanceBetween(p, p2);
         if (d > DISTANCE_THRESHOLD) {
             continue;
         }
-        const v1 = toUnitVector(fromTo(p2, cpNode.cp.circle.center));
+        // return cpNode;
+        const v1 = toUnitVector(fromTo(p2, cpNode.pointOnShape.circle.center));
         const v2 = toUnitVector(fromTo(p, circle.center));
         const cosTheta = dot(v1, v2);
         if (cosTheta > ANGLE_THRESHOLD ||

package/node/mat/get-closeby-cp-if-exist.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-closeby-cp-if-exist.js","sourceRoot":"","sources":["../../src/mat/get-closeby-cp-if-exist.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAK1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAIzE,gBAAgB;AAChB,MAAM,OAAO,GAAG,CAAC,CAAC;AAClB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAG5D;;;;;;;;;;GAUG;AACH,SAAS,mBAAmB,CACpB,IAAa,EACb,GAAiB,EACjB,MAAc,EACd,KAAa,EACb,MAAc,EACd,aAAsB;IAE1B,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAExC,MAAM,kBAAkB,GAAG,aAAa,GAAG,KAAK,CAAC;IACjD,MAAM,oBAAoB,GAAG,kBAAkB,GAAG,IAAI,CAAC;IAEvD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QAAC,OAAO,SAAS,CAAC;IAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IACrB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC;QACpC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAClB,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC;YACzB,SAAS;QACb,CAAC;QAED,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC7D,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;QAE5B,IAAI,QAAQ,GAAG,eAAe;YAC1B,CAAC,CAAC,GAAG,oBAAoB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAEnD,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;gBACtB,4BAA4B;gBAC5B,kBAAkB;gBAClB,uCAAuC;gBACvC,qBAAqB;YACzB,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}
+{"version":3,"file":"get-closeby-cp-if-exist.js","sourceRoot":"","sources":["../../src/mat/get-closeby-cp-if-exist.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAGzE,gBAAgB;AAChB,MAAM,OAAO,GAAG,CAAC,CAAC;AAClB,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAG5D;;;;;;;;;;GAUG;AACH,SAAS,mBAAmB,CACpB,IAAa,EACb,GAAoB,EACpB,MAAc,EACd,KAAa,EACb,MAAc,EACd,aAAsB;IAE1B,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC;IAE3C,MAAM,kBAAkB,GAAG,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC,CAAE,sCAAsC;IAC9F,MAAM,oBAAoB,GAAG,CAAC,IAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,CAAC;IAExD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAE,CAAC;IAC5C,MAAM,GAAG,GAAG,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;QAAC,OAAO,SAAS,CAAC;IAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAEhC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC;IACrB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAClB,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,EAAC,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,kBAAkB,EAAE,CAAC;YACzB,SAAS;QACb,CAAC;QACD,iBAAiB;QAEjB,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACvE,MAAM,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;QAE5B,IAAI,QAAQ,GAAG,eAAe;YAC1B,CAAC,CAAC,GAAG,oBAAoB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAEnD,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;gBACtB,4BAA4B;gBAC5B,kBAAkB;gBAClB,uCAAuC;gBACvC,qBAAqB;YACzB,CAAC;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAGD,OAAO,EAAE,mBAAmB,EAAE,CAAA"}

package/node/mat/get-cp-node-to-left-or-same.d.ts

@@ -1,6 +1,6 @@
+import type { PrePointOnShape } from '../point-on-shape/point-on-shape.js';
+import type { CpNode } from '../cp-node/cp-node.js';
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
-import { CpNode } from '../cp-node/cp-node.js';
 /**
  * @internal
  *
@@ -14,5 +14,5 @@ import { CpNode } from '../cp-node/cp-node.js';
  * @param order
  * @param order2
  */
-declare function getCpNodeToLeftOrSame(cpTree: LlRbTree<CpNode>, pos: PointOnShape, order: number, order2: number): CpNode | undefined;
+declare function getCpNodeToLeftOrSame(cpTree: LlRbTree<CpNode>, pos: PrePointOnShape, order: number, order2: number): CpNode | undefined;
 export { getCpNodeToLeftOrSame };

package/node/mat/get-cp-node-to-left-or-same.js

@@ -12,8 +12,8 @@
  * @param order2
  */
 function getCpNodeToLeftOrSame(cpTree, pos, order, order2) {
-    const cp = { pointOnShape: pos, order, order2 };
-    const cps = cpTree.findBounds({ cp });
+    const pointOnShape = { ...pos, order, order2 };
+    const cps = cpTree.findBounds({ pointOnShape });
     if (cps[0] === undefined && cps[1] === undefined) {
         // The tree is still empty
         return undefined;

package/node/mat/get-cp-node-to-left-or-same.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-cp-node-to-left-or-same.js","sourceRoot":"","sources":["../../src/mat/get-cp-node-to-left-or-same.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,SAAS,qBAAqB,CACtB,MAAwB,EACxB,GAAiB,EACjB,KAAa,EACb,MAAc;IAElB,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,EAAuB,CAAC,CAAC;IAE3D,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,0BAA0B;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,sDAAsD;QACtD,mDAAmD;QACnD,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACxB,CAAC;AAGD,OAAO,EAAE,qBAAqB,EAAE,CAAA"}
+{"version":3,"file":"get-cp-node-to-left-or-same.js","sourceRoot":"","sources":["../../src/mat/get-cp-node-to-left-or-same.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,SAAS,qBAAqB,CACtB,MAAwB,EACxB,GAAoB,EACpB,KAAa,EACb,MAAc;IAElB,MAAM,YAAY,GAAG,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,EAAE,YAAY,EAAY,CAAC,CAAC;IAE1D,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,0BAA0B;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC/C,sDAAsD;QACtD,mDAAmD;QACnD,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AACxB,CAAC;AAGD,OAAO,EAAE,qBAAqB,EAAE,CAAA"}

package/node/mat/get-largest-vertex.d.ts

@@ -1,4 +1,4 @@
-import { CpNode } from '../cp-node/cp-node.js';
+import type { CpNode } from '../cp-node/cp-node.js';
 /** @internal */
 declare function getLargestVertex(cpNode: CpNode): CpNode;
 export { getLargestVertex };

package/node/mat/get-largest-vertex.js

@@ -3,7 +3,7 @@ import { getAllOnLoop } from '../cp-node/fs/get-all-on-loop.js';
 function getLargestVertex(cpNode) {
     const cpNodes = getAllOnLoop(cpNode);
     return cpNodes.reduce(function (maxCpNode, cpNode) {
-        return maxCpNode.cp.circle.radius >= cpNode.cp.circle.radius
+        return maxCpNode.pointOnShape.circle.radius >= cpNode.pointOnShape.circle.radius
             ? maxCpNode
             : cpNode;
     }, cpNodes[0]);

package/node/mat/get-largest-vertex.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-largest-vertex.js","sourceRoot":"","sources":["../../src/mat/get-largest-vertex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,gBAAgB;AAChB,SAAS,gBAAgB,CAAC,MAAc;IACpC,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAErC,OAAO,OAAO,CAAC,MAAM,CAAC,UAAS,SAAiB,EAAE,MAAc;QAC5D,OAAO,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM;YACxD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAA;IAChB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"get-largest-vertex.js","sourceRoot":"","sources":["../../src/mat/get-largest-vertex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAGhE,gBAAgB;AAChB,SAAS,gBAAgB,CAAC,MAAc;IACpC,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IAErC,OAAO,OAAO,CAAC,MAAM,CAAC,UAAS,SAAiB,EAAE,MAAc;QAC5D,OAAO,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM;YAC5E,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAA;IAChB,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC;AAGD,OAAO,EAAE,gBAAgB,EAAE,CAAA"}

package/node/mat/mat-meta.d.ts

@@ -1,10 +1,10 @@
+import type { Loop } from 'flo-boolean';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { Curve } from 'flo-boolean';
 import { LlRbTree } from 'flo-ll-rb-tree';
-import { Loop } from 'flo-boolean';
-import { CpNode } from '../cp-node/cp-node.js';
-import { Curve } from '../curve/curve.js';
-import { TriMap } from '../utils/tri-map.js';
 interface MatMeta {
-    readonly maxCoordinate: number;
+    /** The minimum power of 2 such that `2**maxCoordPowerOf2 >= "the max coordinate"` */
+    readonly maxCoordPowerOf2: number;
     readonly squaredDiagonalLength: number;
     readonly looseBoundingBoxes: number[][][];
     readonly tightBoundingBoxes: number[][][];
@@ -19,7 +19,6 @@ interface MatMeta {
      */
     readonly cpTrees: Map<Loop, LlRbTree<CpNode>>;
     /** A map from a bezier and t value to a `PointOnShape` */
-    readonly pointToCpNode: TriMap<Loop, number, number, CpNode>;
     /**
      * Stores the last insert id so each `CpNode` can have a unique id for
      * debugging purposes

package/node/mat/mat.d.ts

@@ -1,5 +1,5 @@
-import { CpNode } from '../cp-node/cp-node.js';
-import { MatMeta } from './mat-meta.js';
+import type { CpNode } from '../cp-node/cp-node.js';
+import type { MatMeta } from './mat-meta.js';
 /**
  * Represents a complete Medial Axis Transform (MAT).
  *
@@ -10,13 +10,13 @@ import { MatMeta } from './mat-meta.js';
  */
 interface Mat {
     /** A complete representation of the MAT. See `CpNode`. */
-    cpNode: CpNode;
+    readonly cpNode: CpNode;
     /**
      * Stores additional info about the shape that could be useful for various
      * purposes in post-processing.
      *
      * Most meta items have a CpNode property to link back to the MAT.
      */
-    meta: MatMeta;
+    readonly meta: MatMeta;
 }
-export { Mat };
+export type { Mat };

package/node/mat/simplify-mat.d.ts

@@ -1,14 +1,16 @@
-import { Mat } from './mat.js';
+import type { Mat } from './mat.js';
 /**
- * Simplifies the given MAT by replacing the piecewise quad beziers composing
- * the MAT with fewer ones to within a given tolerance.
- * @param cpNode A representation of the MAT
- * @param anlgeTolerance Tolerance given as the degrees difference of the unit
+ * Returns a new simplified MAT of the given one by replacing the piecewise
+ * quad beziers composing the MAT with fewer ones to within a given tolerance.
+ *
+ * @param cpNode a representation of the MAT
+ * @param anlgeTolerance tolerance given as the degrees difference of the unit
  * direction vectors at the interface between curves. A tolerance of zero means
- * perfect smoothness is required - defaults to 15.
- * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
+ * perfect smoothness is required - defaults to 15
+ * @param hausdorffTolerance the approximate maximum Hausdorff Distance tolerance -
  * defaults to `2**-3`
- * @param maxIterations The max iterations, defaults to `50`
+ * @param maxIterations the max iterations of the Hausdorff Distance calculation,
+ * defaults to `50`
  */
 declare function simplifyMat(mat: Mat, hausdorffTolerance?: number, maxIterations?: number): Mat;
 export { simplifyMat };

package/node/mat/simplify-mat.js

@@ -3,23 +3,26 @@ import { removeVertex } from '../vertex/remove-vertex.js';
 import { getBranches } from './get-branches.js';
 import { getMatCurveToNext } from '../cp-node/fs/get-mat-curve-to-next.js';
 import { getMatCurveBetween } from '../cp-node/fs/get-mat-curve-between.js';
-import { createNewCpTree } from './create-new-cp-tree.js';
+import { createNewCpTrees } from './create-new-cp-trees.js';
 import { clone } from '../cp-node/fs/clone.js';
 import { findFirst } from '../cp-node/fs/find-first.js';
 import { isTerminating } from '../cp-node/fs/is-terminating.js';
 import { isVertex } from '../cp-node/fs/is-vertex.js';
 import { getProngCount } from '../cp-node/fs/get-prong-count.js';
-// TODO2 could be made faster by binary "search" on hausdorff curves
+const { max } = Math;
+// FUTURE could be made faster by binary "search" on hausdorff curves?
 /**
- * Simplifies the given MAT by replacing the piecewise quad beziers composing
- * the MAT with fewer ones to within a given tolerance.
- * @param cpNode A representation of the MAT
- * @param anlgeTolerance Tolerance given as the degrees difference of the unit
+ * Returns a new simplified MAT of the given one by replacing the piecewise
+ * quad beziers composing the MAT with fewer ones to within a given tolerance.
+ *
+ * @param cpNode a representation of the MAT
+ * @param anlgeTolerance tolerance given as the degrees difference of the unit
  * direction vectors at the interface between curves. A tolerance of zero means
- * perfect smoothness is required - defaults to 15.
- * @param hausdorffTolerance The approximate maximum Hausdorff Distance tolerance -
+ * perfect smoothness is required - defaults to 15
+ * @param hausdorffTolerance the approximate maximum Hausdorff Distance tolerance -
  * defaults to `2**-3`
- * @param maxIterations The max iterations, defaults to `50`
+ * @param maxIterations the max iterations of the Hausdorff Distance calculation,
+ * defaults to `50`
  */
 function simplifyMat(mat, hausdorffTolerance = 2 ** -3, maxIterations = 50) {
     let cpNode = clone(mat.cpNode);
@@ -49,12 +52,12 @@ function simplifyMat(mat, hausdorffTolerance = 2 ** -3, maxIterations = 50) {
                 }
             }
             if (i + 1 === j) {
-                // no simplification occured
-                continue;
+                continue; // no simplification occured
             }
         }
     }
-    cpNode = findFirst(cpNode_ => isTerminating(cpNode_) ? cpNode_ : undefined, cpNode);
+    // cpNode = findFirst(cpNode_ => isTerminating(cpNode_) ? cpNode_ : undefined, cpNode)!;
+    cpNode = findFirst(isTerminating, cpNode);
     for (const cpNode of canDeletes) {
         if (!isVertex(cpNode => (getProngCount(cpNode) !== 2) &&
             !cpNode.isHoleClosing)(cpNode)) {
@@ -65,7 +68,7 @@ function simplifyMat(mat, hausdorffTolerance = 2 ** -3, maxIterations = 50) {
         cpNode,
         meta: {
             ...mat.meta,
-            cpTrees: createNewCpTree(cpNode)
+            cpTrees: createNewCpTrees(cpNode)
         }
     };
 }
@@ -75,7 +78,7 @@ function getTotalHausdorffDistance(i, j, branch, hausdorffSpacing) {
     for (; i < j + 1; i++) {
         hds.push(hausdorffDistanceOneSided(getMatCurveToNext(branch[i]), longCurve, hausdorffSpacing));
     }
-    return Math.max(...hds);
+    return max(...hds);
 }
 export { simplifyMat };
 //# sourceMappingURL=simplify-mat.js.map

package/node/mat/simplify-mat.js.map

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

package/node/mat/trim-mat.d.ts

@@ -1,7 +1,8 @@
-import { Mat } from './mat.js';
+import type { Mat } from './mat.js';
 /**
  * Trims the given Medial Axis Transform so that only cycles remain. Similar to
- * toScaleAxis(mat, Number.POSITIVE_INFINITY).
+ * toScaleAxis(mat, Infinity).
+ *
  * @param mat The MAT to trim.
  */
 declare function trimMat(mat: Mat): Mat;

package/node/mat/trim-mat.js

@@ -1,12 +1,14 @@
-import { createNewCpTree } from './create-new-cp-tree.js';
+import { createNewCpTrees } from './create-new-cp-trees.js';
 import { cullNonCycles } from '../sat/cull-non-cycles.js';
 import { clone } from '../cp-node/fs/clone.js';
 /**
  * Trims the given Medial Axis Transform so that only cycles remain. Similar to
- * toScaleAxis(mat, Number.POSITIVE_INFINITY).
+ * toScaleAxis(mat, Infinity).
+ *
  * @param mat The MAT to trim.
  */
 function trimMat(mat) {
+    // FUTURE - clone entire `Mat` instead (the function already exists)
     const cpNode = cullNonCycles(clone(mat.cpNode));
     if (!cpNode) {
         return undefined;
@@ -15,7 +17,7 @@ function trimMat(mat) {
         cpNode,
         meta: {
             ...mat.meta,
-            cpTrees: createNewCpTree(cpNode)
+            cpTrees: createNewCpTrees(cpNode)
         }
     };
 }

package/node/mat/trim-mat.js.map

@@ -1 +1 @@
-{"version":3,"file":"trim-mat.js","sourceRoot":"","sources":["../../src/mat/trim-mat.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAG/C;;;;GAIG;AACH,SAAS,OAAO,CAAC,GAAQ;IACrB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEnC,OAAO;QACH,MAAM;QACN,IAAI,EAAE;YACF,GAAG,GAAG,CAAC,IAAI;YACX,OAAO,EAAE,eAAe,CAAC,MAAM,CAAC;SACnC;KACJ,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"trim-mat.js","sourceRoot":"","sources":["../../src/mat/trim-mat.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAG/C;;;;;GAKG;AACH,SAAS,OAAO,CAAC,GAAQ;IACrB,oEAAoE;IACpE,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QAAC,OAAO,SAAU,CAAC;IAAC,CAAC;IAEnC,OAAO;QACH,MAAM;QACN,IAAI,EAAE;YACF,GAAG,GAAG,CAAC,IAAI;YACX,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC;SACpC;KACJ,CAAA;AACL,CAAC;AAGD,OAAO,EAAE,OAAO,EAAE,CAAC"}

package/node/point-on-shape/calc-pos-order.d.ts

@@ -1,13 +1,16 @@
-import { Circle } from "../geometry/circle.js";
-import { PointOnShape } from "./point-on-shape.js";
+import type { Curve } from "flo-boolean";
 /**
- * @internal
- *
  * Calculates the order (to distinguish between points lying on top of each
  * other) of the contact point if it is a dull corner.
  *
  * @param circle
  * @param pos
+ *
+ * @internal
  */
-declare function calcPosOrder(circle: Circle, pos: PointOnShape): number;
+declare function calcPosOrder(circleCenter: number[], pos: {
+    t: number;
+    curve: Curve;
+    p: number[];
+}): number;
 export { calcPosOrder };