flo-mat 2.0.1 → 2.0.2

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

@@ -6,8 +6,8 @@ import { getLoopBounds } from './get-loop-bounds.js';
 // TODO - move to another library
 
 
-/** @hidden */
-let getShapeBounds = memoize(function(loops: Loop[]) {
+/** @internal */
+const getShapeBounds = memoize(function(loops: Loop[]) {
     let minX_ = Number.POSITIVE_INFINITY;
     let maxX_ = Number.NEGATIVE_INFINITY;
     let minY_ = Number.POSITIVE_INFINITY;
@@ -18,8 +18,8 @@ let getShapeBounds = memoize(function(loops: Loop[]) {
     let minY;
     let maxY;
 
-    for (let loop of loops) {
-        let bounds = getLoopBounds(loop);
+    for (const loop of loops) {
+        const bounds = getLoopBounds(loop);
         if (bounds.minX.p[0] < minX_) {
             minX = bounds.minX;
             minX_ = bounds.minX.p[0];

package/src/sweep-line/are-boxes-intersecting.ts

@@ -15,10 +15,10 @@ function areBoxesIntersecting(closed: boolean) {
         let [[bx0, by0],[bx1, by1]] = b;
 
         // Swap so smaller coordinate comes first
-        if (ay0 > ay1) { [ay0,ay1] = [ay1,ay0] };
-        if (by0 > by1) { [by0,by1] = [by1,by0] };
-        if (ax0 > ax1) { [ax0,ax1] = [ax1,ax0] };
-        if (bx0 > bx1) { [bx0,bx1] = [bx1,bx0] };
+        if (ay0 > ay1) { [ay0,ay1] = [ay1,ay0] }
+        if (by0 > by1) { [by0,by1] = [by1,by0] }
+        if (ax0 > ax1) { [ax0,ax1] = [ax1,ax0] }
+        if (bx0 > bx1) { [bx0,bx1] = [bx1,bx0] }
 
         return closed
             ? (

package/src/sweep-line/sweep-line.ts

@@ -32,8 +32,8 @@ function sweepLine<T>(
         predicate: (item1: T, item2: T) => boolean): [T,T][] {
 
     // Initialize event queue to contain all endpoints.
-    let events: IEvent<T>[] = [];
-	for (let item of items) {
+    const events: IEvent<T>[] = [];
+	for (const item of items) {
 		events.push({ 
             type: EVENT_LEFT, 
             item, 
@@ -48,15 +48,15 @@ function sweepLine<T>(
 
 	events.sort(compare);
 	
-	let activeItems = new Set<T>();
+	const activeItems = new Set<T>();
     
     /** A list of pairs of items that passed the predicate */
-	let pairedItems: [T,T][] = [];
-	for (let event of events) {
-    	let { item } = event;
+	const pairedItems: [T,T][] = [];
+	for (const event of events) {
+    	const { item } = event;
     	
    		if (event.type === EVENT_LEFT) {
-   			for (let activeItem of activeItems.values()) {
+   			for (const activeItem of activeItems.values()) {
    				if (predicate(item, activeItem)) { 
                     pairedItems.push([item, activeItem]);
    				}
@@ -93,7 +93,7 @@ interface IEvent<T> {
  * @param b Another event
  */
 function compare<T>(a: IEvent<T>, b: IEvent<T>) {
-    let res = a.x - b.x;
+    const res = a.x - b.x;
 
     if (res !== 0) { return res; }
 

package/src/to-scale-axis.ts

@@ -1,5 +1,5 @@
-/** @hidden */
-declare var _debug_: Debug;
+/** @internal */
+declare const _debug_: Debug;
 
 import { length } from 'flo-bezier3';
 import { Debug } from './debug/debug.js';
@@ -45,21 +45,22 @@ function toScaleAxis(
 		s: number, 
 		f: (s: number) => (r: number) => number = linearScale): Mat {
 
+	let timingStart = 0;
 	if (typeof _debug_ !== 'undefined') {
-		var timingStart = performance.now();
-		let leaves = getLeaves(mat.cpNode);
+		timingStart = performance.now();
+		const leaves = getLeaves(mat.cpNode);
 		_debug_.generated.elems.leaves.push(leaves);
 	}
 
 	/** The largest vertex (as measured by its inscribed disk) */
-	let cpNodes: CpNode[] = [];
+	const cpNodes: CpNode[] = [];
 	traverseVertices(
 		clone(mat.cpNode), 
 		cpNode => { cpNodes.push(cpNode); }
 	);
 
-	let cpNode = getLargestVertex(cpNodes);
-	let f_ = f(s);
+	const cpNode = getLargestVertex(cpNodes);
+	const f_ = f(s);
 
 	if (typeof _debug_ !== 'undefined') {
 		_debug_.generated.elems.maxVertex.push(cpNode);
@@ -69,22 +70,22 @@ function toScaleAxis(
 	 * All vertices that are set to be culled initially. This may change later 
 	 * in order to preserve topology. 
 	 */
-	let culls: Set<Circle> = new Set();
+	const culls: Set<Circle> = new Set();
 
-	let rMap: Map<CpNode,number> = new Map();
+	const rMap: Map<CpNode,number> = new Map();
 
 	traverseEdges(cpNode, function(cpNode) {
 		/** The occulating radius stored with this vertex. */
-		let R = rMap.get(cpNode) || f_(cpNode.cp.circle.radius);
+		const R = rMap.get(cpNode) || f_(cpNode.cp.circle.radius);
 
-		let cpNode_ = cpNode.next;
+		const cpNode_ = cpNode.next;
 
-		let l = length([0,1], getCurveToNext(cpNode));
+		const l = length([0,1], getCurveToNext(cpNode));
 
-		let r = cpNode_.cp.circle.radius;
-		let r_ = f_(r);
+		const r = cpNode_.cp.circle.radius;
+		const r_ = f_(r);
 		if (R - l > r_) {
-			for (let cpNode of cpNode_.getCpNodesOnCircle()) {
+			for (const cpNode of cpNode_.getCpNodesOnCircle()) {
 				rMap.set(cpNode, R - l); // Update osculating radii
 			}
 			culls.add(cpNode_.cp.circle);
@@ -98,8 +99,8 @@ function toScaleAxis(
 	}
 	 
 	// TODO - put line below back - goes into infinite loop
-	//let sat: Mat = { cpNode, cpTrees: createNewCpTree(cpNode) };
-	let sat: Mat = { cpNode, cpTrees: undefined };
+	//const sat: Mat = { cpNode, cpTrees: createNewCpTree(cpNode) };
+	const sat: Mat = { cpNode, cpTrees: undefined };
 
 	addDebugInfo(sat, timingStart);
 

package/src/traverse-edges.ts

@@ -14,10 +14,10 @@ function traverseEdges(
 
 	// Since the tree is unrooted we must iterate in all directions from the
 	// given vertex.
-	let cps = cpNode.getCpNodesOnCircle();
+	const cps = cpNode.getCpNodesOnCircle();
 
 	while (cps.length) {
-		let cp = cps.pop();
+		const cp = cps.pop();
 		f(cp);
 
 		if (cp.isTerminating()) { continue; }

package/src/traverse-vertices.ts

@@ -24,9 +24,9 @@ function traverseVertices(
 		.forEach(f_);
 
 	function f_(cpNode: CpNode) {
-		let cps = [cpNode];
+		const cps = [cpNode];
 		while (cps.length) {
-			let cp = cps.pop();
+			const cp = cps.pop();
 			f(cp);
 			cps.push(...cp.vertexChildren);
 		}

package/webpack.config.cjs

@@ -3,11 +3,6 @@ const CircularDependencyPlugin = require('circular-dependency-plugin');
 const ResolveTypeScriptPlugin = require("resolve-typescript-plugin");
 
 
-////////////////////////////////
-const library = 'FloMat';
-////////////////////////////////
-
-
 const extensions = [
     '.js', '.mjs', '.cjs', 
     '.jsx', '.cjsx', '.mjsx'
@@ -15,8 +10,8 @@ const extensions = [
 
 
 const config_Basic = {
-    // mode: 'production',
-    mode: 'development',
+    mode: 'production',
+    // mode: 'development',
     entry: './src/index.ts',
     resolve: {
         extensions,
@@ -49,40 +44,12 @@ const config_Basic = {
             // set the current working directory for displaying module paths
             cwd: process.cwd(),
         })
-    ]
-}
-
-
-const lib = {
-    path: path.resolve(__dirname, 'browser'),
-    library,
-    libraryTarget: 'var'
-};
-
-
-/** Global var library, minified */ 
-const config_VarMinify = {
-    ...config_Basic,
-    output: {
-        filename: 'index.min.js',
-        ...lib
-    },
-    optimization: {
-        minimize: true
-    }
-};
-
-
-/** Global var library, not minified */ 
-const config_VarNoMinify = {
-    ...config_Basic,
+    ],
     output: {
-        filename: 'index.js',
-        ...lib
+        path: path.resolve(__dirname, 'browser'),
+        library: { type: 'module' }
     },
-    optimization: {
-        minimize: false
-    }
+    experiments: { outputModule: true }
 }
 
 
@@ -90,18 +57,10 @@ const config_VarNoMinify = {
 const config_EsmMinify = {
     ...config_Basic,
     output: {
-        filename: 'index.module.min.js',
-        path: path.resolve(__dirname, 'browser'),
-        library: {
-            type: 'module'
-        }
-    },
-    optimization: {
-        minimize: true
+        ...config_Basic.output,
+        filename: 'index.min.js',
     },
-    experiments: {
-        outputModule: true
-    }
+    optimization: { minimize: true }
 };
 
 
@@ -109,24 +68,14 @@ const config_EsmMinify = {
 const config_EsmNoMinify = {
     ...config_Basic,
     output: {
-        filename: 'index.module.js',
-        path: path.resolve(__dirname, 'browser'),
-        library: {
-            type: 'module'
-        }
-    },
-    optimization: {
-        minimize: false
+        ...config_Basic.output,
+        filename: 'index.js',
     },
-    experiments: {
-        outputModule: true
-    }
+    optimization: { minimize: false },
 };
 
 
 module.exports = [
-    config_VarMinify,
-    config_VarNoMinify,
     config_EsmMinify,
     config_EsmNoMinify
 ];