@js-draw/math 1.23.1 → 1.24.1

package/dist/cjs/Mat33.js

@@ -430,6 +430,8 @@ class Mat33 {
         if (cssString === '' || cssString === 'none') {
             return Mat33.identity;
         }
+        // Normalize spacing
+        cssString = cssString.trim().replace(/\s+/g, ' ');
         const parseArguments = (argumentString) => {
             const parsed = argumentString.split(/[, \t\n]+/g).map((argString) => {
                 // Handle trailing spaces/commands
@@ -506,7 +508,7 @@ class Mat33 {
         };
         // A command (\w+)
         // followed by a set of arguments ([ \t\n0-9eE.,\-%]+)
-        const partRegex = /\s*(\w+)\s*\(([^)]*)\)/gi;
+        const partRegex = /(\w+)\s?\(([^)]*)\)/gi;
         let match;
         let matrix = null;
         while ((match = partRegex.exec(cssString)) !== null) {

package/dist/cjs/Vec3.d.ts

@@ -68,8 +68,8 @@ export interface Vec3 {
      *
      * This is equivalent to `Math.atan2(vec.y, vec.x)`.
      *
-     * As such, observing that `Math.atan2(-0, -1)` $\approx -\pi$ and `Math.atan2(0, -1)`$\approx \pi$
-     * the resultant angle is in the range $[-\pi, pi]$.
+     * As such, observing that `Math.atan2(-0, -1)` $\approx -\pi$ and `Math.atan2(0, -1)` $\approx \pi$
+     * the resultant angle is in the range $[-\pi, \pi]$.
      *
      * **Example**:
      * ```ts,runnable,console

package/dist/cjs/rounding/cleanUpNumber.js

@@ -14,7 +14,7 @@ const cleanUpNumber = (text) => {
     const lastChar = text.charAt(text.length - 1);
     if (lastChar === '0' || lastChar === '.') {
         // Remove trailing zeroes
-        text = text.replace(/([.]\d*[^0]+)0+$/, '$1');
+        text = text.replace(/([.]\d*[^0])0+$/, '$1');
         text = text.replace(/[.]0+$/, '.');
         // Remove trailing period
         text = text.replace(/[.]$/, '');

package/dist/cjs/shapes/BezierJSWrapper.d.ts

@@ -3,6 +3,12 @@ import { Point2, Vec2 } from '../Vec2';
 import LineSegment2 from './LineSegment2';
 import Rect2 from './Rect2';
 import Parameterized2DShape from './Parameterized2DShape';
+interface CorrectedBezierType extends Bezier {
+    dderivative(t: number): {
+        x: number;
+        y: number;
+    };
+}
 /**
  * A lazy-initializing wrapper around Bezier-js.
  *
@@ -17,7 +23,7 @@ export declare abstract class BezierJSWrapper extends Parameterized2DShape {
     protected constructor(bezierJsBezier?: Bezier);
     /** Returns the start, control points, and end point of this Bézier. */
     abstract getPoints(): readonly Point2[];
-    protected getBezier(): Bezier;
+    protected getBezier(): CorrectedBezierType;
     signedDistance(point: Point2): number;
     /**
      * @returns the (more) exact distance from `point` to this.

package/dist/mjs/Mat33.mjs

@@ -424,6 +424,8 @@ export class Mat33 {
         if (cssString === '' || cssString === 'none') {
             return Mat33.identity;
         }
+        // Normalize spacing
+        cssString = cssString.trim().replace(/\s+/g, ' ');
         const parseArguments = (argumentString) => {
             const parsed = argumentString.split(/[, \t\n]+/g).map((argString) => {
                 // Handle trailing spaces/commands
@@ -500,7 +502,7 @@ export class Mat33 {
         };
         // A command (\w+)
         // followed by a set of arguments ([ \t\n0-9eE.,\-%]+)
-        const partRegex = /\s*(\w+)\s*\(([^)]*)\)/gi;
+        const partRegex = /(\w+)\s?\(([^)]*)\)/gi;
         let match;
         let matrix = null;
         while ((match = partRegex.exec(cssString)) !== null) {

package/dist/mjs/Vec3.d.ts

@@ -68,8 +68,8 @@ export interface Vec3 {
      *
      * This is equivalent to `Math.atan2(vec.y, vec.x)`.
      *
-     * As such, observing that `Math.atan2(-0, -1)` $\approx -\pi$ and `Math.atan2(0, -1)`$\approx \pi$
-     * the resultant angle is in the range $[-\pi, pi]$.
+     * As such, observing that `Math.atan2(-0, -1)` $\approx -\pi$ and `Math.atan2(0, -1)` $\approx \pi$
+     * the resultant angle is in the range $[-\pi, \pi]$.
      *
      * **Example**:
      * ```ts,runnable,console

package/dist/mjs/rounding/cleanUpNumber.mjs

@@ -11,7 +11,7 @@ export const cleanUpNumber = (text) => {
     const lastChar = text.charAt(text.length - 1);
     if (lastChar === '0' || lastChar === '.') {
         // Remove trailing zeroes
-        text = text.replace(/([.]\d*[^0]+)0+$/, '$1');
+        text = text.replace(/([.]\d*[^0])0+$/, '$1');
         text = text.replace(/[.]0+$/, '.');
         // Remove trailing period
         text = text.replace(/[.]$/, '');

package/dist/mjs/shapes/BezierJSWrapper.d.ts

@@ -3,6 +3,12 @@ import { Point2, Vec2 } from '../Vec2';
 import LineSegment2 from './LineSegment2';
 import Rect2 from './Rect2';
 import Parameterized2DShape from './Parameterized2DShape';
+interface CorrectedBezierType extends Bezier {
+    dderivative(t: number): {
+        x: number;
+        y: number;
+    };
+}
 /**
  * A lazy-initializing wrapper around Bezier-js.
  *
@@ -17,7 +23,7 @@ export declare abstract class BezierJSWrapper extends Parameterized2DShape {
     protected constructor(bezierJsBezier?: Bezier);
     /** Returns the start, control points, and end point of this Bézier. */
     abstract getPoints(): readonly Point2[];
-    protected getBezier(): Bezier;
+    protected getBezier(): CorrectedBezierType;
     signedDistance(point: Point2): number;
     /**
      * @returns the (more) exact distance from `point` to this.

package/dist-test/test_imports/test-require.cjs

@@ -1,5 +1,6 @@
 console.log('Testing require()...');
 
+// eslint-disable-next-line @typescript-eslint/no-require-imports -- This is a .cjs file
 const { Vec2, Color4, Mat33 } = require('@js-draw/math');
 
 if (Vec2.of(1, 1).x !== 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@js-draw/math",
-	"version": "1.23.1",
+	"version": "1.24.1",
 	"description": "A math library for js-draw. ",
 	"types": "./dist/mjs/lib.d.ts",
 	"main": "./dist/cjs/lib.js",
@@ -27,7 +27,7 @@
 		"bezier-js": "6.1.3"
 	},
 	"devDependencies": {
-		"@js-draw/build-tool": "^1.23.1",
+		"@js-draw/build-tool": "^1.24.1",
 		"@types/bezier-js": "4.1.0",
 		"@types/jest": "29.5.5",
 		"@types/jsdom": "21.1.3"
@@ -44,5 +44,5 @@
 		"svg",
 		"math"
 	],
-	"gitHead": "e0bb3336d5f3a94533c823906778d39a4880f4cf"
+	"gitHead": "ef847374748e32d6d96d993a2236a99d9109a32c"
 }

package/src/Mat33.fromCSSMatrix.test.ts

@@ -30,6 +30,9 @@ describe('Mat33.fromCSSMatrix', () => {
 		expect(Mat33.fromCSSMatrix('matrix(-1, 2e6,	3E-2,-5.123, -6.5e-1, 0.01)')).objEq(
 			new Mat33(-1, 3e-2, -6.5e-1, 2e6, -5.123, 0.01, 0, 0, 1),
 		);
+		expect(Mat33.fromCSSMatrix('matrix(-1,\t2e6,3E-2,-5.123,  -6.5e-1,\n0.01\n)')).objEq(
+			new Mat33(-1, 3e-2, -6.5e-1, 2e6, -5.123, 0.01, 0, 0, 1),
+		);
 	});
 
 	it('should convert multi-matrix arguments into a single CSS matrix', () => {

package/src/Mat33.ts

@@ -516,6 +516,8 @@ export class Mat33 {
 		if (cssString === '' || cssString === 'none') {
 			return Mat33.identity;
 		}
+		// Normalize spacing
+		cssString = cssString.trim().replace(/\s+/g, ' ');
 
 		const parseArguments = (argumentString: string): number[] => {
 			const parsed = argumentString.split(/[, \t\n]+/g).map((argString) => {
@@ -609,7 +611,7 @@ export class Mat33 {
 
 		// A command (\w+)
 		// followed by a set of arguments ([ \t\n0-9eE.,\-%]+)
-		const partRegex = /\s*(\w+)\s*\(([^)]*)\)/gi;
+		const partRegex = /(\w+)\s?\(([^)]*)\)/gi;
 		let match;
 		let matrix: Mat33 | null = null;
 

package/src/Vec3.ts

@@ -72,8 +72,8 @@ export interface Vec3 {
 	 *
 	 * This is equivalent to `Math.atan2(vec.y, vec.x)`.
 	 *
-	 * As such, observing that `Math.atan2(-0, -1)` $\approx -\pi$ and `Math.atan2(0, -1)`$\approx \pi$
-	 * the resultant angle is in the range $[-\pi, pi]$.
+	 * As such, observing that `Math.atan2(-0, -1)` $\approx -\pi$ and `Math.atan2(0, -1)` $\approx \pi$
+	 * the resultant angle is in the range $[-\pi, \pi]$.
 	 *
 	 * **Example**:
 	 * ```ts,runnable,console

package/src/rounding/cleanUpNumber.test.ts

@@ -11,5 +11,7 @@ it('cleanUpNumber', () => {
 	expect(cleanUpNumber('1234')).toBe('1234');
 	expect(cleanUpNumber('1234.5')).toBe('1234.5');
 	expect(cleanUpNumber('1234.500')).toBe('1234.5');
+	expect(cleanUpNumber('1234.00500')).toBe('1234.005');
+	expect(cleanUpNumber('1234.001234500')).toBe('1234.0012345');
 	expect(cleanUpNumber('1.1368683772161603e-13')).toBe('0');
 });

package/src/rounding/cleanUpNumber.ts

@@ -13,7 +13,7 @@ export const cleanUpNumber = (text: string) => {
 	const lastChar = text.charAt(text.length - 1);
 	if (lastChar === '0' || lastChar === '.') {
 		// Remove trailing zeroes
-		text = text.replace(/([.]\d*[^0]+)0+$/, '$1');
+		text = text.replace(/([.]\d*[^0])0+$/, '$1');
 		text = text.replace(/[.]0+$/, '.');
 
 		// Remove trailing period

package/src/shapes/BezierJSWrapper.ts

@@ -4,6 +4,11 @@ import LineSegment2 from './LineSegment2';
 import Rect2 from './Rect2';
 import Parameterized2DShape from './Parameterized2DShape';
 
+// The typings for Bezier are incorrect in some cases:
+interface CorrectedBezierType extends Bezier {
+	dderivative(t: number): { x: number; y: number };
+}
+
 /**
  * A lazy-initializing wrapper around Bezier-js.
  *
@@ -14,13 +19,13 @@ import Parameterized2DShape from './Parameterized2DShape';
  * @internal
  */
 export abstract class BezierJSWrapper extends Parameterized2DShape {
-	#bezierJs: Bezier | null = null;
+	#bezierJs: CorrectedBezierType | null = null;
 
 	protected constructor(bezierJsBezier?: Bezier) {
 		super();
 
 		if (bezierJsBezier) {
-			this.#bezierJs = bezierJsBezier;
+			this.#bezierJs = bezierJsBezier as CorrectedBezierType;
 		}
 	}
 
@@ -29,7 +34,7 @@ export abstract class BezierJSWrapper extends Parameterized2DShape {
 
 	protected getBezier() {
 		if (!this.#bezierJs) {
-			this.#bezierJs = new Bezier(this.getPoints().map((p) => p.xy));
+			this.#bezierJs = new Bezier(this.getPoints().map((p) => p.xy)) as CorrectedBezierType;
 		}
 		return this.#bezierJs;
 	}
@@ -62,7 +67,7 @@ export abstract class BezierJSWrapper extends Parameterized2DShape {
 	}
 
 	public secondDerivativeAt(t: number): Point2 {
-		return Vec2.ofXY((this.getBezier() as any).dderivative(t));
+		return Vec2.ofXY(this.getBezier().dderivative(t));
 	}
 
 	/** @returns the [normal vector](https://en.wikipedia.org/wiki/Normal_(geometry)) to this curve at `t`. */