@p10node/diagram 0.9.0 → 0.12.0

package/dist/index.js

@@ -347,36 +347,61 @@ function e(e, t, n, r) {
 		i.push({
 			x: Z.get(`${r[r.length - 1]}:t:${n}`) ?? s.x,
 			y: s.y - C[r[r.length - 1]] / 2
-		}), a.push(!1), c[n] && (i.reverse(), a.reverse());
-		let l = [];
-		for (let e = 1; e < i.length; e++) {
-			let t = i[e - 1], n = i[e];
-			if (a[e - 1] || Math.abs(t.x - n.x) < .5) l.push({
+		}), a.push(!1);
+		let l = i.length, u = Array(l).fill(0), d = (e) => (i[e + 1].x - i[e].x) / Math.max(.5, i[e + 1].y - i[e].y);
+		for (let e = 1; e + 1 < l; e++) {
+			if (a[e - 1] || a[e]) continue;
+			let t = d(e - 1), n = d(e);
+			if (t * n <= 0) continue;
+			let r = i[e].y - i[e - 1].y, o = i[e + 1].y - i[e].y;
+			u[e] = 3 * (r + o) / ((2 * o + r) / t + (o + 2 * r) / n);
+		}
+		let f = [];
+		for (let e = 1; e < l; e++) {
+			let t = i[e - 1], n = i[e], r = (n.y - t.y) / 3;
+			a[e - 1] || Math.abs(t.x - n.x) < .5 && !u[e - 1] && !u[e] ? f.push({
 				c: "L",
 				p: [n]
+			}) : f.push({
+				c: "C",
+				p: [
+					{
+						x: t.x + u[e - 1] * r,
+						y: t.y + r
+					},
+					{
+						x: n.x - u[e] * r,
+						y: n.y - r
+					},
+					n
+				]
 			});
-			else {
-				let e = (t.y + n.y) / 2;
-				l.push({
-					c: "C",
-					p: [
-						{
-							x: t.x,
-							y: e
-						},
-						{
-							x: n.x,
-							y: e
-						},
-						n
-					]
-				});
-			}
 		}
-		return {
+		let p = ne[n] >= 0 ? X(ne[n]) : void 0;
+		if (!c[n]) return {
 			start: i[0],
-			segs: l,
-			label: ne[n] >= 0 ? X(ne[n]) : void 0
+			segs: f,
+			label: p
+		};
+		let m = [];
+		for (let e = l - 1; e >= 1; e--) {
+			let t = f[e - 1];
+			m.push(t.c === "C" ? {
+				c: "C",
+				p: [
+					t.p[1],
+					t.p[0],
+					i[e - 1]
+				]
+			} : {
+				c: "L",
+				p: [i[e - 1]]
+			});
+		}
+		return {
+			start: i[l - 1],
+			segs: m,
+			label: p
 		};
 	}), xe = n.map((e, t) => {
 		if (N[t] > P[t]) return null;
@@ -1161,10 +1186,16 @@ function M(e, t, n) {
 			x: i.x - a.x * n,
 			y: i.y - a.y * n
 		};
-		r.p[r.p.length - 1] = e, r.c === "C" && (r.p[1] = {
-			x: r.p[1].x - a.x * Math.min(n, 6),
-			y: r.p[1].y - a.y * Math.min(n, 6)
-		});
+		if (r.p[r.p.length - 1] = e, r.c === "C") {
+			let e = {
+				x: r.p[1].x - a.x * Math.min(n, 6),
+				y: r.p[1].y - a.y * Math.min(n, 6)
+			}, t = Math.min(0, (e.x - r.p[0].x) * a.x + (e.y - r.p[0].y) * a.y);
+			r.p[1] = {
+				x: e.x - a.x * t,
+				y: e.y - a.y * t
+			};
+		}
 	}
 	return a;
 }
@@ -1403,10 +1434,17 @@ function F(t) {
 			x: l.start.x - S.x * T,
 			y: l.start.y - S.y * T
 		} : l.start;
-		if (T && x.c === "C" && (x.p[0] = {
-			x: x.p[0].x - S.x * Math.min(T, 6),
-			y: x.p[0].y - S.y * Math.min(T, 6)
-		}), s.path(m([{
+		if (T && x.c === "C") {
+			let e = {
+				x: x.p[0].x - S.x * Math.min(T, 6),
+				y: x.p[0].y - S.y * Math.min(T, 6)
+			}, t = Math.max(0, (x.p[1].x - e.x) * S.x + (x.p[1].y - e.y) * S.y);
+			x.p[0] = {
+				x: e.x + S.x * t,
+				y: e.y + S.y * t
+			};
+		}
+		if (s.path(m([{
 			c: "M",
 			p: [E]
 		}, ...l.segs.map((e) => ({