@js-draw/math 1.24.1 → 1.25.0

package/dist/cjs/Mat33.js

@@ -507,8 +507,8 @@ class Mat33 {
             },
         };
         // A command (\w+)
-        // followed by a set of arguments ([ \t\n0-9eE.,\-%]+)
-        const partRegex = /(\w+)\s?\(([^)]*)\)/gi;
+        // followed by a set of arguments ([^)]*)
+        const partRegex = /(?:^|\W)(\w+)\s?\(([^)]*)\)/gi;
         let match;
         let matrix = null;
         while ((match = partRegex.exec(cssString)) !== null) {

package/dist/cjs/shapes/Rect2.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rect2 = void 0;
 const LineSegment2_1 = __importDefault(require("./LineSegment2"));
+const Mat33_1 = __importDefault(require("../Mat33"));
 const Vec2_1 = require("../Vec2");
 const Abstract2DShape_1 = __importDefault(require("./Abstract2DShape"));
 /**
@@ -244,6 +245,10 @@ class Rect2 extends Abstract2DShape_1.default {
     // [affineTransform] is a transformation matrix that both scales and **translates**.
     // the bounding box of this' four corners after transformed by the given affine transformation.
     transformedBoundingBox(affineTransform) {
+        // Optimize transforming by the identity matrix (a common case).
+        if (affineTransform === Mat33_1.default.identity) {
+            return this;
+        }
         return Rect2.bboxOf(this.corners.map((corner) => affineTransform.transformVec2(corner)));
     }
     /** @return true iff this is equal to `other ± tolerance` */

package/dist/mjs/Mat33.mjs

@@ -501,8 +501,8 @@ export class Mat33 {
             },
         };
         // A command (\w+)
-        // followed by a set of arguments ([ \t\n0-9eE.,\-%]+)
-        const partRegex = /(\w+)\s?\(([^)]*)\)/gi;
+        // followed by a set of arguments ([^)]*)
+        const partRegex = /(?:^|\W)(\w+)\s?\(([^)]*)\)/gi;
         let match;
         let matrix = null;
         while ((match = partRegex.exec(cssString)) !== null) {

package/dist/mjs/shapes/Rect2.mjs

@@ -1,4 +1,5 @@
 import  LineSegment2  from './LineSegment2.mjs';
+import  Mat33  from '../Mat33.mjs';
 import  { Vec2 }  from '../Vec2.mjs';
 import  Abstract2DShape  from './Abstract2DShape.mjs';
 /**
@@ -238,6 +239,10 @@ export class Rect2 extends Abstract2DShape {
     // [affineTransform] is a transformation matrix that both scales and **translates**.
     // the bounding box of this' four corners after transformed by the given affine transformation.
     transformedBoundingBox(affineTransform) {
+        // Optimize transforming by the identity matrix (a common case).
+        if (affineTransform === Mat33.identity) {
+            return this;
+        }
         return Rect2.bboxOf(this.corners.map((corner) => affineTransform.transformVec2(corner)));
     }
     /** @return true iff this is equal to `other ± tolerance` */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@js-draw/math",
-	"version": "1.24.1",
+	"version": "1.25.0",
 	"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.24.1",
+		"@js-draw/build-tool": "^1.25.0",
 		"@types/bezier-js": "4.1.0",
 		"@types/jest": "29.5.5",
 		"@types/jsdom": "21.1.3"
@@ -44,5 +44,5 @@
 		"svg",
 		"math"
 	],
-	"gitHead": "ef847374748e32d6d96d993a2236a99d9109a32c"
+	"gitHead": "8ecc7be6d8b1b00c25fe7d3ed6c5fee239451dfa"
 }

package/src/Mat33.ts

@@ -610,8 +610,8 @@ export class Mat33 {
 		};
 
 		// A command (\w+)
-		// followed by a set of arguments ([ \t\n0-9eE.,\-%]+)
-		const partRegex = /(\w+)\s?\(([^)]*)\)/gi;
+		// followed by a set of arguments ([^)]*)
+		const partRegex = /(?:^|\W)(\w+)\s?\(([^)]*)\)/gi;
 		let match;
 		let matrix: Mat33 | null = null;
 

package/src/shapes/Rect2.test.ts

@@ -114,6 +114,10 @@ describe('Rect2', () => {
 	});
 
 	it('A transformed bounding box', () => {
+		expect(Rect2.unitSquare.transformedBoundingBox(Mat33.scaling2D(2))).objEq(
+			new Rect2(0, 0, 2, 2),
+		);
+
 		const rotationMat = Mat33.zRotation(Math.PI / 4);
 		const rect = Rect2.unitSquare.translatedBy(Vec2.of(-0.5, -0.5));
 		const transformedBBox = rect.transformedBoundingBox(rotationMat);

package/src/shapes/Rect2.ts

@@ -310,6 +310,11 @@ export class Rect2 extends Abstract2DShape {
 	// [affineTransform] is a transformation matrix that both scales and **translates**.
 	// the bounding box of this' four corners after transformed by the given affine transformation.
 	public transformedBoundingBox(affineTransform: Mat33): Rect2 {
+		// Optimize transforming by the identity matrix (a common case).
+		if (affineTransform === Mat33.identity) {
+			return this;
+		}
+
 		return Rect2.bboxOf(this.corners.map((corner) => affineTransform.transformVec2(corner)));
 	}