@mce/bigesj 0.18.1 → 0.18.2

package/dist/index.js

@@ -1626,7 +1626,7 @@ function signedArea(data, start, end, dim) {
 	return sum;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/modern-path2d@1.5.6/node_modules/modern-path2d/dist/index.mjs
+//#region ../../node_modules/.pnpm/modern-path2d@1.6.0/node_modules/modern-path2d/dist/index.mjs
 function drawPoint(ctx, x, y, options = {}) {
 	const { radius = 1 } = options;
 	ctx.moveTo(x, y);
@@ -1795,9 +1795,7 @@ var Vector2 = class Vector2 {
 		x: 0,
 		y: 0
 	}) {
-		const x = sx < 0 ? origin.x - this._x + origin.x : this._x;
-		const y = sy < 0 ? origin.y - this._y + origin.y : this._y;
-		return this.set(x * Math.abs(sx), y * Math.abs(sy));
+		return this.set(origin.x + (this._x - origin.x) * sx, origin.y + (this._y - origin.y) * sy);
 	}
 	skew(ax, ay = 0, origin = {
 		x: 0,
@@ -3110,8 +3108,11 @@ function getReflection(a, b) {
 function svgPathCommandsAddToPath2D(commands, path) {
 	const current = new Vector2();
 	const control = new Vector2();
+	let prevType = "";
 	for (let i = 0, l = commands.length; i < l; i++) {
 		const cmd = commands[i];
+		if ((cmd.type === "s" || cmd.type === "S") && !"CcSs".includes(prevType)) control.copyFrom(current);
+		else if ((cmd.type === "t" || cmd.type === "T") && !"QqTt".includes(prevType)) control.copyFrom(current);
 		if (cmd.type === "m" || cmd.type === "M") {
 			if (cmd.type === "m") current.add(cmd);
 			else current.copyFrom(cmd);
@@ -3192,6 +3193,7 @@ function svgPathCommandsAddToPath2D(commands, path) {
 			if (path.startPoint) current.copyFrom(path.startPoint);
 			path.closePath();
 		} else console.warn("Unsupported commands", cmd);
+		prevType = cmd.type;
 	}
 }
 function svgPathCommandsToData(commands) {
@@ -3572,10 +3574,14 @@ function parsePolylineNode(node) {
 function parseRectNode(node) {
 	const x = parseFloatWithUnits(node.getAttribute("x") || 0);
 	const y = parseFloatWithUnits(node.getAttribute("y") || 0);
-	const rx = parseFloatWithUnits(node.getAttribute("rx") || node.getAttribute("ry") || 0);
-	const ry = parseFloatWithUnits(node.getAttribute("ry") || node.getAttribute("rx") || 0);
+	const rxAttr = node.getAttribute("rx");
+	const ryAttr = node.getAttribute("ry");
+	let rx = parseFloatWithUnits(rxAttr ?? ryAttr ?? 0);
+	let ry = parseFloatWithUnits(ryAttr ?? rxAttr ?? 0);
 	const w = parseFloatWithUnits(node.getAttribute("width"));
 	const h = parseFloatWithUnits(node.getAttribute("height"));
+	rx = Math.max(0, Math.min(rx, w / 2));
+	ry = Math.max(0, Math.min(ry, h / 2));
 	const bci = .448084975506;
 	const path = new Path2D();
 	path.moveTo(x + rx, y);
@@ -4271,8 +4277,11 @@ function eigenDecomposition(A, B, C) {
 		rt1 = .5 * (sm + rt);
 		t = 1 / rt1;
 		rt2 = A * t * C - B * t * B;
-	} else if (sm < 0) rt2 = .5 * (sm - rt);
-	else {
+	} else if (sm < 0) {
+		rt2 = .5 * (sm - rt);
+		t = 1 / rt2;
+		rt1 = A * t * C - B * t * B;
+	} else {
 		rt1 = .5 * rt;
 		rt2 = -.5 * rt;
 	}
@@ -4416,17 +4425,19 @@ var CompositeCurve = class CompositeCurve extends Curve {
 	getPoint(t, output = new Vector2()) {
 		const d = t * this.getLength();
 		const lengths = this.getLengths();
-		let i = 0;
-		while (i < lengths.length) {
-			if (lengths[i] >= d) {
-				const diff = lengths[i] - d;
-				const curve = this.curves[i];
-				const length = curve.getLength();
-				return curve.getPointAt(length === 0 ? 0 : 1 - diff / length, output);
-			}
-			i++;
+		const n = lengths.length;
+		if (n === 0) return output;
+		let lo = 0;
+		let hi = n - 1;
+		while (lo < hi) {
+			const mid = lo + hi >>> 1;
+			if (lengths[mid] < d) lo = mid + 1;
+			else hi = mid;
 		}
-		return output;
+		const diff = lengths[lo] - d;
+		const curve = this.curves[lo];
+		const length = curve.getLength();
+		return curve.getPointAt(length === 0 ? 0 : 1 - diff / length, output);
 	}
 	getLengths() {
 		if (this._lengths.length !== this.curves.length) this.updateLengths();
@@ -4544,6 +4555,11 @@ var CubicBezierCurve = class CubicBezierCurve extends Curve {
 		];
 	}
 	_solveQuadratic(a, b, c) {
+		if (Math.abs(a) < 1e-12) {
+			if (Math.abs(b) < 1e-12) return [];
+			const t = -c / b;
+			return t >= 0 && t <= 1 ? [t] : [];
+		}
 		const discriminant = b * b - 4 * a * c;
 		if (discriminant < 0) return [];
 		const sqrtDiscriminant = Math.sqrt(discriminant);
@@ -4551,26 +4567,21 @@ var CubicBezierCurve = class CubicBezierCurve extends Curve {
 	}
 	getMinMax(min = Vector2.MAX, max = Vector2.MIN) {
 		const { p1, cp1, cp2, p2 } = this;
-		const dxRoots = this._solveQuadratic(3 * (cp1.x - p1.x), 6 * (cp2.x - cp1.x), 3 * (p2.x - cp2.x));
-		const dyRoots = this._solveQuadratic(3 * (cp1.y - p1.y), 6 * (cp2.y - cp1.y), 3 * (p2.y - cp2.y));
+		const dxRoots = this._solveQuadratic(3 * (-p1.x + 3 * cp1.x - 3 * cp2.x + p2.x), 6 * (p1.x - 2 * cp1.x + cp2.x), 3 * (cp1.x - p1.x));
+		const dyRoots = this._solveQuadratic(3 * (-p1.y + 3 * cp1.y - 3 * cp2.y + p2.y), 6 * (p1.y - 2 * cp1.y + cp2.y), 3 * (cp1.y - p1.y));
 		const tValues = [
 			0,
 			1,
 			...dxRoots,
 			...dyRoots
 		];
-		const samplePoints = (tValues2, precision) => {
-			for (const t of tValues2) for (let i = 0; i <= precision; i++) {
-				const delta = i / precision - .5;
-				const refinedT = Math.min(1, Math.max(0, t + delta));
-				const point = this.getPoint(refinedT);
-				min.x = Math.min(min.x, point.x);
-				min.y = Math.min(min.y, point.y);
-				max.x = Math.max(max.x, point.x);
-				max.y = Math.max(max.y, point.y);
-			}
-		};
-		samplePoints(tValues, 10);
+		for (const t of tValues) {
+			const point = this.getPoint(t);
+			min.x = Math.min(min.x, point.x);
+			min.y = Math.min(min.y, point.y);
+			max.x = Math.max(max.x, point.x);
+			max.y = Math.max(max.y, point.y);
+		}
 		return {
 			min: min.finite(),
 			max: max.finite()
@@ -4616,7 +4627,7 @@ var EllipseCurve = class extends RoundCurve {
 		return this;
 	}
 };
-var PloygonCurve = class extends CompositeCurve {};
+var PolygonCurve = class extends CompositeCurve {};
 var QuadraticBezierCurve = class QuadraticBezierCurve extends Curve {
 	constructor(p1 = new Vector2(), cp = new Vector2(), p2 = new Vector2()) {
 		super();
@@ -4644,14 +4655,22 @@ var QuadraticBezierCurve = class QuadraticBezierCurve extends Curve {
 	}
 	getMinMax(min = Vector2.MAX, max = Vector2.MIN) {
 		const { p1, cp, p2 } = this;
-		const x1 = .5 * (p1.x + cp.x);
-		const y1 = .5 * (p1.y + cp.y);
-		const x2 = .5 * (p1.x + p2.x);
-		const y2 = .5 * (p1.y + p2.y);
-		min.x = Math.min(min.x, p1.x, p2.x, x1, x2);
-		min.y = Math.min(min.y, p1.y, p2.y, y1, y2);
-		max.x = Math.max(max.x, p1.x, p2.x, x1, x2);
-		max.y = Math.max(max.y, p1.y, p2.y, y1, y2);
+		const extrema = (a, b, c) => {
+			const denom = a - 2 * b + c;
+			if (Math.abs(denom) < 1e-12) return null;
+			const t = (a - b) / denom;
+			return t > 0 && t < 1 ? t : null;
+		};
+		const tx = extrema(p1.x, cp.x, p2.x);
+		const ty = extrema(p1.y, cp.y, p2.y);
+		const xs = [p1.x, p2.x];
+		const ys = [p1.y, p2.y];
+		if (tx !== null) xs.push(quadraticBezier(tx, p1.x, cp.x, p2.x));
+		if (ty !== null) ys.push(quadraticBezier(ty, p1.y, cp.y, p2.y));
+		min.x = Math.min(min.x, ...xs);
+		min.y = Math.min(min.y, ...ys);
+		max.x = Math.max(max.x, ...xs);
+		max.y = Math.max(max.y, ...ys);
 		return {
 			min: min.finite(),
 			max: max.finite()
@@ -4685,7 +4704,7 @@ var QuadraticBezierCurve = class QuadraticBezierCurve extends Curve {
 		return this;
 	}
 };
-var RectangleCurve = class extends PloygonCurve {
+var RectangleCurve = class extends PolygonCurve {
 	constructor(x = 0, y = 0, width = 0, height = 0) {
 		super();
 		this.x = x;
@@ -5027,16 +5046,11 @@ var Path2D = class Path2D extends CompositeCurve {
 		return this;
 	}
 	moveTo(x, y) {
-		if (!this.currentCurve.currentPoint?.equals({
-			x,
-			y
-		})) {
-			if (this.currentCurve.curves.length) {
-				this.currentCurve = new CurvePath();
-				this.curves.push(this.currentCurve);
-			}
-			this.currentCurve.moveTo(x, y);
+		if (this.currentCurve.curves.length) {
+			this.currentCurve = new CurvePath();
+			this.curves.push(this.currentCurve);
 		}
+		this.currentCurve.moveTo(x, y);
 		return this;
 	}
 	lineTo(x, y) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mce/bigesj",
   "type": "module",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "Plugin for mce",
   "author": "wxm",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "modern-openxml": "^1.10.1"
   },
   "devDependencies": {
-    "mce": "0.18.1"
+    "mce": "0.18.2"
   },
   "peerDependencies": {
     "mce": "^0"