flo-mat 1.2.0 → 2.0.1

package/src/mat/closest-boundary-point/cull-by-loose-bounding-box.ts

@@ -1,7 +1,6 @@
-
-import { getBoundingBox } from "flo-bezier3";
-import { BezierPiece } from "../bezier-piece";
-import { getClosestSquareDistanceToRect } from '../geometry/get-closest-square-distance-to-rect';
+import { getBoundingBox_ } from '../../get-bounding-box-.js';
+import { BezierPiece } from '../bezier-piece.js';
+import { getClosestSquareDistanceToRect } from '../geometry/get-closest-square-distance-to-rect.js';
 
 
 /**
@@ -23,7 +22,7 @@ function cullByLooseBoundingBox(
         let bezierPiece = bezierPieces[i];
         let ps = bezierPiece.curve.ps;
         
-        let boundingBox = getBoundingBox(ps);
+        let boundingBox = getBoundingBox_(ps);
         
         let d = getClosestSquareDistanceToRect(
             boundingBox,

package/src/mat/closest-boundary-point/cull-by-tight-boundary-box.ts

@@ -1,8 +1,10 @@
+import { getBoundingBoxTight } from "flo-bezier3";
+import { memoize } from "flo-memoize";
+import { BezierPiece } from "../bezier-piece.js";
+import { getClosestSquaredDistanceToRotatedRect } from '../geometry/get-closest-squared-distance-to-rotated-rect.js';
 
-import { getBoundingBoxTight } from 'flo-bezier3';
-import { BezierPiece } from "../bezier-piece";
-import { getClosestSquaredDistanceToRotatedRect } from 
-    '../geometry/get-closest-squared-distance-to-rotated-rect';
+
+const getBoundingBoxTight_ = memoize(getBoundingBoxTight);
 
 
 /**
@@ -24,7 +26,7 @@ function cullByTightBoundingBox(
         let bezierPiece = bezierPieces[i];
         let ps = bezierPiece.curve.ps;
         
-        let tightBoundingBox = getBoundingBoxTight(ps);
+        let tightBoundingBox = getBoundingBoxTight_(ps);
         let d = getClosestSquaredDistanceToRotatedRect(
                 tightBoundingBox,
                 p

package/src/mat/closest-boundary-point/get-best-distance-squared.ts

@@ -1,7 +1,6 @@
-
 import { evalDeCasteljau } from 'flo-bezier3';
 import { squaredDistanceBetween } from 'flo-vector2d';
-import { BezierPiece } from "../bezier-piece";
+import { BezierPiece } from "../bezier-piece.js";
 
 
 /**

package/src/mat/closest-boundary-point/get-close-boundary-points.ts

@@ -1,15 +1,8 @@
-
-declare var _debug_: Debug;
-
-import { Debug } from '../../debug/debug';
-
 import { distanceBetween } from 'flo-vector2d';
-
-import { IPointOnShape, PointOnShape } from '../../point-on-shape';
-import { BezierPiece  } from '../bezier-piece';
-
-import { cullBezierPieces } from './cull-bezier-pieces';
-import { closestPointsOnCurve } from './closest-points-on-curve';
+import { IPointOnShape, PointOnShape } from '../../point-on-shape.js';
+import { BezierPiece  } from '../bezier-piece.js';
+import { cullBezierPieces } from './cull-bezier-pieces.js';
+import { closestPointsOnCurve } from './closest-points-on-curve.js';
   
 
 /**

package/src/mat/closest-boundary-point/get-closest-boundary-point.ts

@@ -1,10 +1,9 @@
-
 import { distanceBetween, getObjClosestTo } from 'flo-vector2d';
-import { Curve } from '../../curve';
-import { PointOnShape, IPointOnShape } from '../../point-on-shape';
-import { BezierPiece  } from '../bezier-piece';
-import { cullBezierPieces } from './cull-bezier-pieces';
-import { closestPointsOnCurve } from './closest-points-on-curve';
+import { Curve } from '../../curve.js';
+import { PointOnShape, IPointOnShape } from '../../point-on-shape.js';
+import { BezierPiece  } from '../bezier-piece.js';
+import { cullBezierPieces } from './cull-bezier-pieces.js';
+import { closestPointsOnCurve } from './closest-points-on-curve.js';
   
 
 /**

package/src/mat/cmp-cp-on-delta.ts

@@ -1,6 +1,5 @@
-
-import { CpNode       } from '../cp-node';
-import { ContactPoint, compareCps } from '../contact-point';
+import { CpNode } from '../cp-node.js';
+import { ContactPoint, compareCps } from '../contact-point.js';
 
 
 /**

package/src/mat/create-new-cp-tree.ts

@@ -1,7 +1,6 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { CpNode } from '../cp-node';
-import { Loop } from '../loop';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { CpNode } from '../cp-node.js';
+import { Loop } from '../loop.js';
 
 
 /**
@@ -19,7 +18,8 @@ function createNewCpTree(cpNode: CpNode) {
 		let loop = cpNode.cp.pointOnShape.curve.loop;
 		let cpTree = newCpTrees.get(loop);
 		if (!cpTree) { 
-			cpTree = new LlRbTree(CpNode.comparator, [], true); 
+			// qqq cpTree = new LlRbTree(CpNode.comparator, [], true); 
+			cpTree = new LlRbTree(CpNode.comparator, false); 
 			newCpTrees.set(loop, cpTree);
 		}
 		cpTree.insert(cpNode);

package/src/mat/find-mat/add-1-prong.ts

@@ -1,14 +1,13 @@
-
 /** @hidden */
 declare var _debug_: Debug; 
 
