flo-mat 3.0.13 → 3.0.15

package/src/mat/simplify-mat.ts

@@ -1,10 +1,10 @@
+import type { Mat } from './mat.js';
+import type { CpNode } from '../cp-node/cp-node.js';
 import { hausdorffDistanceOneSided } from 'flo-bezier3';
-import { CpNode } from '../cp-node/cp-node.js';
 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 { Mat } from './mat.js';
 import { createNewCpTree } from './create-new-cp-tree.js';
 import { clone } from '../cp-node/fs/clone.js';
 import { findFirst } from '../cp-node/fs/find-first.js';
@@ -16,15 +16,17 @@ import { getProngCount } from '../cp-node/fs/get-prong-count.js';
 
 // TODO2 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: Mat,
@@ -60,14 +62,14 @@ function simplifyMat(
                 }
             }
 
-            if (i+1 === j) { 
-                // no simplification occured
-                continue;
+            if (i+1 === j) {
+                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 =>

package/src/point-on-shape/create-pos.ts

@@ -1,6 +1,6 @@
-import { evalDeCasteljauDd } from "flo-bezier3"
-import { Curve } from "../curve/curve.js"
-import { PointOnShape } from "./point-on-shape.js"
+import type { Curve } from "flo-boolean";
+import type { PointOnShape } from "./point-on-shape.js";
+import { evalDeCasteljauDd } from "flo-bezier3";
 
 
 function createPos(

package/src/point-on-shape/point-on-shape.ts

@@ -1,15 +1,15 @@
-import { Curve } from '../curve/curve.js';
+import type { Curve } from 'flo-boolean';
 
 
 interface PointOnShape {
     /** The `Curve` on the shape boundary this points belong to. */
-    curve: Curve;
+    readonly curve: Curve;
     /** The bezier parameter value on the curve identifying the point coordinates. */
-    t: number;
-    p: number[];
+    readonly t: number;
+    readonly p: number[];
     /** just for debugging */
-    isSource?: boolean;
+    readonly isSource?: boolean;
 }
 
 
-export { PointOnShape }
+export type { PointOnShape }

package/src/svg/get-loop-bounds.ts

@@ -1,8 +1,7 @@
-import { getBounds } from 'flo-bezier3';
+import type { Curve, Loop } from 'flo-boolean';
+import type { PointOnShape } from '../point-on-shape/point-on-shape.js';
 import { memoize } from 'flo-memoize';
-import { Loop } from 'flo-boolean';
-import { Curve } from '../curve/curve.js';
-import { PointOnShape } from '../point-on-shape/point-on-shape.js';
+import { getBounds } from 'flo-bezier3';
 import { createPos } from '../point-on-shape/create-pos.js';
 
 
@@ -17,7 +16,7 @@ const getLoopBounds = memoize(function(loop: Loop): {
         minX: PointOnShape;
         minY: PointOnShape;
         maxX: PointOnShape;
-        maxY: PointOnShape } {    
+        maxY: PointOnShape } {
 
     const extremes: { 
         bezier: Curve, 

package/__tests__/cp-node/fs/add-distance-from.spec.ts

@@ -1,7 +0,0 @@
-import { expect, test } from '@jest/globals';
-import { addDistanceFrom } from '../../../src/cp-node/fs/add-distance-from.js';
-
-test.skip('addDistanceFrom [STUB]', () => {
-    // TODO: implement test
-    expect(true).toBe(true);
-});

package/__tests__/cp-node/fs/cp-nodes-to-boundary-beziers.spec.ts

@@ -1,7 +0,0 @@
-import { expect, test } from '@jest/globals';
-import { cpNodesToBoundaryBeziers } from '../../../src/cp-node/fs/cp-nodes-to-boundary-beziers.js';
-
-test.skip('cpNodesToBoundaryBeziers [STUB]', () => {
-    // TODO: implement test
-    expect(true).toBe(true);
-});

package/__tests__/cp-node/fs/create-cp-node.spec.ts

@@ -1,7 +0,0 @@
-import { expect, test } from '@jest/globals';
-import { createCpNode } from '../../../src/cp-node/fs/create-cp-node.js';
-
-test.skip('createCpNode [STUB]', () => {
-    // TODO: implement test
-    expect(true).toBe(true);
-});

package/__tests__/cp-node/fs/enhance-cp-node.spec.ts

@@ -1,7 +0,0 @@
-import { expect, test } from '@jest/globals';
-import { enhanceCpNode } from '../../../src/cp-node/fs/enhance-cp-node.js';
-
-test.skip('enhanceCpNode [STUB]', () => {
-    // TODO: implement test
-    expect(true).toBe(true);
-});

package/__tests__/jsog/get-mats1.ts

@@ -1,41 +0,0 @@
-import type { Mat } from "../../src/mat/mat.js";
-import { findMats } from "../../src/find-mat/find-mats.js";
-
-
-/** mat-demo: "achispado" font, "comma" glyph */
-const loops1 = [
-    [
-        [[139, 8], [82, -101]],
-        [[82, -101], [24, 8]],
-        [[24, 8], [46, 8]],
-        [[46, 8], [46, 54]],
-        [[46, 54], [117, 54]],
-        [[117, 54], [117, 8]],
-        [[117, 8], [139, 8]],
-        [[139, 8], [139, 8]]
-    ]
-];
-
-
-// Cache
-let mats1: Mat[] | undefined = undefined;
-function getMats1() {
-    if (mats1) { return mats1; }
-
-    mats1 = findMats(loops1, {
-        applySat: false,
-        simplify: true,
-        satScale: 1.675,
-        maxCurviness: 0.05,
-        maxLength: 40,
-        // maxCurviness: 5,
-        // maxLength: 4000,
-        angleIncrement: 15,
-        simplifyTolerance: 2**-1
-    });
-
-    return mats1;
-}
-
-
-export { getMats1 }

package/node/curve/curve.d.ts

@@ -1,33 +0,0 @@
-import { Loop } from 'flo-boolean';
-/**
- * Represents a bezier curve on the shape boundary / loop.
- */
-interface Curve {
-    /**
-     * The closed loop of bezier curves representing the shape
-     * boundary this curve belongs to.
-     */
-    loop: Loop;
-    /**
-     * The bezier control points.
-     */
-    ps: number[][];
-    /**
-     * The previous curve (when going in a negative direction around
-     * the shape boundary, i.e. clockwise for the outer shape and anti-clockwise
-     * for the holes (if any))
-     */
-    prev: Curve;
-    /**
-     * The next curve (when going in a positive direction around
-     * the shape boundary, i.e. anti-clockwise for the outer shape and clockwise
-     * for the holes (if any))
-     */
-    next: Curve;
-    /**
-     * The curve's ordered index in the loop. This imposes a cycling
-     * ordering of the curves in the loop
-     */
-    idx: number;
-}
-export { Curve };

package/node/curve/curve.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=curve.js.map

package/node/curve/curve.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"curve.js","sourceRoot":"","sources":["../../src/curve/curve.ts"],"names":[],"mappings":""}