@genome-spy/app 0.87.0 → 0.88.0

package/dist/{rasterExport-DzldLv6E.js → rasterExport-BgZ98e6U.js}

@@ -1,7 +1,7 @@
 import { t as e } from "./rasterization-CFogVB3B.js";
 import { t } from "./rectangle-DKnrAmKs.js";
 import { t as n } from "./layoutResult-D50MSHXR.js";
-import { t as r } from "./renderCanvas2D-yJ1IrDcX.js";
+import { t as r } from "./renderCanvas2D-DtcJjqpB.js";
 //#region ../core/src/rendering/canvas2d/rasterExport.js
 async function i(e) {
 	let t = e.mimeType ?? "image/png";

package/dist/{rasterExport-IAbJwi8F.js → rasterExport-DEr8fOLm.js}

@@ -1,7 +1,7 @@
 import { t as e } from "./rasterization-CFogVB3B.js";
 import { t } from "./rectangle-DKnrAmKs.js";
 import { t as n } from "./layoutResult-D50MSHXR.js";
-import { t as r } from "./renderCanvas2D-BJ93Ptqj.js";
+import { t as r } from "./renderCanvas2D-DxturTEW.js";
 //#region ../core/src/rendering/canvas2d/rasterExport.js
 async function i(e) {
 	let t = e.mimeType ?? "image/png";

package/dist/{renderCanvas2D-yJ1IrDcX.js → renderCanvas2D-DtcJjqpB.js}

@@ -1,14 +1,14 @@
-import { Kt as e, a as t, o as n, s as r, u as i } from "./clipOptions-D6eh9T-_.js";
+import { Zt as e, a as t, o as n, s as r, u as i } from "./clipOptions-DTMcB_9z.js";
 import { t as a } from "./warning-CpIIpk8e.js";
 import { n as o } from "./layoutResult-D50MSHXR.js";
 import { n as s } from "./performanceProfiler-CPLEjApa.js";
-import { D as c, E as l, M as u, O as d, S as f, T as p, _ as m, a as h, b as g, c as _, d as v, f as y, g as b, h as x, i as S, j as C, k as w, l as T, m as E, n as D, o as O, p as k, r as A, s as j, t as M, u as N, v as P } from "./nativeText-D9SoxpaD.js";
+import { A as c, C as l, D as u, E as d, M as f, N as p, O as m, _ as h, a as g, c as _, d as v, f as y, g as b, h as x, i as S, k as C, l as w, m as ee, n as T, o as E, p as D, r as O, s as k, t as A, u as j, v as M, x as N, y as P } from "./order-DvY7KNcu.js";
 //#region ../core/src/rendering/canvas2d/renderers/arrow.js
 function F(e, t) {
 	let n = e, r = t.context, i = n.encoders, a = P(n);
 	r.lineJoin = "miter";
 	let o, s;
-	return g(n, a, t, (e) => {
+	return N(n, a, t, (e) => {
 		e.headShapeFallback && t.warn(`Canvas2D rendered unsupported arrow headShape "${a.headShape}" as a triangle.`), r.beginPath();
 		for (let t of e.boundaryLoops) {
 			let e = t[0];
@@ -16,41 +16,41 @@ function F(e, t) {
 			for (let e = 1; e < t.length; e++) r.lineTo(t[e].x, t[e].y);
 			r.closePath();
 		}
-		let n = l(i.fill(e.datum)), c = f(i.fillOpacity, e.datum) * t.viewOpacity;
+		let n = u(i.fill(e.datum)), c = l(i.fillOpacity, e.datum) * t.viewOpacity;
 		n != "none" && c > 0 && (o != n && (r.fillStyle = n, o = n), r.globalAlpha = c, r.fill());
-		let u = l(i.stroke(e.datum)), d = f(i.strokeOpacity, e.datum) * t.viewOpacity;
-		u != "none" && d > 0 && e.strokeWidth > 0 && (s != u && (r.strokeStyle = u, s = u), r.globalAlpha = d, r.lineWidth = e.strokeWidth, r.stroke());
+		let d = u(i.stroke(e.datum)), f = l(i.strokeOpacity, e.datum) * t.viewOpacity;
+		d != "none" && f > 0 && e.strokeWidth > 0 && (s != d && (r.strokeStyle = d, s = d), r.globalAlpha = f, r.lineWidth = e.strokeWidth, r.stroke());
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/link.js
 function I(t, n) {
-	let r = t, i = n.context, a = r.encoders, o = k(r), s = b(r, o.shape);
+	let r = t, i = n.context, a = r.encoders, o = ee(r), s = M(r, o.shape, n.secondOrderPass);
 	i.lineCap = "butt";
 	let c;
-	return E(r, o, n, (t) => {
-		let r = l(a.color(t.datum)), o = f(a.opacity, t.datum) * n.viewOpacity;
+	return x(r, o, n, (t) => {
+		let r = u(a.color(t.datum)), o = l(a.opacity, t.datum) * n.viewOpacity;
 		if (r == "none" || o <= 0 || t.strokeWidth <= 0) return;
-		let u = s(t.datum), d = u && m(t.points[0], t.points[3], u);
+		let d = s && h(t.points[0], t.points[3], s);
 		if (d) {
 			let { normalX: t, normalY: n, offset: a, start: o, end: s } = d, l = i.createLinearGradient(t * (a - s), n * (a - s), t * (a + s), n * (a + s)), u = e(r), f = u.opacity;
-			for (let e of x(o, s)) u.opacity = f * e.opacity, l.addColorStop(e.offset, u.formatRgb());
+			for (let e of b(o, s)) u.opacity = f * e.opacity, l.addColorStop(e.offset, u.formatRgb());
 			i.strokeStyle = l, c = void 0;
 		} else c != r && (i.strokeStyle = r, c = r);
 		i.globalAlpha = o, i.lineWidth = t.strokeWidth;
-		let [p, h, g, _] = t.points;
-		i.beginPath(), i.moveTo(p[0], p[1]), i.bezierCurveTo(h[0], h[1], g[0], g[1], _[0], _[1]), i.stroke();
+		let [f, p, m, g] = t.points;
+		i.beginPath(), i.moveTo(f[0], f[1]), i.bezierCurveTo(p[0], p[1], m[0], m[1], g[0], g[1]), i.stroke();
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/point.js
 function L(e, t) {
 	let n = e;
-	p(n, n.properties.fillGradientStrength) && t.warn("Canvas2D ignored unsupported point property fillGradientStrength."), n.properties.geometricZoomBound && t.warn("Canvas2D ignored unsupported point property geometricZoomBound.");
-	let r = v(n), i = t.context, a = n.encoders, o, s;
-	return y(n, r, t, (e) => {
-		let n = e.datum, r = e.lineShape, c = l(a.fill(n)), u = f(a.fillOpacity, n) * t.viewOpacity, d = l(a.stroke(n)), p = f(a.strokeOpacity, n) * t.viewOpacity;
-		r && (d == "none" || p <= 0) && (d = c, p = u), i.beginPath();
+	d(n, n.properties.fillGradientStrength) && t.warn("Canvas2D ignored unsupported point property fillGradientStrength."), n.properties.geometricZoomBound && t.warn("Canvas2D ignored unsupported point property geometricZoomBound.");
+	let r = y(n), i = t.context, a = n.encoders, o, s;
+	return D(n, r, t, (e) => {
+		let n = e.datum, r = e.lineShape, c = u(a.fill(n)), d = l(a.fillOpacity, n) * t.viewOpacity, f = u(a.stroke(n)), p = l(a.strokeOpacity, n) * t.viewOpacity;
+		r && (f == "none" || p <= 0) && (f = c, p = d), i.beginPath();
 		let m = e.angle != 0 && e.shape != "circle";
 		m && (i.save(), i.translate(e.x, e.y), i.rotate(e.angle * Math.PI / 180));
 		let h = m ? 0 : e.x, g = m ? 0 : e.y, _ = !0;
@@ -58,8 +58,8 @@ function L(e, t) {
 		else if (e.shape == "square") {
 			let t = e.geometryRadius * 2;
 			i.rect(h - e.geometryRadius, g - e.geometryRadius, t, t);
-		} else _ = N(e.shape, h, g, e.geometryRadius, i);
-		m && i.restore(), _ || (t.warn(`Canvas2D rendered unsupported point shape "${e.shape}" as a circle.`), i.arc(e.x, e.y, e.geometryRadius, 0, Math.PI * 2)), !r && c != "none" && u > 0 && (o != c && (i.fillStyle = c, o = c), R(i, u), i.fill()), d != "none" && p > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), s != d && (i.strokeStyle = d, s = d), R(i, p), z(i, e.strokeWidth), i.stroke());
+		} else _ = v(e.shape, h, g, e.geometryRadius, i);
+		m && i.restore(), _ || (t.warn(`Canvas2D rendered unsupported point shape "${e.shape}" as a circle.`), i.arc(e.x, e.y, e.geometryRadius, 0, Math.PI * 2)), !r && c != "none" && d > 0 && (o != c && (i.fillStyle = c, o = c), R(i, d), i.fill()), f != "none" && p > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), s != f && (i.strokeStyle = f, s = f), R(i, p), z(i, e.strokeWidth), i.stroke());
 	});
 }
 function R(e, t) {
@@ -71,20 +71,20 @@ function z(e, t) {
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/rect.js
 function B(e, t) {
-	let n = e, r = _(n);
+	let n = e, r = w(n);
 	r.hatch != "none" && t.warn("Canvas2D ignored unsupported rect hatch.");
 	let i = t.start ?? 0;
 	if (i === (t.end ?? t.data.length)) return 0;
-	let a = t.context, o = n.encoders, s, c, u = [
+	let a = t.context, o = n.encoders, s, c, d = [
 		0,
 		0,
 		0,
 		0
-	], d = o.stroke.constant, p = o.strokeOpacity.constant, m = d ? l(o.stroke(t.data[i])) : "none", h = d && m == "none", g = !h && p ? f(o.strokeOpacity, t.data[i]) : 0;
-	return T(n, r, t, (e) => {
-		r.shadow.opacity > 0 && V(e, r.shadow, t, u);
-		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, _ = d ? m : l(o.stroke(e.datum)), v = (p ? g : f(o.strokeOpacity, e.datum)) * t.viewOpacity * n, y = !h && _ != "none" && v > 0 && e.strokeWidth > 0, b = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
-		b && (i || y) && (u[0] = e.radii.topLeft, u[1] = e.radii.topRight, u[2] = e.radii.bottomRight, u[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, u)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), H(a, e.fillOpacity * n), b ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), y && (c != _ && (a.strokeStyle = _, c = _), H(a, v), U(a, e.strokeWidth), b ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
+	], f = o.stroke.constant, p = o.strokeOpacity.constant, m = f ? u(o.stroke(t.data[i])) : "none", h = f && m == "none", g = !h && p ? l(o.strokeOpacity, t.data[i]) : 0;
+	return j(n, r, t, (e) => {
+		r.shadow.opacity > 0 && V(e, r.shadow, t, d);
+		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, _ = f ? m : u(o.stroke(e.datum)), v = (p ? g : l(o.strokeOpacity, e.datum)) * t.viewOpacity * n, y = !h && _ != "none" && v > 0 && e.strokeWidth > 0, b = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
+		b && (i || y) && (d[0] = e.radii.topLeft, d[1] = e.radii.topRight, d[2] = e.radii.bottomRight, d[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, d)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), H(a, e.fillOpacity * n), b ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), y && (c != _ && (a.strokeStyle = _, c = _), H(a, v), U(a, e.strokeWidth), b ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
 	});
 }
 function V(e, t, n, r) {
@@ -106,31 +106,31 @@ function U(e, t) {
 //#region ../core/src/rendering/canvas2d/renderers/rule.js
 function W(e, t) {
 	let n = e, r = t.context, i = n.encoders;
-	r.lineCap = p(n, n.properties.strokeCap), r.setLineDash(p(n, n.properties.strokeDash) ?? []), r.lineDashOffset = p(n, n.properties.strokeDashOffset);
+	r.lineCap = d(n, n.properties.strokeCap), r.setLineDash(d(n, n.properties.strokeDash) ?? []), r.lineDashOffset = d(n, n.properties.strokeDashOffset);
 	let a;
-	return j(n, O(n), t, (e) => {
-		let n = l(i.color(e.datum)), o = f(i.opacity, e.datum) * t.viewOpacity;
+	return _(n, k(n), t, (e) => {
+		let n = u(i.color(e.datum)), o = l(i.opacity, e.datum) * t.viewOpacity;
 		n == "none" || o <= 0 || e.strokeWidth <= 0 || (a != n && (r.strokeStyle = n, a = n), r.globalAlpha = o, r.lineWidth = e.strokeWidth, r.beginPath(), r.moveTo(e.x1, e.y1), r.lineTo(e.x2, e.y2), r.stroke());
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/text.js
 function G(e, t) {
-	let n = e, r = n.properties, i = S(n), a = t.context, o = n.encoders, s = M(r.font), c = `${r.fontStyle ?? "normal"} ${A(r.fontWeight ?? "normal")} `, u = i.baseline == "baseline" ? "alphabetic" : i.baseline;
+	let n = e, r = n.properties, i = g(n), a = t.context, o = n.encoders, s = T(r.font), c = `${r.fontStyle ?? "normal"} ${S(r.fontWeight ?? "normal")} `, f = i.baseline == "baseline" ? "alphabetic" : i.baseline;
 	[
 		r.viewportEdgeFadeWidthTop,
 		r.viewportEdgeFadeWidthRight,
 		r.viewportEdgeFadeWidthBottom,
 		r.viewportEdgeFadeWidthLeft
-	].some((e) => p(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
-	let d, m;
-	return i.logoLetters || (a.textAlign = i.align, a.textBaseline = u), h(n, i, t, (e) => {
+	].some((e) => d(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
+	let p, m;
+	return i.logoLetters || (a.textAlign = i.align, a.textBaseline = f), E(n, i, t, (e) => {
 		e.multiCharacterLogo && t.warn("Canvas2D stretches multi-character logo text as a single glyph cell.");
-		let n = l(o.color(e.datum)), r = f(o.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
-		if (!(n == "none" || r <= 0)) if (d != n && (a.fillStyle = n, d = n), a.globalAlpha = r, m != e.size && (a.font = `${c}${e.size}px ${s}`, m = e.size), e.logoScale) {
+		let n = u(o.color(e.datum)), r = l(o.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
+		if (!(n == "none" || r <= 0)) if (p != n && (a.fillStyle = n, p = n), a.globalAlpha = r, m != e.size && (a.font = `${c}${e.size}px ${s}`, m = e.size), e.logoScale) {
 			a.save(), a.translate(e.x, e.y), a.rotate(e.angle * Math.PI / 180), a.translate(e.dx, e.dy);
 			let t = a.measureText(e.text).width;
-			a.scale(e.logoScale.width / t, e.logoScale.heightScale), a.textAlign = "center", a.textBaseline = "alphabetic", a.fillText(e.text, 0, D("middle", 1)), a.restore();
+			a.scale(e.logoScale.width / t, e.logoScale.heightScale), a.textAlign = "center", a.textBaseline = "alphabetic", a.fillText(e.text, 0, O("middle", 1)), a.restore();
 		} else e.angle ? (a.save(), a.translate(e.x, e.y), a.rotate(e.angle * Math.PI / 180), a.fillText(e.text, e.dx, e.dy, e.width), a.restore()) : a.fillText(e.text, e.x + e.dx, e.y + e.dy, e.width);
 	});
 }
@@ -153,7 +153,7 @@ var J = 8, Y = 16777216, X = class extends o {
 	#n = /* @__PURE__ */ new WeakMap();
 	#r;
 	#i;
-	#a = new C();
+	#a = new f();
 	#o;
 	#s = [0, 0];
 	#c;
@@ -214,28 +214,35 @@ var J = 8, Y = 16777216, X = class extends o {
 			this.#i?.addCount("canvasCulledSampleFacetOccurrences");
 			return;
 		}
-		let s = this.currentCoords, l = n(t), f = r(l, e.properties.clip, s), p = d(this.width, this.height, f);
-		if (!w(p)) return;
-		let m = c(s, l, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, g = this.context;
-		if (g.save(), f) {
-			let e = f.rect.flatten(), t = f.clipX ? e.x : 0, n = f.clipY ? e.y : 0, r = f.clipX ? e.width : this.width, i = f.clipY ? e.height : this.height;
+		let s = this.currentCoords, l = n(t), u = r(l, e.properties.clip, s), d = C(this.width, this.height, u);
+		if (!c(d)) return;
+		let f = m(s, l, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, g = this.context;
+		if (g.save(), u) {
+			let e = u.rect.flatten(), t = u.clipX ? e.x : 0, n = u.clipY ? e.y : 0, r = u.clipX ? e.width : this.width, i = u.clipY ? e.height : this.height;
 			g.beginPath(), g.rect(t, n, r, i), g.clip();
 		}
 		try {
-			u(e, t, s, this.#a, (t, n) => {
-				let r = 0, i = n.length;
-				return h && this.#o.query(n, this.#s) && (r = this.#s[0], i = this.#s[1]), K(e, {
+			let n = e.getOrder?.(), r = n && n.isActive();
+			p(e, t, s, this.#a, (t, i) => {
+				let o = 0, s = i.length;
+				h && this.#o.query(i, this.#s) && (o = this.#s[0], s = this.#s[1]);
+				let c = (n, r, i, o = !1) => K(e, {
 					context: g,
 					devicePixelRatio: this.devicePixelRatio,
 					coords: t,
 					data: n,
+					secondOrderPass: o,
 					start: r,
 					end: i,
-					visibleBounds: p,
-					anchorCullBounds: m,
+					visibleBounds: d,
+					anchorCullBounds: f,
 					viewOpacity: 1,
 					warn: (t) => a(`${t} View: ${e.unitView.getPathString()}`)
 				});
+				if (!r) return c(i, o, s);
+				let l = 0, u = A(i, o, s, n.predicate, n.passes);
+				for (let [e, t] of u.entries()) t.length > 0 && (l += c(t, 0, t.length, e === 1));
+				return l;
 			}, (t) => a(`Canvas2D could not resolve sample facet index ${t}. View: ${e.unitView.getPathString()}`));
 		} finally {
 			g.restore();
@@ -269,9 +276,9 @@ function $(e, t, n) {
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderCanvas2D.js
-function ee(e) {
+function te(e) {
 	let t = new X({ picking: !1 }, e);
 	e.layoutResult.collectRenderCommands(t);
 }
 //#endregion
-export { q as n, ee as t };
+export { q as n, te as t };

package/dist/{renderCanvas2D-BJ93Ptqj.js → renderCanvas2D-DxturTEW.js}

@@ -1,14 +1,14 @@
-import { a as e, an as t, m as n, o as r, s as i } from "./clipOptions-H68pJyEZ.js";
+import { a as e, m as t, o as n, s as r, un as i } from "./clipOptions-BWHr3aTa.js";
 import { t as a } from "./warning-CpIIpk8e.js";
 import { n as o } from "./performanceProfiler-CPLEjApa.js";
 import { n as s } from "./layoutResult-D50MSHXR.js";
-import { D as c, E as l, M as u, O as d, S as f, T as p, _ as m, a as h, b as g, c as _, d as v, f as y, g as b, h as x, i as S, j as C, k as w, l as T, m as E, n as D, o as O, p as k, r as A, s as j, t as M, u as N, v as P } from "./nativeText-DAjvkrzc.js";
+import { A as c, C as l, D as u, E as d, M as f, N as p, O as m, _ as h, a as g, c as _, d as v, f as y, g as b, h as x, i as S, k as C, l as w, m as ee, n as T, o as E, p as D, r as O, s as k, t as A, u as j, v as M, x as N, y as P } from "./order-C5CzA37O.js";
 //#region ../core/src/rendering/canvas2d/renderers/arrow.js
 function F(e, t) {
 	let n = e, r = t.context, i = n.encoders, a = P(n);
 	r.lineJoin = "miter";
 	let o, s;
-	return g(n, a, t, (e) => {
+	return N(n, a, t, (e) => {
 		e.headShapeFallback && t.warn(`Canvas2D rendered unsupported arrow headShape "${a.headShape}" as a triangle.`), r.beginPath();
 		for (let t of e.boundaryLoops) {
 			let e = t[0];
@@ -16,41 +16,41 @@ function F(e, t) {
 			for (let e = 1; e < t.length; e++) r.lineTo(t[e].x, t[e].y);
 			r.closePath();
 		}
-		let n = l(i.fill(e.datum)), c = f(i.fillOpacity, e.datum) * t.viewOpacity;
+		let n = u(i.fill(e.datum)), c = l(i.fillOpacity, e.datum) * t.viewOpacity;
 		n != "none" && c > 0 && (o != n && (r.fillStyle = n, o = n), r.globalAlpha = c, r.fill());
-		let u = l(i.stroke(e.datum)), d = f(i.strokeOpacity, e.datum) * t.viewOpacity;
-		u != "none" && d > 0 && e.strokeWidth > 0 && (s != u && (r.strokeStyle = u, s = u), r.globalAlpha = d, r.lineWidth = e.strokeWidth, r.stroke());
+		let d = u(i.stroke(e.datum)), f = l(i.strokeOpacity, e.datum) * t.viewOpacity;
+		d != "none" && f > 0 && e.strokeWidth > 0 && (s != d && (r.strokeStyle = d, s = d), r.globalAlpha = f, r.lineWidth = e.strokeWidth, r.stroke());
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/link.js
-function I(e, t) {
-	let r = e, i = t.context, a = r.encoders, o = k(r), s = b(r, o.shape);
+function I(e, n) {
+	let r = e, i = n.context, a = r.encoders, o = ee(r), s = M(r, o.shape, n.secondOrderPass);
 	i.lineCap = "butt";
 	let c;
-	return E(r, o, t, (e) => {
-		let r = l(a.color(e.datum)), o = f(a.opacity, e.datum) * t.viewOpacity;
+	return x(r, o, n, (e) => {
+		let r = u(a.color(e.datum)), o = l(a.opacity, e.datum) * n.viewOpacity;
 		if (r == "none" || o <= 0 || e.strokeWidth <= 0) return;
-		let u = s(e.datum), d = u && m(e.points[0], e.points[3], u);
+		let d = s && h(e.points[0], e.points[3], s);
 		if (d) {
-			let { normalX: e, normalY: t, offset: a, start: o, end: s } = d, l = i.createLinearGradient(e * (a - s), t * (a - s), e * (a + s), t * (a + s)), u = n(r), f = u.opacity;
-			for (let e of x(o, s)) u.opacity = f * e.opacity, l.addColorStop(e.offset, u.formatRgb());
+			let { normalX: e, normalY: n, offset: a, start: o, end: s } = d, l = i.createLinearGradient(e * (a - s), n * (a - s), e * (a + s), n * (a + s)), u = t(r), f = u.opacity;
+			for (let e of b(o, s)) u.opacity = f * e.opacity, l.addColorStop(e.offset, u.formatRgb());
 			i.strokeStyle = l, c = void 0;
 		} else c != r && (i.strokeStyle = r, c = r);
 		i.globalAlpha = o, i.lineWidth = e.strokeWidth;
-		let [p, h, g, _] = e.points;
-		i.beginPath(), i.moveTo(p[0], p[1]), i.bezierCurveTo(h[0], h[1], g[0], g[1], _[0], _[1]), i.stroke();
+		let [f, p, m, g] = e.points;
+		i.beginPath(), i.moveTo(f[0], f[1]), i.bezierCurveTo(p[0], p[1], m[0], m[1], g[0], g[1]), i.stroke();
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/point.js
 function L(e, t) {
 	let n = e;
-	p(n, n.properties.fillGradientStrength) && t.warn("Canvas2D ignored unsupported point property fillGradientStrength."), n.properties.geometricZoomBound && t.warn("Canvas2D ignored unsupported point property geometricZoomBound.");
-	let r = v(n), i = t.context, a = n.encoders, o, s;
-	return y(n, r, t, (e) => {
-		let n = e.datum, r = e.lineShape, c = l(a.fill(n)), u = f(a.fillOpacity, n) * t.viewOpacity, d = l(a.stroke(n)), p = f(a.strokeOpacity, n) * t.viewOpacity;
-		r && (d == "none" || p <= 0) && (d = c, p = u), i.beginPath();
+	d(n, n.properties.fillGradientStrength) && t.warn("Canvas2D ignored unsupported point property fillGradientStrength."), n.properties.geometricZoomBound && t.warn("Canvas2D ignored unsupported point property geometricZoomBound.");
+	let r = y(n), i = t.context, a = n.encoders, o, s;
+	return D(n, r, t, (e) => {
+		let n = e.datum, r = e.lineShape, c = u(a.fill(n)), d = l(a.fillOpacity, n) * t.viewOpacity, f = u(a.stroke(n)), p = l(a.strokeOpacity, n) * t.viewOpacity;
+		r && (f == "none" || p <= 0) && (f = c, p = d), i.beginPath();
 		let m = e.angle != 0 && e.shape != "circle";
 		m && (i.save(), i.translate(e.x, e.y), i.rotate(e.angle * Math.PI / 180));
 		let h = m ? 0 : e.x, g = m ? 0 : e.y, _ = !0;
@@ -58,8 +58,8 @@ function L(e, t) {
 		else if (e.shape == "square") {
 			let t = e.geometryRadius * 2;
 			i.rect(h - e.geometryRadius, g - e.geometryRadius, t, t);
-		} else _ = N(e.shape, h, g, e.geometryRadius, i);
-		m && i.restore(), _ || (t.warn(`Canvas2D rendered unsupported point shape "${e.shape}" as a circle.`), i.arc(e.x, e.y, e.geometryRadius, 0, Math.PI * 2)), !r && c != "none" && u > 0 && (o != c && (i.fillStyle = c, o = c), R(i, u), i.fill()), d != "none" && p > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), s != d && (i.strokeStyle = d, s = d), R(i, p), z(i, e.strokeWidth), i.stroke());
+		} else _ = v(e.shape, h, g, e.geometryRadius, i);
+		m && i.restore(), _ || (t.warn(`Canvas2D rendered unsupported point shape "${e.shape}" as a circle.`), i.arc(e.x, e.y, e.geometryRadius, 0, Math.PI * 2)), !r && c != "none" && d > 0 && (o != c && (i.fillStyle = c, o = c), R(i, d), i.fill()), f != "none" && p > 0 && e.strokeWidth > 0 && (r && i.lineCap != "butt" && (i.lineCap = "butt"), s != f && (i.strokeStyle = f, s = f), R(i, p), z(i, e.strokeWidth), i.stroke());
 	});
 }
 function R(e, t) {
@@ -71,20 +71,20 @@ function z(e, t) {
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/rect.js
 function B(e, t) {
-	let n = e, r = _(n);
+	let n = e, r = w(n);
 	r.hatch != "none" && t.warn("Canvas2D ignored unsupported rect hatch.");
 	let i = t.start ?? 0;
 	if (i === (t.end ?? t.data.length)) return 0;
-	let a = t.context, o = n.encoders, s, c, u = [
+	let a = t.context, o = n.encoders, s, c, d = [
 		0,
 		0,
 		0,
 		0
-	], d = o.stroke.constant, p = o.strokeOpacity.constant, m = d ? l(o.stroke(t.data[i])) : "none", h = d && m == "none", g = !h && p ? f(o.strokeOpacity, t.data[i]) : 0;
-	return T(n, r, t, (e) => {
-		r.shadow.opacity > 0 && V(e, r.shadow, t, u);
-		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, _ = d ? m : l(o.stroke(e.datum)), v = (p ? g : f(o.strokeOpacity, e.datum)) * t.viewOpacity * n, y = !h && _ != "none" && v > 0 && e.strokeWidth > 0, b = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
-		b && (i || y) && (u[0] = e.radii.topLeft, u[1] = e.radii.topRight, u[2] = e.radii.bottomRight, u[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, u)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), H(a, e.fillOpacity * n), b ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), y && (c != _ && (a.strokeStyle = _, c = _), H(a, v), U(a, e.strokeWidth), b ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
+	], f = o.stroke.constant, p = o.strokeOpacity.constant, m = f ? u(o.stroke(t.data[i])) : "none", h = f && m == "none", g = !h && p ? l(o.strokeOpacity, t.data[i]) : 0;
+	return j(n, r, t, (e) => {
+		r.shadow.opacity > 0 && V(e, r.shadow, t, d);
+		let n = e.opacityFactor, i = e.fill != "none" && e.fillOpacity > 0, _ = f ? m : u(o.stroke(e.datum)), v = (p ? g : l(o.strokeOpacity, e.datum)) * t.viewOpacity * n, y = !h && _ != "none" && v > 0 && e.strokeWidth > 0, b = r.hasCornerRadii && (e.radii.topLeft != 0 || e.radii.topRight != 0 || e.radii.bottomRight != 0 || e.radii.bottomLeft != 0);
+		b && (i || y) && (d[0] = e.radii.topLeft, d[1] = e.radii.topRight, d[2] = e.radii.bottomRight, d[3] = e.radii.bottomLeft, a.beginPath(), a.roundRect(e.x, e.y, e.width, e.height, d)), i && (s != e.fill && (a.fillStyle = e.fill, s = e.fill), H(a, e.fillOpacity * n), b ? a.fill() : a.fillRect(e.x, e.y, e.width, e.height)), y && (c != _ && (a.strokeStyle = _, c = _), H(a, v), U(a, e.strokeWidth), b ? a.stroke() : a.strokeRect(e.x, e.y, e.width, e.height));
 	});
 }
 function V(e, t, n, r) {
@@ -106,31 +106,31 @@ function U(e, t) {
 //#region ../core/src/rendering/canvas2d/renderers/rule.js
 function W(e, t) {
 	let n = e, r = t.context, i = n.encoders;
-	r.lineCap = p(n, n.properties.strokeCap), r.setLineDash(p(n, n.properties.strokeDash) ?? []), r.lineDashOffset = p(n, n.properties.strokeDashOffset);
+	r.lineCap = d(n, n.properties.strokeCap), r.setLineDash(d(n, n.properties.strokeDash) ?? []), r.lineDashOffset = d(n, n.properties.strokeDashOffset);
 	let a;
-	return j(n, O(n), t, (e) => {
-		let n = l(i.color(e.datum)), o = f(i.opacity, e.datum) * t.viewOpacity;
+	return _(n, k(n), t, (e) => {
+		let n = u(i.color(e.datum)), o = l(i.opacity, e.datum) * t.viewOpacity;
 		n == "none" || o <= 0 || e.strokeWidth <= 0 || (a != n && (r.strokeStyle = n, a = n), r.globalAlpha = o, r.lineWidth = e.strokeWidth, r.beginPath(), r.moveTo(e.x1, e.y1), r.lineTo(e.x2, e.y2), r.stroke());
 	});
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderers/text.js
 function G(e, t) {
-	let n = e, r = n.properties, i = S(n), a = t.context, o = n.encoders, s = M(r.font), c = `${r.fontStyle ?? "normal"} ${A(r.fontWeight ?? "normal")} `, u = i.baseline == "baseline" ? "alphabetic" : i.baseline;
+	let n = e, r = n.properties, i = g(n), a = t.context, o = n.encoders, s = T(r.font), c = `${r.fontStyle ?? "normal"} ${S(r.fontWeight ?? "normal")} `, f = i.baseline == "baseline" ? "alphabetic" : i.baseline;
 	[
 		r.viewportEdgeFadeWidthTop,
 		r.viewportEdgeFadeWidthRight,
 		r.viewportEdgeFadeWidthBottom,
 		r.viewportEdgeFadeWidthLeft
-	].some((e) => p(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
-	let d, m;
-	return i.logoLetters || (a.textAlign = i.align, a.textBaseline = u), h(n, i, t, (e) => {
+	].some((e) => d(n, e) > 0) && t.warn("Canvas2D ignored unsupported text viewport edge fading.");
+	let p, m;
+	return i.logoLetters || (a.textAlign = i.align, a.textBaseline = f), E(n, i, t, (e) => {
 		e.multiCharacterLogo && t.warn("Canvas2D stretches multi-character logo text as a single glyph cell.");
-		let n = l(o.color(e.datum)), r = f(o.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
-		if (!(n == "none" || r <= 0)) if (d != n && (a.fillStyle = n, d = n), a.globalAlpha = r, m != e.size && (a.font = `${c}${e.size}px ${s}`, m = e.size), e.logoScale) {
+		let n = u(o.color(e.datum)), r = l(o.opacity, e.datum) * t.viewOpacity * e.fadeOpacity;
+		if (!(n == "none" || r <= 0)) if (p != n && (a.fillStyle = n, p = n), a.globalAlpha = r, m != e.size && (a.font = `${c}${e.size}px ${s}`, m = e.size), e.logoScale) {
 			a.save(), a.translate(e.x, e.y), a.rotate(e.angle * Math.PI / 180), a.translate(e.dx, e.dy);
 			let t = a.measureText(e.text).width;
-			a.scale(e.logoScale.width / t, e.logoScale.heightScale), a.textAlign = "center", a.textBaseline = "alphabetic", a.fillText(e.text, 0, D("middle", 1)), a.restore();
+			a.scale(e.logoScale.width / t, e.logoScale.heightScale), a.textAlign = "center", a.textBaseline = "alphabetic", a.fillText(e.text, 0, O("middle", 1)), a.restore();
 		} else e.angle ? (a.save(), a.translate(e.x, e.y), a.rotate(e.angle * Math.PI / 180), a.fillText(e.text, e.dx, e.dy, e.width), a.restore()) : a.fillText(e.text, e.x + e.dx, e.y + e.dy, e.width);
 	});
 }
@@ -153,7 +153,7 @@ var J = 8, Y = 16777216, X = class extends s {
 	#n = /* @__PURE__ */ new WeakMap();
 	#r;
 	#i;
-	#a = new C();
+	#a = new f();
 	#o;
 	#s = [0, 0];
 	#c;
@@ -206,43 +206,50 @@ var J = 8, Y = 16777216, X = class extends s {
 	}
 	renderMark(e, t) {
 		if (!this.paint || !this.#r(e)) return;
-		let n = this.#n.get(e.unitView);
-		if (n === void 0 && (n = e.unitView.getEffectiveOpacity(), this.#n.set(e.unitView, n)), n <= 0) return;
+		let i = this.#n.get(e.unitView);
+		if (i === void 0 && (i = e.unitView.getEffectiveOpacity(), this.#n.set(e.unitView, i)), i <= 0) return;
 		e.initializeRenderingRevisions(Object.keys(e.properties));
 		let o = t.sampleFacetRenderingOptions;
 		if (o && !e.encoders.facetIndex && (this.#i?.addCount("canvasSampleFacetOccurrences"), !q(o))) {
 			this.#i?.addCount("canvasCulledSampleFacetOccurrences");
 			return;
 		}
-		let s = this.currentCoords, l = r(t), f = i(l, e.properties.clip, s), p = d(this.width, this.height, f);
-		if (!w(p)) return;
-		let m = c(s, l, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, g = this.context;
-		if (g.save(), f) {
-			let e = f.rect.flatten(), t = f.clipX ? e.x : 0, n = f.clipY ? e.y : 0, r = f.clipX ? e.width : this.width, i = f.clipY ? e.height : this.height;
+		let s = this.currentCoords, l = n(t), u = r(l, e.properties.clip, s), d = C(this.width, this.height, u);
+		if (!c(d)) return;
+		let f = m(s, l, e.properties.cullByVisibleRange), h = this.#o?.prepare(e) ?? !1, g = this.context;
+		if (g.save(), u) {
+			let e = u.rect.flatten(), t = u.clipX ? e.x : 0, n = u.clipY ? e.y : 0, r = u.clipX ? e.width : this.width, i = u.clipY ? e.height : this.height;
 			g.beginPath(), g.rect(t, n, r, i), g.clip();
 		}
 		try {
-			u(e, t, s, this.#a, (t, n) => {
-				let r = 0, i = n.length;
-				return h && this.#o.query(n, this.#s) && (r = this.#s[0], i = this.#s[1]), K(e, {
+			let n = e.getOrder?.(), r = n && n.isActive();
+			p(e, t, s, this.#a, (t, i) => {
+				let o = 0, s = i.length;
+				h && this.#o.query(i, this.#s) && (o = this.#s[0], s = this.#s[1]);
+				let c = (n, r, i, o = !1) => K(e, {
 					context: g,
 					devicePixelRatio: this.devicePixelRatio,
 					coords: t,
 					data: n,
+					secondOrderPass: o,
 					start: r,
 					end: i,
-					visibleBounds: p,
-					anchorCullBounds: m,
+					visibleBounds: d,
+					anchorCullBounds: f,
 					viewOpacity: 1,
 					warn: (t) => a(`${t} View: ${e.unitView.getPathString()}`)
 				});
+				if (!r) return c(i, o, s);
+				let l = 0, u = A(i, o, s, n.predicate, n.passes);
+				for (let [e, t] of u.entries()) t.length > 0 && (l += c(t, 0, t.length, e === 1));
+				return l;
 			}, (t) => a(`Canvas2D could not resolve sample facet index ${t}. View: ${e.unitView.getPathString()}`));
 		} finally {
 			g.restore();
 		}
 	}
 	get currentCoords() {
-		let e = t(this.#e);
+		let e = i(this.#e);
 		if (!e) throw Error("No current view in Canvas2D rendering context.");
 		return e.coords;
 	}
@@ -269,9 +276,9 @@ function $(e, t, n) {
 }
 //#endregion
 //#region ../core/src/rendering/canvas2d/renderCanvas2D.js
-function ee(e) {
+function te(e) {
 	let t = new X({ picking: !1 }, e);
 	e.layoutResult.collectRenderCommands(t);
 }
 //#endregion
-export { q as n, ee as t };
+export { q as n, te as t };