-import { Debug }   from '../../debug/debug';
-import LlRbTree from 'flo-ll-rb-tree';
-import { Loop } from '../../loop';
-import { getOsculatingCircle, calcPosOrder, isPosDullCorner, IPointOnShape } from '../../point-on-shape';
-import { CpNode } from '../../cp-node';
-import { addToCpGraph } from '../add-to-cp-graph';
-import { isAnotherCpCloseby } from '../is-another-cp-closeby';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Debug }   from '../../debug/debug.js';
+import { Loop } from '../../loop.js';
+import { getOsculatingCircle, calcPosOrder, isPosDullCorner, IPointOnShape } from '../../point-on-shape.js';
+import { CpNode } from '../../cp-node.js';
+import { addToCpGraph } from '../add-to-cp-graph.js';
+import { isAnotherCpCloseby } from '../is-another-cp-closeby.js';
 
 
 /**

package/src/mat/find-mat/add-2-prong.ts

@@ -1,18 +1,17 @@
-
 /** @hidden */
 declare var _debug_: Debug;
 
-import { Debug } from '../../debug/debug';
-import LlRbTree from 'flo-ll-rb-tree';
-import { exponent } from 'flo-numerical';
-import { Loop         } from '../../loop';
-import { CpNode       } from '../../cp-node';
-import { Circle       } from '../../circle';
-import { ContactPoint } from '../../contact-point';
-import { PointOnShape, calcPosOrder, IPointOnShape } from '../../point-on-shape';
-import { isAnotherCpCloseby } from '../is-another-cp-closeby';
-import { getNeighbouringPoints } from '../get-neighboring-cps';
-import { TwoProngForDebugging } from '../../debug/two-prong-for-debugging';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { exponent } from 'big-float-ts';
+import { Debug } from '../../debug/debug.js';
+import { Loop         } from '../../loop.js';
+import { CpNode       } from '../../cp-node.js';
+import { Circle       } from '../../circle.js';
+import { ContactPoint } from '../../contact-point.js';
+import { PointOnShape, calcPosOrder, IPointOnShape } from '../../point-on-shape.js';
+import { isAnotherCpCloseby } from '../is-another-cp-closeby.js';
+import { getNeighbouringPoints } from '../get-neighboring-cps.js';
+import { TwoProngForDebugging } from '../../debug/two-prong-for-debugging.js';
 
 
 /**

package/src/mat/find-mat/add-3-prong.ts

@@ -1,11 +1,10 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { CpNode } from '../../cp-node';
-import { Loop } from '../../loop';
-import { Circle } from '../../circle';
-import { IPointOnShape } from '../../point-on-shape';
-import { addToCpGraph } from '../add-to-cp-graph';
-import { isAnotherCpCloseby } from '../is-another-cp-closeby';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { CpNode } from '../../cp-node.js';
+import { Loop } from '../../loop.js';
+import { Circle } from '../../circle.js';
+import { IPointOnShape } from '../../point-on-shape.js';
+import { addToCpGraph } from '../add-to-cp-graph.js';
+import { isAnotherCpCloseby } from '../is-another-cp-closeby.js';
 
 
 /**

package/src/mat/find-mat/add-debug-info.ts

@@ -1,13 +1,14 @@
+import { getBoundingHull, getBoundingBoxTight } from 'flo-bezier3';
+import { Debug }   from '../../debug/debug.js';
+import { Loop } from '../../loop.js';
+import { Curve, getCornerAtEnd } from '../../curve.js';
+import { Mat } from '../../mat.js';
+import { getBoundingBox_ } from '../../get-bounding-box-.js';
+
 
 /** @hidden */
 declare var _debug_: Debug; 
 
-import { Debug }   from '../../debug/debug';
-import { getBoundingHull, getBoundingBox, getBoundingBoxTight } from 'flo-bezier3';
-import { Loop } from '../../loop';
-import { Curve, getCornerAtEnd } from '../../curve';
-import { Mat } from '../../mat';
-
 
 if (typeof _debug_ !== 'undefined') { 
     var timingStart: number;
@@ -37,7 +38,7 @@ function addDebugInfo1(loops: Loop[]) {
 
             generated.elems.boundingHull.push(hull);
 
-            let looseBoundingBox = getBoundingBox(ps);
+            let looseBoundingBox = getBoundingBox_(ps);
             generated.elems.looseBoundingBox.push(looseBoundingBox);
 
             let tightBoundingBox = getBoundingBoxTight(ps);

package/src/mat/find-mat/create-get-interesting-points-on-loop.ts

@@ -1,8 +1,7 @@
-
-import { getContactCirclesAtInterface } from '../get-contact-circles-at-interface';
-import { getCurvatureExtrema, splitByCurvatureAndLength, length, lengthSquaredUpperBound } from 'flo-bezier3';
-import { Loop } from '../../loop';
-import { PointOnShape, comparePoss, IPointOnShape } from '../../point-on-shape';
+import { getCurvatureExtrema, splitByCurvatureAndLength, controlPointLinesLength } from 'flo-bezier3';
+import { getContactCirclesAtInterface } from '../get-contact-circles-at-interface.js';
+import { Loop } from '../../loop.js';
+import { PointOnShape, comparePoss, IPointOnShape } from '../../point-on-shape.js';
 
 
 /**
@@ -14,7 +13,7 @@ import { PointOnShape, comparePoss, IPointOnShape } from '../../point-on-shape';
  */
 function getInterestingPointsOnLoop(
         minBezLength: number,
-        maxFlatness: number,
+        maxCurviness: number,
         maxLength: number) {
 
     return function(loop: Loop) {
@@ -23,11 +22,13 @@ function getInterestingPointsOnLoop(
         for (let i=0; i<loop.curves.length; i++) {
             let curve = loop.curves[i];
 
-            if (lengthSquaredUpperBound(curve.ps) < minBezLength) {
+            // qqq if (lengthSquaredUpperBound(curve.ps) < minBezLength) {
+            if (controlPointLinesLength(curve.ps) < minBezLength) {
                 continue;
             }
             
 
+            /*
             let { maxCurvatureTs, maxNegativeCurvatureTs } = 
                 getCurvatureExtrema(curve.ps);
             let maxCurvatures = maxCurvatureTs.map(t => new PointOnShape(curve, t));
@@ -38,8 +39,21 @@ function getInterestingPointsOnLoop(
                 ...maxCurvatures,
                 ...maxNegativeCurvatures
             );
+            */
+
+            // let { maxima } = getCurvatureExtrema(curve.ps);
+            // qqq let { maxCurvatureTs, maxNegativeCurvatureTs } = getCurvatureExtrema(curve.ps);
+            let { maxima } = getCurvatureExtrema(curve.ps);
+            // let maxAbsCurvatures = maxima.map(t => new PointOnShape(curve, t));
+            // qqq let maxAbsCurvatures = [...maxCurvatureTs, ...maxNegativeCurvatureTs].map(t => new PointOnShape(curve, t));
+            let maxAbsCurvatures = [...maxima].map(t => new PointOnShape(curve, t));
+
+            allPoints.push(
+                ...getContactCirclesAtInterface(curve), 
+                ...maxAbsCurvatures,
+            );
 
-            let ts = splitByCurvatureAndLength(curve.ps, maxFlatness, maxLength);
+            let ts = splitByCurvatureAndLength(curve.ps, maxCurviness, maxLength);
             if (ts.length === 2) {
                 ts = [0, 0.5, 1];
             }

package/src/mat/find-mat/create-initial-cp-graph.ts

@@ -1,10 +1,8 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { Loop         } from '../../loop';
-import { Circle       } from '../../circle';
-import { CpNode       } from '../../cp-node';
-import { IPointOnShape } from '../../point-on-shape';
-import { ContactPoint } from '../../contact-point';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Loop } from '../../loop.js';
+import { CpNode } from '../../cp-node.js';
+import { IPointOnShape } from '../../point-on-shape.js';
+import { ContactPoint } from '../../contact-point.js';
 
 
 /**
@@ -24,7 +22,8 @@ function createInitialCpGraph(
     for (let k=0; k<sharpCornerss.length; k++) {
         let sharpCorners = sharpCornerss[k];
 
-        let cpTree = new LlRbTree(CpNode.comparator, [], true);
+        // qqq let cpTree = new LlRbTree(CpNode.comparator, [], true);
+        let cpTree = new LlRbTree(CpNode.comparator, false);
         
         let cpNode1 = undefined;
         let cpNode2 = undefined;

package/src/mat/find-mat/find-2-prong/add-debug-info.ts

@@ -1,16 +1,15 @@
-
 /** @hidden */
 declare var _debug_: Debug; 
 
-import { Debug } from '../../../debug/debug';
-import { IPointOnShape } from "../../../point-on-shape";
-import { Circle } from "../../../circle";
-import { CpNode } from "../../../cp-node";
-import { BezierPiece } from '../../bezier-piece';
-import { TwoProngForDebugging } from "../../../debug/two-prong-for-debugging";
-import { getTwoProngType } from "../../get-two-prong-type";
-import { ElemType_TwoProng } from "../../elem-type-two-prong";
-import { TXForDebugging } from './x-for-debugging';
+import { Debug } from '../../../debug/debug.js';
+import { IPointOnShape } from '../../../point-on-shape.js';
+import { Circle } from '../../../circle.js';
+import { CpNode } from '../../../cp-node.js';
+import { BezierPiece } from '../../bezier-piece.js';
+import { TwoProngForDebugging } from '../../../debug/two-prong-for-debugging.js';
+import { getTwoProngType } from '../../get-two-prong-type.js';
+import { ElemType_TwoProng } from '../../elem-type-two-prong.js';
+import { TXForDebugging } from './x-for-debugging.js';
 
 
 /** @hidden */

package/src/mat/find-mat/find-2-prong/cull-bezier-pieces.ts

@@ -1,9 +1,6 @@
-
-import { getBoundingBox } from "flo-bezier3";
-
-import { getClosestSquareDistanceToRect } from "../../geometry/get-closest-square-distance-to-rect";
-
-import { BezierPiece } from "../../bezier-piece";
+import { getClosestSquareDistanceToRect } from '../../geometry/get-closest-square-distance-to-rect.js';
+import { BezierPiece } from '../../bezier-piece.js';
+import { getBoundingBox_ } from '../../../get-bounding-box-.js';
 
 
 /**
@@ -32,7 +29,7 @@ function cullBezierPieces(
     for (let bezierPiece of bezierPieces) {
         let ps = bezierPiece.curve.ps;
         
-        let rect = getBoundingBox(ps);
+        let rect = getBoundingBox_(ps);
         let bd = getClosestSquareDistanceToRect(rect, p);
         if (bd <= rSquared * TOLERANCE) {
             newPieces.push(bezierPiece);

package/src/mat/find-mat/find-2-prong/find-2-prong.ts

@@ -1,25 +1,27 @@
-
 /** @hidden */
 declare var _debug_: Debug;
 
-import { Debug } from '../../../debug/debug';
-import LlRbTree from 'flo-ll-rb-tree';
+import { LlRbTree } from 'flo-ll-rb-tree';
 import { lineLineIntersection, distanceBetween, squaredDistanceBetween, interpolate, dot } from 'flo-vector2d';
-import { evalDeCasteljau } from 'flo-bezier3';
+import { evalDeCasteljau as evalDeCasteljau_ } from 'flo-bezier3';
+import { Debug } from '../../../debug/debug.js';
 import { getClosestBoundaryPoint } from 
-    '../../closest-boundary-point/get-closest-boundary-point';
-import { CpNode } from '../../../cp-node';
-import { Loop } from '../../../loop';
-import { Circle } from '../../../circle';
-import { getOsculatingCircle, IPointOnShape } from '../../../point-on-shape';
-import { BezierPiece } from '../../bezier-piece';
-import { add1Prong } from '../add-1-prong';
-import { addDebugInfo } from './add-debug-info';
-import { TXForDebugging } from './x-for-debugging';
-import { cullBezierPieces } from './cull-bezier-pieces';
-import { findEquidistantPointOnLine } from './find-equidistant-point-on-line';
-import { getInitialBezierPieces } from './get-initial-bezier-pieces';
-import { getCloseBoundaryPoints } from '../../closest-boundary-point/get-close-boundary-points';
+    '../../closest-boundary-point/get-closest-boundary-point.js';
+import { CpNode } from '../../../cp-node.js';
+import { Loop } from '../../../loop.js';
+import { Circle } from '../../../circle.js';
+import { getOsculatingCircle, IPointOnShape } from '../../../point-on-shape.js';
+import { BezierPiece } from '../../bezier-piece.js';
+import { add1Prong } from '../add-1-prong.js';
+import { addDebugInfo } from './add-debug-info.js';
+import { TXForDebugging } from './x-for-debugging.js';
+import { cullBezierPieces } from './cull-bezier-pieces.js';
+import { findEquidistantPointOnLine } from './find-equidistant-point-on-line.js';
+import { getInitialBezierPieces } from './get-initial-bezier-pieces.js';
+import { getCloseBoundaryPoints } from '../../closest-boundary-point/get-close-boundary-points.js';
+
+
+const evalDeCasteljau = evalDeCasteljau_;
 
 
 /**

package/src/mat/find-mat/find-2-prong/get-initial-bezier-pieces.ts

@@ -1,11 +1,10 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { getNeighbouringPoints   } from '../../get-neighboring-cps';
-import { getBoundaryPieceBeziers } from '../../get-boundary-piece-beziers';
-import { BezierPiece  } from '../../bezier-piece';
-import { Loop } from '../../../loop';
-import { CpNode } from '../../../cp-node';
-import { isPosDullCorner, IPointOnShape } from '../../../point-on-shape';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { getNeighbouringPoints } from '../../get-neighboring-cps.js';
+import { getBoundaryPieceBeziers } from '../../get-boundary-piece-beziers.js';
+import { BezierPiece  } from '../../bezier-piece.js';
+import { Loop } from '../../../loop.js';
+import { CpNode } from '../../../cp-node.js';
+import { isPosDullCorner, IPointOnShape } from '../../../point-on-shape.js';
 
 
 /** @hidden */

package/src/mat/find-mat/find-2-prong/x-for-debugging.ts

@@ -1,5 +1,4 @@
-
-import { IPointOnShape } from "../../../point-on-shape";
+import { IPointOnShape } from '../../../point-on-shape.js';
 
 
 /** @hidden */

package/src/mat/find-mat/find-3-prong/calc-better-x.ts

@@ -1,10 +1,7 @@
-
 import { fromTo, circumCenter, len, scale, translate } from 'flo-vector2d';
-
-import { IPointOnShape } from '../../../point-on-shape';
-import { BezierPiece  } from '../../bezier-piece';
-
-import { getClosestPoints } from './get-closest-points';
+import { IPointOnShape } from '../../../point-on-shape.js';
+import { BezierPiece  } from '../../bezier-piece.js';
+import { getClosestPoints } from './get-closest-points.js';
 
 
 /**

package/src/mat/find-mat/find-3-prong/calc-initial-3-prong-center.ts

@@ -1,13 +1,8 @@
-
 /** @hidden */
-declare var _debug_: Debug;
-
-import { Debug } from '../../../debug/debug';
 import { circumCenter } from 'flo-vector2d';
-import { CpNode      } from '../../../cp-node';
-import { BezierPiece } from '../../bezier-piece';
-import { getClosestBoundaryPoint } from 
-    '../../closest-boundary-point/get-closest-boundary-point';
+import { CpNode      } from '../../../cp-node.js';
+import { BezierPiece } from '../../bezier-piece.js';
+import { getClosestBoundaryPoint } from '../../closest-boundary-point/get-closest-boundary-point.js';
 
 
 /**

package/src/mat/find-mat/find-3-prong/find-3-prong-for-delta3s.ts

@@ -1,22 +1,20 @@
-
 /** @hidden */
 declare var _debug_: Debug;
 
-import { Debug } from '../../../debug/debug';
 import { 
     fromTo, circumCenter, len, distanceBetween, toUnitVector, rotate90Degrees,
-    cross
+    cross 
 } from 'flo-vector2d';
 import { tangent } from 'flo-bezier3';
-import { CpNode } from '../../../cp-node';
-import { BezierPiece } from '../../bezier-piece';
-import { isPosDullCorner, IPointOnShape } from '../../../point-on-shape';
-import { getClosestBoundaryPoint } from 
-    '../../closest-boundary-point/get-closest-boundary-point';
-import { calcInitial3ProngCenter } from './calc-initial-3-prong-center';
-import { getClosestPoints } from './get-closest-points';
-import { calcBetterX } from './calc-better-x';
-import { Curve, getCornerAtEnd } from '../../../curve';
+import { Debug } from '../../../debug/debug.js';
+import { CpNode } from '../../../cp-node.js';
+import { BezierPiece } from '../../bezier-piece.js';
+import { isPosDullCorner, IPointOnShape } from '../../../point-on-shape.js';
+import { getClosestBoundaryPoint } from '../../closest-boundary-point/get-closest-boundary-point.js';
+import { calcInitial3ProngCenter } from './calc-initial-3-prong-center.js';
+import { getClosestPoints } from './get-closest-points.js';
+import { calcBetterX } from './calc-better-x.js';
+import { Curve, getCornerAtEnd } from '../../../curve.js';
 
 
 /** @hidden */
@@ -133,8 +131,6 @@ function find3ProngForDelta3s(
 
     let circle = { center: x, radius };
 
-
-   
     //-------------------------------------------------------------------------
     // Calculate the unit tangent vector at 3-prong circle points - they should 
     // be very close to tangent to the boundary piece tangents at those points 

package/src/mat/find-mat/find-3-prong/find-3-prong.ts

@@ -1,15 +1,14 @@
-
 /** @hidden */
 declare var _debug_: Debug; 
 
-import { Debug } from '../../../debug/debug';
 import { fromTo } from 'flo-bezier3';
-import { CpNode } from '../../../cp-node';
-import { Circle } from '../../../circle';
-import { IPointOnShape } from '../../../point-on-shape';
-import { ThreeProngForDebugging, createEmptyThreeProngForDebugging } from '../../../debug/three-prong-for-debugging';
-import { find3ProngForDelta3s } from './find-3-prong-for-delta3s';
-import { getBoundaryPieceBeziers } from '../../get-boundary-piece-beziers';
+import { Debug } from '../../../debug/debug.js';
+import { CpNode } from '../../../cp-node.js';
+import { Circle } from '../../../circle.js';
+import { IPointOnShape } from '../../../point-on-shape.js';
+import { createEmptyThreeProngForDebugging } from '../../../debug/three-prong-for-debugging.js';
+import { find3ProngForDelta3s } from './find-3-prong-for-delta3s.js';
+import { getBoundaryPieceBeziers } from '../../get-boundary-piece-beziers.js';
 
 
 /**
@@ -32,9 +31,15 @@ function find3Prong(δs: CpNode[][], extreme: number) {
 			let boundary: number[][][] = [];
 			d.boundaries.push(boundary);
 			for (let bezierPiece of bezierPieces) {
+				/* qqq
 				let bezier = fromTo(bezierPiece.curve.ps)(
 					bezierPiece.ts[0], bezierPiece.ts[1]
 				);
+				*/
+				const bezier = fromTo(
+					bezierPiece.curve.ps,
+					bezierPiece.ts[0], bezierPiece.ts[1]
+				);
 				boundary.push(bezier);
 			}
 		}

package/src/mat/find-mat/find-3-prong/get-closest-points.ts

@@ -1,8 +1,5 @@
-
-import { BezierPiece  } from '../../bezier-piece';
-
-import { getClosestBoundaryPoint } from 
-    '../../closest-boundary-point/get-closest-boundary-point';
+import { BezierPiece  } from '../../bezier-piece.js';
+import { getClosestBoundaryPoint } from '../../closest-boundary-point/get-closest-boundary-point.js';
 
 
 /**

package/src/mat/find-mat/find-and-add-2-prongs-on-all-paths.ts

@@ -1,9 +1,8 @@
-
-import LlRbTree from 'flo-ll-rb-tree';
-import { Loop } from "../../loop";
-import { CpNode } from '../../cp-node';
-import { IPointOnShape } from '../../point-on-shape';
-import { findAndAdd2Prongs } from './find-and-add-2-prongs';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Loop } from '../../loop.js';
+import { CpNode } from '../../cp-node.js';
+import { IPointOnShape } from '../../point-on-shape.js';
+import { findAndAdd2Prongs } from './find-and-add-2-prongs.js';
 
 
 /** 

package/src/mat/find-mat/find-and-add-2-prongs.ts

@@ -1,16 +1,15 @@
-
 /** @hidden */
 declare var _debug_: Debug;
 
-import { Debug } from '../../debug/debug';
-import LlRbTree from 'flo-ll-rb-tree';
-import { Loop } from "../../loop";
-import { CpNode } from '../../cp-node';
-import { IPointOnShape } from '../../point-on-shape';
-import { getShapeBounds } from '../../svg/get-shape-bounds';
-import { Circle } from '../../circle';
-import { find2Prong } from './find-2-prong/find-2-prong';
-import { add2Prong } from './add-2-prong';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Debug } from '../../debug/debug.js';
+import { Loop } from '../../loop.js';
+import { CpNode } from '../../cp-node.js';
+import { IPointOnShape } from '../../point-on-shape.js';
+import { getShapeBounds } from '../../svg/get-shape-bounds.js';
+import { Circle } from '../../circle.js';
+import { find2Prong } from './find-2-prong/find-2-prong.js';
+import { add2Prong } from './add-2-prong.js';
 
 
 /**

package/src/mat/find-mat/find-and-add-3-prongs.ts

@@ -1,15 +1,14 @@
-
 /** @hidden */
 declare var _debug_: Debug; 
 
-import { Debug } from '../../debug/debug';
-import LlRbTree from 'flo-ll-rb-tree';
-import { CpNode } from '../../cp-node';
-import { Loop } from '../../loop';
-import { Circle } from '../../circle';
-import { calcPosOrder, isPosSharpCorner } from '../../point-on-shape';
-import { find3Prong } from './find-3-prong/find-3-prong';
-import { add3Prong  } from '../find-mat/add-3-prong';
+import { LlRbTree } from 'flo-ll-rb-tree';
+import { Debug } from '../../debug/debug.js';
+import { CpNode } from '../../cp-node.js';
+import { Loop } from '../../loop.js';
+import { Circle } from '../../circle.js';
+import { calcPosOrder, isPosSharpCorner } from '../../point-on-shape.js';
+import { find3Prong } from './find-3-prong/find-3-prong.js';
+import { add3Prong  } from '../find-mat/add-3-prong.js';
 
 
 /**