@genome-spy/app 0.89.0 → 0.90.0

package/dist/{webgl-CexXSw_I.js → webgl-tdKf9SlZ.js}

@@ -1,6 +1,6 @@
-import { A as e, E as t, H as n, L as r, Nt as i, Qt as a, Tn as o, Tt as s, Xt as c, Yt as l, Zt as u, _n as d, _t as f, b as p, ct as m, d as h, en as g, et as _, gt as v, hn as y, ht as b, it as x, jt as ee, n as S, o as te, ot as C, pn as ne, pt as re, s as ie, ut as ae, vt as oe, xn as se, yt as ce, z as le } from "./clipOptions-DBJX_W31.js";
-import { T as ue, b as w, g as de, v as T, x as fe, y as pe } from "./vega-scale-BJaDSHBJ.js";
-import { i as me, n as he, p as ge, r as _e, t as ve } from "./indexer-Cdt_U05k.js";
+import { A as e, E as t, H as n, Jt as r, Kt as i, L as a, Nt as o, Qt as s, Tt as c, Wt as l, _t as u, b as d, cn as f, ct as p, d as m, dn as h, et as g, gt as _, ht as v, it as ee, jt as te, ln as y, n as b, nn as x, o as ne, ot as S, pn as C, pt as re, s as ie, un as ae, ut as oe, vt as se, yt as ce, z as le } from "./clipOptions-B5PibDq3.js";
+import { T as ue, b as w, g as de, v as T, x as fe, y as pe } from "./vega-scale-Ctz_wa3z.js";
+import { i as me, n as he, p as ge, r as _e, t as ve } from "./indexer-En7gpvLN.js";
 import { n as ye, t as be } from "./viewError-BiR9VCgL.js";
 import { t as xe } from "./rectangle-DE98gIxF.js";
 import { n as Se, r as Ce } from "./performanceProfiler-CPLEjApa.js";
@@ -143,8 +143,8 @@ var Ot = [
 	"a_position"
 ];
 function kt(e, t) {
-	let n, r;
-	for (r = 0; r < Ot.length && (n = Ot[r], !(n in t || (n = pt.attribPrefix + n, n in t))); ++r);
+	let n, r = 0;
+	for (; r < Ot.length && (n = Ot[r], !(n in t || (n = pt.attribPrefix + n, n in t))); ++r);
 	r === Ot.length && (n = Object.keys(t)[0]);
 	let i = t[n];
 	if (!i.buffer) return 1;
@@ -672,7 +672,7 @@ function Mr(e) {
 	};
 }
 function Nr(e) {
-	return (e & e - 1) == 0;
+	return !(e & e - 1);
 }
 function Pr(e, t, n, r) {
 	if (!jt(e)) return Nr(t) && Nr(n);
@@ -848,7 +848,8 @@ function Yr(e) {
 	if (typeof document < "u") {
 		let t = document.createElement("a");
 		return t.href = e, t.hostname === location.hostname && t.port === location.port && t.protocol === location.protocol;
-	} else {
+	}
+	{
 		let t = new URL(location.href).origin;
 		return new URL(e, location.href).origin === t;
 	}
@@ -870,7 +871,8 @@ function Zr(e, t, n) {
 			n(null, r), i();
 		};
 		return r.addEventListener("error", a), r.addEventListener("load", o), r.src = e, r;
-	} else if (typeof ImageBitmap < "u") {
+	}
+	if (typeof ImageBitmap < "u") {
 		let i, a, o = function() {
 			n(i, a);
 		}, s = {};
@@ -965,12 +967,13 @@ function ii(e, t, n, r) {
 	let p = jr(l, f), m = n.byteLength / p;
 	if (m % 1) throw "length wrong size for format: " + Mt(e, d);
 	let h;
-	if (i === M || i === N) if (!a && !o && !s) {
-		let e = Math.cbrt(m);
-		if (e % 1 != 0) throw "can't guess cube size of array of numElements: " + m;
-		a = e, o = e, s = e;
-	} else a && (!o || !s) ? (h = Lr(e, i, o, s, m / a), o = h.width, s = h.height) : o && (!a || !s) ? (h = Lr(e, i, a, s, m / o), a = h.width, s = h.height) : (h = Lr(e, i, a, o, m / s), a = h.width, o = h.height);
-	else h = Lr(e, i, a, o, m), a = h.width, o = h.height;
+	if (i === M || i === N) {
+		if (!a && !o && !s) {
+			let e = Math.cbrt(m);
+			if (e % 1 != 0) throw "can't guess cube size of array of numElements: " + m;
+			a = e, o = e, s = e;
+		} else a && (!o || !s) ? (h = Lr(e, i, o, s, m / a), o = h.width, s = h.height) : o && (!a || !s) ? (h = Lr(e, i, a, s, m / o), a = h.width, s = h.height) : (h = Lr(e, i, a, o, m / s), a = h.width, o = h.height);
+	} else h = Lr(e, i, a, o, m), a = h.width, o = h.height;
 	if (zr(e), e.pixelStorei(an, r.unpackAlignment || 1), Rr(e, r), i === j) {
 		let t = p / n.BYTES_PER_ELEMENT, i = m / 6 * t;
 		Kr(e, r).forEach((t) => {
@@ -997,12 +1000,13 @@ function oi(e, t, n) {
 	let r = e.createTexture(), i = t.target || A, a = t.width || 1, o = t.height || 1, s = t.internalFormat || k;
 	e.bindTexture(i, r), i === j && (e.texParameteri(i, Zt, Bt), e.texParameteri(i, Qt, Bt));
 	let c = t.src;
-	if (c) if (typeof c == "function" && (c = c(e, t)), typeof c == "string") ti(e, r, t, n);
-	else if (Nt(c) || Array.isArray(c) && (typeof c[0] == "number" || Array.isArray(c[0]) || Nt(c[0]))) {
-		let n = ii(e, r, c, t);
-		a = n.width, o = n.height;
-	} else Array.isArray(c) && (typeof c[0] == "string" || Qr(c[0])) ? i === j ? ni(e, r, t, n) : ri(e, r, t, n) : (qr(e, r, c, t), a = c.width, o = c.height);
-	else ai(e, r, t);
+	if (c) {
+		if (typeof c == "function" && (c = c(e, t)), typeof c == "string") ti(e, r, t, n);
+		else if (Nt(c) || Array.isArray(c) && (typeof c[0] == "number" || Array.isArray(c[0]) || Nt(c[0]))) {
+			let n = ii(e, r, c, t);
+			a = n.width, o = n.height;
+		} else Array.isArray(c) && (typeof c[0] == "string" || Qr(c[0])) ? i === j ? ni(e, r, t, n) : ri(e, r, t, n) : (qr(e, r, c, t), a = c.width, o = c.height);
+	} else ai(e, r, t);
 	return Wr(t) && Ur(e, r, t, a, o, s), Vr(e, r, t), r;
 }
 function si(e, t, n, r, i, a) {
@@ -1408,16 +1412,18 @@ function La(e, t) {
 }
 function K(e, t) {
 	return function(n) {
-		if (n.value) if (e.disableVertexAttribArray(t), n.value.length === 4) e.vertexAttrib4iv(t, n.value);
-		else throw Error("The length of an integer constant value must be 4!");
-		else e.bindBuffer(di, n.buffer), e.enableVertexAttribArray(t), e.vertexAttribIPointer(t, n.numComponents || n.size, n.type || Ei, n.stride || 0, n.offset || 0), n.divisor !== void 0 && e.vertexAttribDivisor(t, n.divisor);
+		if (n.value) {
+			if (e.disableVertexAttribArray(t), n.value.length === 4) e.vertexAttrib4iv(t, n.value);
+			else throw Error("The length of an integer constant value must be 4!");
+		} else e.bindBuffer(di, n.buffer), e.enableVertexAttribArray(t), e.vertexAttribIPointer(t, n.numComponents || n.size, n.type || Ei, n.stride || 0, n.offset || 0), n.divisor !== void 0 && e.vertexAttribDivisor(t, n.divisor);
 	};
 }
 function Ra(e, t) {
 	return function(n) {
-		if (n.value) if (e.disableVertexAttribArray(t), n.value.length === 4) e.vertexAttrib4uiv(t, n.value);
-		else throw Error("The length of an unsigned integer constant value must be 4!");
-		else e.bindBuffer(di, n.buffer), e.enableVertexAttribArray(t), e.vertexAttribIPointer(t, n.numComponents || n.size, n.type || Xi, n.stride || 0, n.offset || 0), n.divisor !== void 0 && e.vertexAttribDivisor(t, n.divisor);
+		if (n.value) {
+			if (e.disableVertexAttribArray(t), n.value.length === 4) e.vertexAttrib4uiv(t, n.value);
+			else throw Error("The length of an unsigned integer constant value must be 4!");
+		} else e.bindBuffer(di, n.buffer), e.enableVertexAttribArray(t), e.vertexAttribIPointer(t, n.numComponents || n.size, n.type || Xi, n.stride || 0, n.offset || 0), n.divisor !== void 0 && e.vertexAttribDivisor(t, n.divisor);
 	};
 }
 function za(e, t, n) {
@@ -1504,7 +1510,8 @@ function Ua(e, t, n, r) {
 		if (s && (o += i[a++]), a === i.length) {
 			n[c] = t;
 			break;
-		} else {
+		}
+		{
 			let e = i[a++], t = e === "[", s = n[c] || (t ? [] : {});
 			n[c] = s, n = s, r[o] = r[o] || function(e) {
 				return function(t) {
@@ -1598,7 +1605,8 @@ function Ya(e, t, n, r) {
 				i += 4 - r;
 			}
 		};
-	} else return function(t) {
+	}
+	return function(t) {
 		t.length ? e.set(t) : e[0] = t;
 	};
 }
@@ -1736,10 +1744,12 @@ function Fo(e, t, n, r) {
 	};
 	return t.forEach(function(t, a) {
 		let c = t.attachment, l = t.samples, u = t.format, d = t.attachmentPoint || Mo(u, t.internalFormat);
-		if (d ||= To + a, Po(d) && o.push(d), !c) if (l !== void 0 || No(u)) c = e.createRenderbuffer(), e.bindRenderbuffer(X, c), l > 1 ? e.renderbufferStorageMultisample(X, l, u, n, r) : e.renderbufferStorage(X, u, n, r);
-		else {
-			let i = Object.assign({}, t);
-			i.width = n, i.height = r, i.auto === void 0 && (i.auto = !1, i.min = i.min || i.minMag || Ao, i.mag = i.mag || i.minMag || Ao, i.wrapS = i.wrapS || i.wrap || ko, i.wrapT = i.wrapT || i.wrap || ko), c = oi(e, i);
+		if (d ||= To + a, Po(d) && o.push(d), !c) {
+			if (l !== void 0 || No(u)) c = e.createRenderbuffer(), e.bindRenderbuffer(X, c), l > 1 ? e.renderbufferStorageMultisample(X, l, u, n, r) : e.renderbufferStorage(X, u, n, r);
+			else {
+				let i = Object.assign({}, t);
+				i.width = n, i.height = r, i.auto === void 0 && (i.auto = !1, i.min = i.min || i.minMag || Ao, i.mag = i.mag || i.minMag || Ao, i.wrapS = i.wrapS || i.wrap || ko, i.wrapT = i.wrapT || i.wrap || ko), c = oi(e, i);
+			}
 		}
 		if (et(e, c)) e.framebufferRenderbuffer(i, d, X, c);
 		else if (tt(e, c)) t.layer === void 0 ? e.framebufferTexture2D(i, d, t.target || lo, c, t.level || 0) : e.framebufferTextureLayer(i, d, c, t.level || 0, t.layer);
@@ -1831,10 +1841,10 @@ function Wo(e, t) {
 //#endregion
 //#region ../core/src/rendering/webgl/gl/colorUtils.js
 function Go(e, t, n, r, i = !1) {
-	let a = g(e) ? e : e.name, o = !g(e) && e.extent || [0, 1];
-	if (n === void 0 && !g(e) && (n = e.count), a) {
+	let a = C(e) ? e : e.name, o = !C(e) && e.extent || [0, 1];
+	if (n === void 0 && !C(e) && (n = e.count), a) {
 		let e = ue(a);
-		if (u(e)) {
+		if (ae(e)) {
 			let a = Yo(e, {
 				extent: o,
 				count: n,
@@ -1846,12 +1856,13 @@ function Go(e, t, n, r, i = !1) {
 				height: 1,
 				wrap: t.CLAMP_TO_EDGE
 			}, a, r);
-		} else if (l(e)) return Jo(i ? Array.from(e).reverse() : e, t, n, r);
-		else throw Error("Unknown scheme: " + a);
+		}
+		if (f(e)) return Jo(i ? Array.from(e).reverse() : e, t, n, r);
+		throw Error("Unknown scheme: " + a);
 	}
 }
 function Ko(e, t = "rgb", n, r) {
-	let i = Yo(de(e, g(t) ? t : t.type, g(t) ? void 0 : t.gamma));
+	let i = Yo(de(e, C(t) ? t : t.type, C(t) ? void 0 : t.gamma));
 	return Gs(n, {
 		minMag: n.LINEAR,
 		format: n.RGB,
@@ -1878,13 +1889,13 @@ function Jo(e, t, n, r) {
 	}, i, r);
 }
 function Yo(e, { extent: t = [0, 1], reverse: n = !1, count: r = 256 } = {}) {
-	let i = t[0], a = y(t) - i, o = se(r).map((e) => e / (r - 1)).map((e) => i + e / a).map(e);
-	return n && o.reverse(), Xo(o);
+	let a = t[0], o = i(t) - a, c = s(r).map((e) => e / (r - 1)).map((e) => a + e / o).map(e);
+	return n && c.reverse(), Xo(c);
 }
 function Xo(e, t) {
 	let n = Math.max(e.length, t || 0), r = new Uint8Array(n * 3);
 	for (let t = 0; t < n; t++) {
-		let n = e[t % e.length], i = h(n);
+		let n = e[t % e.length], i = m(n);
 		if (!i) throw Error(`Invalid color "${n}" in the scheme ${JSON.stringify(e)}!`);
 		let a = i.rgb();
 		r[t * 3 + 0] = a.r, r[t * 3 + 1] = a.g, r[t * 3 + 2] = a.b;
@@ -1892,7 +1903,7 @@ function Xo(e, t) {
 	return r;
 }
 function Zo(e) {
-	let t = h(e).rgb();
+	let t = m(e).rgb();
 	return [
 		t.r,
 		t.g,
@@ -1921,17 +1932,19 @@ function ds(e, t) {
 }
 function fs(e, t, n) {
 	let r;
-	if (f(e)) r = bs(C(e)(n));
-	else if (g(n)) if (b(e)) r = Cs(n);
-	else throw Error(`String values are not supported on the "${e}" channel: ${n}`);
-	else if (c(n)) r = bs(+!!n);
-	else if (n === null) if (b(e)) r = bs([
-		0,
-		0,
-		0
-	]);
-	else throw Error(`null value is not supported on the "${e}" chanel.`);
-	else r = bs(n);
+	if (u(e)) r = bs(S(e)(n));
+	else if (C(n)) {
+		if (v(e)) r = Cs(n);
+		else throw Error(`String values are not supported on the "${e}" channel: ${n}`);
+	} else if (y(n)) r = bs(+!!n);
+	else if (n === null) {
+		if (v(e)) r = bs([
+			0,
+			0,
+			0
+		]);
+		else throw Error(`null value is not supported on the "${e}" chanel.`);
+	} else r = bs(n);
 	let i = ds(e, t);
 	return {
 		channel: e,
@@ -1945,7 +1958,7 @@ ${r.type} ${i}() {
 }
 function ps(e, t) {
 	let n = "float", r = (e) => e;
-	b(e) ? (n = "vec3", r = (e) => Zo(e)) : f(e) && (r = C(e));
+	v(e) ? (n = "vec3", r = (e) => Zo(e)) : u(e) && (r = S(e));
 	let i = `u${Ms(e)}_${t}`, a = `    // Dynamic value\n    uniform ${n} ${i};`, o = ds(e, t);
 	return {
 		channel: e,
@@ -1988,39 +2001,39 @@ ${r} ${o}() {
 }
 function gs(e, t, n) {
 	t ??= he();
-	let r = ae(e), i = $o + r, o = es + r, { hp: s, attributeType: c } = $(t, e), l = t.domain ? w(t.type) ? ls(t).length : t.domain().length : void 0, u, d = [];
-	d.push(""), d.push("/".repeat(70)), d.push(`// Channel: ${e}`), d.push("");
-	let { transform: f } = cs(t.type), m = (e, ...t) => Ts.apply(null, [
+	let r = oe(e), i = $o + r, a = es + r, { hp: o, attributeType: s } = $(t, e), c = t.domain ? w(t.type) ? ls(t).length : t.domain().length : void 0, l, u = [];
+	u.push(""), u.push("/".repeat(70)), u.push(`// Channel: ${e}`), u.push("");
+	let { transform: f } = cs(t.type), p = (e, ...t) => Ts.apply(null, [
 		e,
 		"value",
 		...t
-	]), h;
+	]), m;
 	switch (f) {
 		case "linear":
-			h = m("scaleLinear", "domain", o);
+			m = p("scaleLinear", "domain", a);
 			break;
 		case "log":
-			h = m("scaleLog", "domain", o, t.base());
+			m = p("scaleLog", "domain", a, t.base());
 			break;
 		case "symlog":
-			h = m("scaleSymlog", "domain", o, t.constant());
+			m = p("scaleSymlog", "domain", a, t.constant());
 			break;
 		case "pow":
 		case "sqrt":
-			h = m("scalePow", "domain", o, t.exponent());
+			m = p("scalePow", "domain", a, t.exponent());
 			break;
 		case "index":
 		case "locus":
-			h = m("scaleBandHp", "domain", o, t.paddingInner(), t.paddingOuter(), t.align(), n.band ?? .5);
+			m = p("scaleBandHp", "domain", a, t.paddingInner(), t.paddingOuter(), t.align(), n.band ?? .5);
 			break;
 		case "point":
 		case "band":
-			h = m("scaleBand", "domain", o, t.paddingInner(), t.paddingOuter(), t.align(), n.band ?? .5);
+			m = p("scaleBand", "domain", a, t.paddingInner(), t.paddingOuter(), t.align(), n.band ?? .5);
 			break;
 		case "ordinal":
 		case "null":
 		case "identity":
-			h = m("scaleIdentity");
+			m = p("scaleIdentity");
 			break;
 		case "threshold":
 		case "quantize": break;
@@ -2029,48 +2042,48 @@ function gs(e, t, n) {
 	let g = Ns(t, e), _;
 	if (g && e == r) {
 		let e = t.props.range ?? [];
-		if (p(e) || e.some(p)) {
+		if (d(e) || e.some(d)) {
 			if (g.length < 1 || g.length > 4) throw Error(`A range with ExprRefs must have 1-4 elements, not ${g.length}! Range: ${JSON.stringify(g)}`);
-			_ = `    uniform ${xs(g.length)} ${o};`;
-		} else if (g.length && g.every(a)) {
+			_ = `    uniform ${xs(g.length)} ${a};`;
+		} else if (g.length && g.every(h)) {
 			let e = ws(g);
-			d.push(`const ${e.type} ${o} = ${e};`);
+			u.push(`const ${e.type} ${a} = ${e};`);
 		}
 	}
-	let v = Ss(e), y;
-	if (b(e)) {
+	let ee = Ss(e), te;
+	if (v(e)) {
 		let n = is + r;
-		if (e == r && d.push(`uniform sampler2D ${n};`), T(t.type)) y = `getInterpolatedColor(${n}, transformed)`;
-		else if (pe(t.type) || w(t.type)) y = `getDiscreteColor(${n}, int(transformed))`;
+		if (e == r && u.push(`uniform sampler2D ${n};`), T(t.type)) te = `getInterpolatedColor(${n}, transformed)`;
+		else if (pe(t.type) || w(t.type)) te = `getDiscreteColor(${n}, int(transformed))`;
 		else throw Error("Problem with color scale!");
 	} else if (t.type === "ordinal" || w(t.type)) {
 		let t = is + r;
-		e == r && d.push(`uniform sampler2D ${t};`), y = `getDiscreteColor(${t}, int(transformed)).r`;
+		e == r && u.push(`uniform sampler2D ${t};`), te = `getDiscreteColor(${t}, int(transformed)).r`;
 	}
-	let x = [], ee = T(t.type) && l > 2, S = w(t.type) || ee;
-	if (x.push("int slot = 0;"), S) {
+	let y = [], b = T(t.type) && c > 2, x = w(t.type) || b;
+	if (y.push("int slot = 0;"), x) {
 		let e = i;
-		x.push(ee ? `while (slot < ${e}.length() - 2 && value >= ${e}[slot + 1]) { slot++; }` : `while (slot < ${e}.length() && value >= ${e}[slot]) { slot++; }`);
+		y.push(b ? `while (slot < ${e}.length() - 2 && value >= ${e}[slot + 1]) { slot++; }` : `while (slot < ${e}.length() && value >= ${e}[slot]) { slot++; }`);
 	}
-	let te = T(t.type) || w(t.type) || ["band", "point"].includes(t.type);
-	if (h) {
+	let ne = T(t.type) || w(t.type) || ["band", "point"].includes(t.type);
+	if (m) {
 		let e = i;
-		te && (s ? x.push(`vec3 domain = ${e};`) : x.push(`vec2 domain = vec2(${e}[slot], ${e}[slot + 1]);`)), x.push(`float transformed = ${h};`), ee && x.push(`transformed = (float(slot) + transformed) / (float(${e}.length() - 1));`);
-	} else x.push("float transformed = float(slot);");
-	"clamp" in t && t.clamp() && x.push(`transformed = clampToRange(transformed, ${ws(g)});`), x.push(`return ${y ?? "transformed"};`), d.push(`
-${v} ${ns}${e}(${c} value) {
-${x.map((e) => `    ${e}\n`).join("")}
+		ne && (o ? y.push(`vec3 domain = ${e};`) : y.push(`vec2 domain = vec2(${e}[slot], ${e}[slot + 1]);`)), y.push(`float transformed = ${m};`), b && y.push(`transformed = (float(slot) + transformed) / (float(${e}.length() - 1));`);
+	} else y.push("float transformed = float(slot);");
+	"clamp" in t && t.clamp() && y.push(`transformed = clampToRange(transformed, ${ws(g)});`), y.push(`return ${te ?? "transformed"};`), u.push(`
+${ee} ${ns}${e}(${s} value) {
+${y.map((e) => `    ${e}\n`).join("")}
 }`);
-	let C = d.join("\n");
-	if (te && e == r) {
-		let e = T(t.type) || w(t.type) ? l : 2;
-		u = s ? `    highp vec3 ${i};` : `    mediump float ${i}[${e}];`;
+	let S = u.join("\n");
+	if (ne && e == r) {
+		let e = T(t.type) || w(t.type) ? c : 2;
+		l = o ? `    highp vec3 ${i};` : `    mediump float ${i}[${e}];`;
 	}
 	return {
-		glsl: C,
+		glsl: S,
 		domainUniformName: i,
-		domainUniform: u,
-		rangeUniformName: o,
+		domainUniform: l,
+		rangeUniformName: a,
 		rangeUniform: _
 	};
 }
@@ -2090,7 +2103,7 @@ function vs(e, t) {
 	return "all" in e ? `(${e.all.map((e) => vs(e, t)).join(" && ")})` : "any" in e ? `(${e.any.map((e) => vs(e, t)).join(" || ")})` : "not" in e ? `(!${vs(e.not, t)})` : "selectionActive" in e ? `(!${ss}${e.selectionActive.param}())` : t?.(e) ?? `isSelectionMember_${e.param}() || (${e.empty} && isSelectionEmpty_${e.param}())`;
 }
 function ys(e) {
-	if (!a(e)) throw Error(`Not a number: ${e}`);
+	if (!h(e)) throw Error(`Not a number: ${e}`);
 	if (e == Infinity) return "3.402823466e+38";
 	if (e == -Infinity) return "-3.402823466e+38";
 	{
@@ -2118,17 +2131,17 @@ function xs(e) {
 	}
 }
 function Ss(e) {
-	return b(e) ? "vec3" : e == "uniqueId" ? "uint" : "float";
+	return v(e) ? "vec3" : e == "uniqueId" ? "uint" : "float";
 }
 function Cs(e) {
 	return bs(Zo(e));
 }
 function ws(e) {
-	return bs([e[0], y(e)]);
+	return bs([e[0], i(e)]);
 }
 function Ts(e, ...t) {
 	let n = [];
-	for (let e of t) a(e) ? n.push(ys(e)) : l(e) ? n.push(bs(e)) : n.push(e);
+	for (let e of t) h(e) ? n.push(ys(e)) : f(e) ? n.push(bs(e)) : n.push(e);
 	return `${e}(${n.join(", ")})`;
 }
 function $(e, t) {
@@ -2155,8 +2168,7 @@ function $(e, t) {
 		largeHp: i
 	});
 }
-var Es = 2 ** 12;
-Es - 1;
+var Es = 4096;
 function Ds(e, t = []) {
 	let n = e % Es;
 	return t[0] = (e - n) / Es, t[1] = n, t;
@@ -2169,7 +2181,7 @@ function ks(e) {
 	return [...Os(e[0]), e[1] - e[0]];
 }
 function As(e) {
-	let t = new o([], JSON.stringify);
+	let t = new x([], JSON.stringify);
 	for (let [n, r] of Object.entries(e)) {
 		let e = r.channelDef;
 		if (ce(e)) {
@@ -2180,12 +2192,12 @@ function As(e) {
 	return t;
 }
 function js(e) {
-	return Qo + ne(e).toSorted().join("_");
+	return Qo + l(e).toSorted().join("_");
 }
 function Ms(e) {
 	return e[0].toUpperCase() + e.slice(1);
 }
-var Ns = (e, t) => fe(e.type) || T(e.type) && b(t) ? [0, 1] : e.range ? e.range() : void 0;
+var Ns = (e, t) => fe(e.type) || T(e.type) && v(t) ? [0, 1] : e.range ? e.range() : void 0;
 function Ps(e, t) {
 	if (e.length != t.length) throw Error("Unequal array lengths");
 	let n = e.length;
@@ -2320,7 +2332,7 @@ var Hs = class {
 		return this._canvasSizeHelper.invalidate(), this.adjustGl();
 	}
 	compileShader(e, t) {
-		l(t) && (t = t.join("\n\n"));
+		f(t) && (t = t.join("\n\n"));
 		let n = this.gl, r = t.replaceAll(/ {2,}|^\s*\/\/.*$/gm, ""), i = this._shaderCache.get(r);
 		if (!i) {
 			let a = [
@@ -2373,19 +2385,20 @@ var Hs = class {
 			return pe(t.type) ? t.domain().length : t.type == "threshold" || t.type == "quantize" ? us(t) : t.type == "quantile" ? e ?? 4 : e;
 		}
 		let i = e.channel;
-		if (b(i)) {
+		if (v(i)) {
 			let t = e.getScale(), i = t.props, a = t.range(), o;
-			if (i.scheme) if (pe(t.type) || w(t.type)) o = Jo(a, this.gl, us(t), n);
-			else {
-				let e = g(i.scheme) ? void 0 : i.scheme.count;
-				e = r(e, t), o = Go(i.scheme, this.gl, e, n, !!i.reverse);
-			}
-			else o = fe(t.type) || T(t.type) && a.length > 1 ? Ko(a, i.interpolate, this.gl, n) : Jo(a, this.gl, w(t.type) ? us(t) : t.domain().length, n);
+			if (i.scheme) {
+				if (pe(t.type) || w(t.type)) o = Jo(a, this.gl, us(t), n);
+				else {
+					let e = C(i.scheme) ? void 0 : i.scheme.count;
+					e = r(e, t), o = Go(i.scheme, this.gl, e, n, !!i.reverse);
+				}
+			} else o = fe(t.type) || T(t.type) && a.length > 1 ? Ko(a, i.interpolate, this.gl, n) : Jo(a, this.gl, w(t.type) ? us(t) : t.domain().length, n);
 			this.rangeTextures.set(t, o), this._ownedTextures.add(o);
 		} else {
 			let t = e.getScale();
 			if (t.type === "ordinal" || w(t.type)) {
-				let e = f(i) ? C(i) : (e) => e, r = qo(t.range().map(e), this.gl, w(t.type) ? us(t) : t.domain().length, n);
+				let e = u(i) ? S(i) : (e) => e, r = qo(t.range().map(e), this.gl, w(t.type) ? us(t) : t.domain().length, n);
 				this.rangeTextures.set(t, r), this._ownedTextures.add(r);
 			}
 		}
@@ -2471,7 +2484,7 @@ var qs = class extends we {
 	#f;
 	constructor(e, t) {
 		if (super(e), this.#i = t.webGLHelper, this.#a = t.markAdapter, this.#r = t.framebufferInfo, this.#u = t.devicePixelRatio, this.#d = t.canvasSize, this.#c = t.markPredicate ?? (() => !0), this.#f = t.pixelOffset, t.clearColor) {
-			let e = h(t.clearColor).rgb();
+			let e = m(t.clearColor).rgb();
 			this.#e = [
 				e.r / 255,
 				e.g / 255,
@@ -2488,7 +2501,7 @@ var qs = class extends we {
 	}
 	renderMark(e, t) {
 		if (!this.#c(e) || this.globalOptions.picking && !e.isPickingParticipant()) return;
-		let n = te(t);
+		let n = ne(t);
 		this.#n.push({
 			mark: e,
 			options: t,
@@ -2548,7 +2561,7 @@ var qs = class extends we {
 			let m, h, g;
 			for (let e of u) {
 				let a = e.coords;
-				(!a.equals(m) || !S(e.clip, h) || !S(e.cullClip, g)) && this.#t.push(r(() => {
+				(!a.equals(m) || !b(e.clip, h) || !b(e.cullClip, g)) && this.#t.push(r(() => {
 					t = c.setViewport(this.#d, this.#u, a, e.clip, e.cullClip, this.#f);
 				}));
 				let { callback: o, orderCallbacks: s } = e, l = s ? () => {
@@ -2788,16 +2801,16 @@ var oc = "flat out lowp vec4 vFillColor;\nflat out lowp vec4 vStrokeColor;\nflat
 		this.dataUpdaters.push((t.arrayReference, (e) => n(r(e))));
 	}
 	createUpdater(e, t, n = Float32Array, r = void 0) {
-		if (!a(this.size)) throw Error("The number of vertices must be defined!");
-		let i, o, s = 0, c = new n(this.size * t);
+		if (!h(this.size)) throw Error("The number of vertices must be defined!");
+		let i, a, o = 0, s = new n(this.size * t);
 		if (this.arrays[e] = {
-			data: c,
+			data: s,
 			numComponents: t
 		}, t == 1) {
 			let e = 0;
 			i = () => {
-				c[s++] = e;
-			}, o = (t) => {
+				s[o++] = e;
+			}, a = (t) => {
 				e = +t;
 			};
 		} else {
@@ -2808,23 +2821,23 @@ var oc = "flat out lowp vec4 vFillColor;\nflat out lowp vec4 vStrokeColor;\nflat
 				case 1: break;
 				case 2:
 					i = () => {
-						c[s++] = e[0], c[s++] = e[1];
-					}, o = n;
+						s[o++] = e[0], s[o++] = e[1];
+					}, a = n;
 					break;
 				case 3:
 					i = () => {
-						c[s++] = e[0], c[s++] = e[1], c[s++] = e[2];
-					}, o = n;
+						s[o++] = e[0], s[o++] = e[1], s[o++] = e[2];
+					}, a = n;
 					break;
 				case 4:
 					i = () => {
-						c[s++] = e[0], c[s++] = e[1], c[s++] = e[2], c[s++] = e[3];
-					}, o = n;
+						s[o++] = e[0], s[o++] = e[1], s[o++] = e[2], s[o++] = e[3];
+					}, a = n;
 					break;
 				default: throw Error("Invalid numComponents: " + t);
 			}
 		}
-		return this.pushers.push(i), o;
+		return this.pushers.push(i), a;
 	}
 	pushAll() {
 		throw Error("Call configure() first!");
@@ -2904,7 +2917,7 @@ function hc(e, t, n, r = n, i = 0, a = i) {
 	c.fill(0);
 	let l = t[0], u = (t[1] - t[0]) / e, d = (t, n) => {
 		let r = (t - l) / u, i = Math.floor(r);
-		return _(n && i == r ? i - 1 : i, 0, e - 1);
+		return g(n && i == r ? i - 1 : i, 0, e - 1);
 	}, f = mc, p = -Infinity, m = !1, h = (e, t, n = [0, 0]) => {
 		let r = d(e, !1), i = d(t, !0), a = s[r], o = Math.max(c[i], a);
 		return n[0] = a, n[1] = o, n;
@@ -2927,8 +2940,8 @@ function hc(e, t, n, r = n, i = 0, a = i) {
 	}
 	if (m) return;
 	for (let e = 1; e < c.length; e++) c[e] < c[e - 1] && (c[e] = c[e - 1]);
-	let g = !0;
-	for (let e = s.length - 1; e > 0; e--) g && s[e] == pc ? (s[e] = c[e], g = !1) : s[e - 1] > s[e] && (s[e - 1] = s[e]);
+	let _ = !0;
+	for (let e = s.length - 1; e > 0; e--) _ && s[e] == pc ? (s[e] = c[e], _ = !1) : s[e - 1] > s[e] && (s[e - 1] = s[e]);
 	return h;
 }
 //#endregion
@@ -2939,33 +2952,35 @@ var gc = class {
 		let r = [...As(e).entries()].filter(([e, t]) => e[1] && t.length > 1).map(([e, t]) => t);
 		this.allocatedVertices = t, this.variableBuilder = new uc(t), this.attributeNames = {};
 		for (let [e, t] of Object.entries(this.variableEncoders)) {
-			let n = m(t);
+			let n = p(t);
 			if (!n) continue;
 			let i = r.find((t) => t.find((t) => t == e)), a = n.asNumberAccessor(), o = t.scale, { largeHp: s, arrayConstructor: c, discrete: l, numComponents: u } = $(o, e), d = [0, 0], f;
-			if (o && l) if ("props" in o && o.props.domainIndexer) f = o.props.domainIndexer;
-			else if ("domain" in o) f = ve(), f.addAll(o.domain());
-			else throw Error("Missing domain indexer for discrete scale.");
-			let p = f ? (e) => f(n(e)) : s ? (e) => Ds(a(e), d) : a, h = js(i ?? e);
+			if (o && l) {
+				if ("props" in o && o.props.domainIndexer) f = o.props.domainIndexer;
+				else if ("domain" in o) f = ve(), f.addAll(o.domain());
+				else throw Error("Missing domain indexer for discrete scale.");
+			}
+			let m = f ? (e) => f(n(e)) : s ? (e) => Ds(a(e), d) : a, h = js(i ?? e);
 			for (let t of i ?? [e]) this.attributeNames[t] = h;
 			i && e != i[0] || this.variableBuilder.addConverter(h, {
-				f: p,
+				f: m,
 				numComponents: u,
 				arrayReference: s ? d : void 0,
 				targetArrayType: c
 			});
 		}
-		let i = this.variableEncoders.x, a = this.variableEncoders.x2, s = this.encoders.x?.channelDef, c = i?.scale;
-		if (s?.buildIndex && i && c && T(c.type)) {
+		let i = this.variableEncoders.x, a = this.variableEncoders.x2, o = this.encoders.x?.channelDef, s = i?.scale;
+		if (o?.buildIndex && i && s && T(s.type)) {
 			let e = this.attributeNames.x;
 			if (!e) throw Error("Missing x attribute for x indexing.");
 			let t = a?.scale && T(a.scale.type) ? this.attributeNames.x2 ?? e : e;
 			this.xIndexConfig = {
-				domain: [c.domain()[0], c.domain()[1]],
+				domain: [s.domain()[0], s.domain()[1]],
 				xAttributeName: e,
 				x2AttributeName: t
 			};
 		} else this.xIndexConfig = void 0;
-		this.lastOffset = 0, this.rangeMap = new o([], JSON.stringify);
+		this.lastOffset = 0, this.rangeMap = new x([], JSON.stringify);
 	}
 	registerBatch(e) {
 		let t = this.lastOffset, n = this.variableBuilder.vertexCount, r = n - t;
@@ -3079,14 +3094,14 @@ var gc = class {
 		return super.toArrays();
 	}
 }, xc = class extends gc {
-	constructor({ encoders: e, attributes: t, fontMetrics: n, properties: r, numCharacters: i = void 0 }) {
+	constructor({ encoders: e, attributes: t, fontMetrics: n, properties: i, numCharacters: a = void 0 }) {
 		super({
 			encoders: e,
 			attributes: t,
-			numVertices: i * 6
-		}), this.metadata = n, this.metrics = n, this.properties = r;
-		let a = e.text.channelDef;
-		this.numberFormat = !s(a) && "format" in a && a.format ? d(a.format) : (e) => e, this.updateVertexCoord = this.variableBuilder.createUpdater("vertexCoord", 2), this.updateTextureCoord = this.variableBuilder.createUpdater("textureCoord", 2), this.updateWidth = this.variableBuilder.createUpdater("width", 1), this.variableBuilder.configure();
+			numVertices: a * 6
+		}), this.metadata = n, this.metrics = n, this.properties = i;
+		let o = e.text.channelDef;
+		this.numberFormat = !c(o) && "format" in o && o.format ? r(o.format) : (e) => e, this.updateVertexCoord = this.variableBuilder.createUpdater("vertexCoord", 2), this.updateTextureCoord = this.variableBuilder.createUpdater("textureCoord", 2), this.updateWidth = this.variableBuilder.createUpdater("width", 1), this.variableBuilder.configure();
 	}
 	addBatch(e, t, n = 0, r = t.length) {
 		let i = this.properties.align || "left", a = this.properties.logoLetters ?? !1, o = this.metadata.common.base, s = this.metadata.common.scaleH, c = -5;
@@ -3097,17 +3112,14 @@ var gc = class {
 			case "middle":
 				c += this.metrics.capHeight / 2;
 				break;
-			case "bottom":
-				c -= this.metrics.descent;
-				break;
-			default:
+			case "bottom": c -= this.metrics.descent;
 		}
 		let l = this.encoders.text, u = [0, 0];
 		this.updateVertexCoord(u);
 		let d = [0, 0];
 		this.updateTextureCoord(d);
 		for (let e = n; e < r; e++) {
-			let n = t[e], r = this.numberFormat(l(n)), f = g(r) ? r : r === null ? "" : "" + r;
+			let n = t[e], r = this.numberFormat(l(n)), f = C(r) ? r : r === null ? "" : "" + r;
 			if (f.length == 0) continue;
 			this.variableBuilder.updateFromDatum(n);
 			let p = a ? f.length : this.metrics.measureWidth(f);
@@ -3117,16 +3129,16 @@ var gc = class {
 				let e = this.metrics.getCharByCode(f.charCodeAt(0));
 				m -= (e.width - e.xadvance) / o / 2;
 			}
-			let h, _, v;
+			let h, g, _;
 			for (let e = 0; e < f.length; e++) {
 				let t = this.metrics.getCharByCode(f.charCodeAt(e)), n = a ? 1 : t.xadvance / o;
 				if (t.id == 32) {
 					m += n;
 					continue;
 				}
-				a ? (v = (t.width + 10) / t.width, m = -v / 2, _ = (t.height + 10) / t.height, h = -.5 - 5 / t.height) : (_ = t.height / o, h = -(t.height + t.yoffset + c) / o, v = t.width / o);
+				a ? (_ = (t.width + 10) / t.width, m = -_ / 2, g = (t.height + 10) / t.height, h = -.5 - 5 / t.height) : (g = t.height / o, h = -(t.height + t.yoffset + c) / o, _ = t.width / o);
 				let r = t.x, i = t.y;
-				u[0] = m, u[1] = h + _, d[0] = r / s, d[1] = i / s, this.variableBuilder.pushAll(), u[0] = m + v, u[1] = h + _, d[0] = (r + t.width) / s, d[1] = i / s, this.variableBuilder.pushAll(), u[0] = m, u[1] = h, d[0] = r / s, d[1] = (i + t.height) / s, this.variableBuilder.pushAll(), u[0] = m + v, u[1] = h + _, d[0] = (r + t.width) / s, d[1] = i / s, this.variableBuilder.pushAll(), u[0] = m, u[1] = h, d[0] = r / s, d[1] = (i + t.height) / s, this.variableBuilder.pushAll(), u[0] = m + v, u[1] = h, d[0] = (r + t.width) / s, d[1] = (i + t.height) / s, this.variableBuilder.pushAll(), m += n;
+				u[0] = m, u[1] = h + g, d[0] = r / s, d[1] = i / s, this.variableBuilder.pushAll(), u[0] = m + _, u[1] = h + g, d[0] = (r + t.width) / s, d[1] = i / s, this.variableBuilder.pushAll(), u[0] = m, u[1] = h, d[0] = r / s, d[1] = (i + t.height) / s, this.variableBuilder.pushAll(), u[0] = m + _, u[1] = h + g, d[0] = (r + t.width) / s, d[1] = i / s, this.variableBuilder.pushAll(), u[0] = m, u[1] = h, d[0] = r / s, d[1] = (i + t.height) / s, this.variableBuilder.pushAll(), u[0] = m + _, u[1] = h, d[0] = (r + t.width) / s, d[1] = (i + t.height) / s, this.variableBuilder.pushAll(), m += n;
 			}
 		}
 		this.registerBatch(e);
@@ -3188,48 +3200,48 @@ var Pc = class {
 		if (this.encoders.facetIndex) return Ac;
 		if (this.unitView.usesSampleFacetRendering()) return kc;
 	}
-	createAndLinkShaders(a, o, c = []) {
-		let l = this.getAttributes(), u = this.encoders, d = this.mark.getOrder(), f = this.getSampleFacetMode(), m = !!this.properties.cullByVisibleRange;
-		f && c.push(`#define ${f}`), m && c.push("#define VISIBLE_RANGE_CULLING");
-		let h = "// view: " + this.unitView.getPathString(), g = [], _ = /* @__PURE__ */ new Set(), y = As(u), b = (e) => {
+	createAndLinkShaders(r, i, s = []) {
+		let l = this.getAttributes(), u = this.encoders, f = this.mark.getOrder(), p = this.getSampleFacetMode(), m = !!this.properties.cullByVisibleRange;
+		p && s.push(`#define ${p}`), m && s.push("#define VISIBLE_RANGE_CULLING");
+		let h = "// view: " + this.unitView.getPathString(), g = [], v = /* @__PURE__ */ new Set(), y = As(u), b = (e) => {
 			for (let [t, n] of y.entries()) if (t[1] && n.includes(e)) return js(n);
 			return js(e);
-		}, S = [], te = e(u), C = new Set(te.flatMap(i));
-		for (let e of d?.params ?? []) C.add(e);
-		Array.from(C).some((e) => {
+		}, x = [], ne = e(u), S = new Set(ne.flatMap(o));
+		for (let e of f?.params ?? []) S.add(e);
+		Array.from(S).some((e) => {
 			let t = this.unitView.paramRuntime.findValue(e);
-			return r(t) && Object.keys(t.intervals).some((e) => $(this.unitView.getScaleResolution(e).getScale(), e).largeHp);
-		}) && (g.push("bool selectionLeq(uvec2 a, uvec2 b) { return a.x < b.x || (a.x == b.x && a.y <= b.y); }"), g.push("bool selectionLt(uvec2 a, uvec2 b) { return a.x < b.x || (a.x == b.x && a.y < b.y); }")), d && (c.push("#define CONDITIONAL_ORDER"), S.push("    // Conditional order pass"), S.push("    uniform int uOrderMode;"));
-		for (let e of C) {
-			let i = this.unitView.paramRuntime, a = i.findValue(e);
-			if (!a) throw Error(`Cannot infer selection type as the parameter "${e}" has no value. Please ensure that the parameter is properly defined!`);
+			return a(t) && Object.keys(t.intervals).some((e) => $(this.unitView.getScaleResolution(e).getScale(), e).largeHp);
+		}) && (g.push("bool selectionLeq(uvec2 a, uvec2 b) { return a.x < b.x || (a.x == b.x && a.y <= b.y); }"), g.push("bool selectionLt(uvec2 a, uvec2 b) { return a.x < b.x || (a.x == b.x && a.y < b.y); }")), f && (s.push("#define CONDITIONAL_ORDER"), x.push("    // Conditional order pass"), x.push("    uniform int uOrderMode;"));
+		for (let e of S) {
+			let r = this.unitView.paramRuntime, i = r.findValue(e);
+			if (!i) throw Error(`Cannot infer selection type as the parameter "${e}" has no value. Please ensure that the parameter is properly defined!`);
 			let o = js("uniqueId");
-			if (n(a)) {
+			if (n(i)) {
 				let n = as + t(e);
-				S.push("    // Selection parameter"), S.push(`    uniform highp uint ${n};`), this.#e.push(() => {
+				x.push("    // Selection parameter"), x.push(`    uniform highp uint ${n};`), this.#e.push(() => {
 					this.registerMarkUniformValue(n, { expr: e }, (e) => e.uniqueId ?? 0);
 				}), g.push(`bool ${os}${e}() {\n    return ${as}${e} != 0u && ${as}${e} == ${o};\n}`), g.push(`bool ${ss}${e}() {\n    return ${as}${e} == 0u;\n}`);
-			} else if (le(a)) {
+			} else if (le(i)) {
 				let n = jc + t(e);
 				g.push(`// Selection texture\nuniform highp usampler2D ${n};`);
-				let r = this.glHelper, s = r.selectionTextures;
+				let a = this.glHelper, s = a.selectionTextures;
 				this.selectionTextureOps.push(() => {
-					let t = i.getValue(e), r = s.get(t);
-					if (!r) throw Error(`Bug: no selection texture found for "${e}"!`);
-					J(this.programInfo, { [n]: r });
+					let t = r.getValue(e), i = s.get(t);
+					if (!i) throw Error(`Bug: no selection texture found for "${e}"!`);
+					J(this.programInfo, { [n]: i });
 				});
 				let c = jc + e;
-				g.push(`bool ${os}${e}() {\n    return hashContainsTexture(${c}, ${o});\n}`), g.push(`bool ${ss}${e}() {\n    return isEmptyHashTexture(${c});\n}`), r.createSelectionTexture(a), i.watchExpression(e, () => {
-					let t = i.getValue(e);
-					r.createSelectionTexture(t), this.unitView.context.animator.requestRender();
+				g.push(`bool ${os}${e}() {\n    return hashContainsTexture(${c}, ${o});\n}`), g.push(`bool ${ss}${e}() {\n    return isEmptyHashTexture(${c});\n}`), a.createSelectionTexture(i), r.watchExpression(e, () => {
+					let t = r.getValue(e);
+					a.createSelectionTexture(t), this.unitView.context.animator.requestRender();
 				});
-			} else if (r(a)) {
-				let n = Object.keys(a.intervals).filter((e) => ["x", "y"].includes(e));
+			} else if (a(i)) {
+				let n = Object.keys(i.intervals).filter((e) => ["x", "y"].includes(e));
 				if (n.length == 0) throw new be(`Interval selection "${e}" has no supported x or y targets.`, this.unitView);
 				let r = [];
 				for (let i of n) {
 					let n = as + t(e) + `_${i}`, { attributeType: a, largeHp: o } = $(this.unitView.getScaleResolution(i).getScale(), i);
-					S.push("    // Selection parameter"), S.push(`    uniform highp ${a}[2] ${n};`), this.#e.push(() => {
+					x.push("    // Selection parameter"), x.push(`    uniform highp ${a}[2] ${n};`), this.#e.push(() => {
 						this.registerMarkUniformValue(n, { expr: e }, (e) => {
 							let t = e.intervals[i] ?? [1, 0];
 							return o ? t.flatMap((e) => Ds(e)) : t;
@@ -3239,9 +3251,9 @@ var Pc = class {
 					r.push(o ? `!selectionLeq(${s}, ${c})` : `${s} > ${c}`);
 				}
 				g.push(`bool ${ss}${e}() {\n    return ${r.join(" || ")};\n}`);
-			} else throw new be(`Unsupported selection type "${a.type}" for WebGL conditional encoding.`, this.unitView);
+			} else throw new be(`Unsupported selection type "${i.type}" for WebGL conditional encoding.`, this.unitView);
 		}
-		let ne = (e) => {
+		let C = (e) => {
 			let { param: t, empty: n } = e;
 			if (e.type !== "interval") return `(${os}${t}() || (${n} && ${ss}${t}()))`;
 			let r = e.projections.map((e) => {
@@ -3251,25 +3263,26 @@ var Pc = class {
 			return `((${i} && ${r.join(" && ")}) || (${n} && !${i}))`;
 		}, ie = (e, t, n, r) => {
 			let i = t.channelDef;
-			if (s(i)) if (p(i.value)) {
-				let { uniformName: t, uniformGlsl: r, accessorGlsl: a, adjuster: o } = ps(e, n);
-				g.push(a), S.push(r), this.#e.push(() => {
-					this.registerMarkUniformValue(t, i.value, o);
-				});
-			} else g.push(fs(e, n, i.value).accessorGlsl);
-			else if (v(i)) {
+			if (c(i)) {
+				if (d(i.value)) {
+					let { uniformName: t, uniformGlsl: r, accessorGlsl: a, adjuster: o } = ps(e, n);
+					g.push(a), x.push(r), this.#e.push(() => {
+						this.registerMarkUniformValue(t, i.value, o);
+					});
+				} else g.push(fs(e, n, i.value).accessorGlsl);
+			} else if (_(i)) {
 				let { uniformName: t, uniformGlsl: a, accessorGlsl: o } = hs(e, r, n);
-				S.push(a), g.push(o);
+				x.push(a), g.push(o);
 				let { largeHp: s, discrete: c } = $(r, e), l = c && "domain" in r ? (e) => r.domain().indexOf(e) : s ? Ds : (e) => +e;
 				this.#e.push(() => {
 					this.registerMarkUniformValue(t, i.datum, l);
 				});
 			} else if (ce(i)) {
 				let t = y.get([i.field, !0]), { attributeGlsl: a, accessorGlsl: o } = ms(e, r, n, t?.includes(e) ? t : void 0);
-				_.add(a), g.push(o);
-			} else if (oe(i)) {
+				v.add(a), g.push(o);
+			} else if (se(i)) {
 				let { attributeGlsl: t, accessorGlsl: i } = ms(e, r, n);
-				_.add(t), g.push(i);
+				v.add(t), g.push(i);
 			} else throw new be(`Unsupported channel definition: ${JSON.stringify(i)}`, this.unitView);
 		};
 		for (let [e, t] of Object.entries(u)) {
@@ -3277,8 +3290,8 @@ var Pc = class {
 			let { branches: n, channelDef: r, scale: i } = t;
 			for (let t = 0; t < n.length; t++) ie(e, n[t].accessor, t, i);
 			if (i) {
-				let t = x(r), n = t && t.resolutionChannel || e, a = re(n) ? this.unitView.getScaleResolution(n) : null, { glsl: o, domainUniform: s, domainUniformName: c, rangeUniform: l, rangeUniformName: u } = gs(e, i, r);
-				g.push(o), S.push(s), S.push(l), l && this.#e.push(() => {
+				let t = ee(r), n = t && t.resolutionChannel || e, a = re(n) ? this.unitView.getScaleResolution(n) : null, { glsl: o, domainUniform: s, domainUniformName: c, rangeUniform: l, rangeUniformName: u } = gs(e, i, r);
+				g.push(o), x.push(s), x.push(l), l && this.#e.push(() => {
 					let t = this.createMarkUniformSetter(u), n = () => t(Ns(i, e));
 					this.registerScaleResolutionListener(a, "range", n), n();
 				}), s && this.#e.push(() => {
@@ -3289,34 +3302,34 @@ var Pc = class {
 					this.registerScaleResolutionListener(a, "domain", t), t();
 				});
 			}
-			g.push(_s(e, n, ne));
+			g.push(_s(e, n, C));
 		}
-		let ae = te.map((e) => vs(ee(e), ne));
-		if (g.push("bool isDatumSelected() {\n" + (this.encoders.uniqueId && ae.length > 0 ? `    return ${ae.join(" || ")};` : "    return false;") + "\n}"), d) {
-			let e = vs(d.predicate.selection, ne);
+		let ae = ne.map((e) => vs(te(e), C));
+		if (g.push("bool isDatumSelected() {\n" + (this.encoders.uniqueId && ae.length > 0 ? `    return ${ae.join(" || ")};` : "    return false;") + "\n}"), f) {
+			let e = vs(f.predicate.selection, C);
 			g.push(`bool isOrderMatch() {
     return ${e};\n}`);
 		}
-		let se = "precision highp float;\nprecision highp int;", ue = (e) => e.replace("#pragma markUniforms", S.join("\n"));
-		c = c.map(ue), a = ue(a), o = ue(o), a = ((e) => Nc(e, d ? "    if (uOrderMode != 0 &&\n        (((uOrderMode & 3) == 1) != isOrderMatch())) {\n        gl_Position = vec4(100.0, 0.0, 0.0, 0.0);\n        return;\n    }" : ""))(a);
+		let oe = "precision highp float;\nprecision highp int;", ue = (e) => e.replace("#pragma markUniforms", x.join("\n"));
+		s = s.map(ue), r = ue(r), i = ue(i), r = ((e) => Nc(e, f ? "    if (uOrderMode != 0 &&\n        (((uOrderMode & 3) == 1) != isOrderMatch())) {\n        gl_Position = vec4(100.0, 0.0, 0.0, 0.0);\n        return;\n    }" : ""))(r);
 		let de = [
-			se,
+			oe,
 			h,
-			...c,
+			...s,
 			Sc,
 			Cc,
-			[..._].join("\n"),
+			[...v].join("\n"),
 			...g,
 			wc,
 			Tc,
-			a
+			r
 		], T = [
-			se,
+			oe,
 			h,
-			...c,
+			...s,
 			Sc,
 			Ec,
-			o
+			i
 		], fe = this.gl;
 		this.programStatus = Ws(fe, this.glHelper.compileShader(fe.VERTEX_SHADER, de), this.glHelper.compileShader(fe.FRAGMENT_SHADER, T));
 	}
@@ -3345,10 +3358,10 @@ var Pc = class {
 	}
 	registerMarkUniformValue(e, t, n = (e) => e) {
 		let r = this.createMarkUniformSetter(e), i = (n) => {
-			if (n == null) throw Error(`Trying to set null/undefined value for uniform: ${e}${p(t) ? `Expr: ${t.expr}` : ""}`);
+			if (n == null) throw Error(`Trying to set null/undefined value for uniform: ${e}${d(t) ? `Expr: ${t.expr}` : ""}`);
 			r(n);
 		};
-		if (p(t)) {
+		if (d(t)) {
 			let e, r = () => i(n(e(null)));
 			e = this.unitView.paramRuntime.watchExpression(t.expr, r), r();
 		} else i(n(t));
@@ -3486,7 +3499,7 @@ var Pc = class {
 			uDevicePixelRatio: t
 		}), $a(this.gl, this.programInfo, this.viewUniformInfo), !0;
 	}
-}, Fc = class extends o {
+}, Fc = class extends x {
 	constructor() {
 		super([], JSON.stringify);
 	}
@@ -3730,7 +3743,7 @@ var Jc = "flat out vec4 vColor;\n\n/** Stroke width */\nflat out float vSize;\n\
 	"ringsLarge"
 ], cl = class extends Pc {
 	get opaque() {
-		return ye(this, "opaque", () => !this.#e() && !this.#t() && !this.properties.shadowOpacity && s(this.encoding.fillOpacity) && this.encoding.fillOpacity.value == 1 && this.properties.minOpacity == 1) && this.unitView.getEffectiveOpacity() == 1;
+		return ye(this, "opaque", () => !this.#e() && !this.#t() && !this.properties.shadowOpacity && c(this.encoding.fillOpacity) && this.encoding.fillOpacity.value == 1 && this.properties.minOpacity == 1) && this.unitView.getEffectiveOpacity() == 1;
 	}
 	getAttributes() {
 		return [
@@ -3757,7 +3770,7 @@ var Jc = "flat out vec4 vColor;\n\n/** Stroke width */\nflat out float vSize;\n\
 	}
 	#t() {
 		let e = this.encoding.strokeWidth;
-		return !(s(e) && !e.value) || "condition" in e;
+		return !(c(e) && !e.value) || "condition" in e;
 	}
 	initializeGraphics() {
 		super.initializeGraphics();
@@ -3925,29 +3938,29 @@ var ml = "in mediump vec2 vertexCoord;\nin lowp vec2 textureCoord;\n\n// Width o
 		}
 		registerMarkUniformVector(e, t) {
 			let n = this.createMarkUniformSetter(e), r = [], i = () => n(r.map((e) => e()));
-			for (let e of t) r.push(p(e) ? this.unitView.paramRuntime.watchExpression(e.expr, i) : () => e);
+			for (let e of t) r.push(d(e) ? this.unitView.paramRuntime.watchExpression(e.expr, i) : () => e);
 			i();
 		}
 		updateGraphicsData(e) {
-			let t = e.getData(), n = this.encoding, r = this.properties, i = p(r.logoLetters) ? this.unitView.paramRuntime.evaluateAndGet(r.logoLetters.expr) : r.logoLetters, a = this.encoders.text, o = 0, s = "format" in n.text ? d(n.text.format) : (e) => e;
+			let t = e.getData(), n = this.encoding, i = this.properties, a = d(i.logoLetters) ? this.unitView.paramRuntime.evaluateAndGet(i.logoLetters.expr) : i.logoLetters, o = this.encoders.text, s = 0, c = "format" in n.text ? r(n.text.format) : (e) => e;
 			for (let e of t) {
-				let t = s(a(e)), n = g(t) ? t : t === null ? "" : "" + t;
-				o += n && n.length || 0;
+				let t = c(o(e)), n = C(t) ? t : t === null ? "" : "" + t;
+				s += n && n.length || 0;
 			}
-			let c = new xc({
+			let l = new xc({
 				encoders: this.encoders,
 				attributes: this.getAttributes(),
 				properties: {
-					align: r.align,
-					baseline: r.baseline,
-					logoLetters: i
+					align: i.align,
+					baseline: i.baseline,
+					logoLetters: a
 				},
 				fontMetrics: this.font.metrics,
-				numCharacters: Math.max(o, _l)
+				numCharacters: Math.max(s, _l)
 			});
-			c.addBatches(e.facetBatches);
-			let l = c.toArrays();
-			this.rangeMap.migrateEntries(l.rangeMap), this.updateBufferInfo(l);
+			l.addBatches(e.facetBatches);
+			let u = l.toArrays();
+			this.rangeMap.migrateEntries(u.rangeMap), this.updateBufferInfo(u);
 		}
 		prepareRender(e) {
 			let t = super.prepareRender(e);
@@ -4101,7 +4114,7 @@ var Sl = class {
 	#l(e) {
 		for (let [t, n] of Object.entries(e.mark.encoders)) {
 			if (!n.scale) continue;
-			let r = x(n.channelDef)?.resolutionChannel ?? t;
+			let r = ee(n.channelDef)?.resolutionChannel ?? t;
 			if (!re(r)) continue;
 			let i = e.mark.unitView.getScaleResolution(r);
 			if (!i || e.scaleResolutions.has(i)) continue;
@@ -4154,11 +4167,11 @@ function Cl({ runs: e, viewRoot: t, layoutResult: n, webGLHelper: r, markAdapter
 				pixelOffset: 0
 			});
 			d.collectRenderCommands(e), e.finish(), e.render();
-			let n = Oe(t.bounds, s, l, u);
-			De(t, n, s, Zs(c, f, "image/png", {
+			let n = Oe(t.bounds, s, l, u), p = Zs(c, f, "image/png", {
 				...n,
 				unpremultiplyAlpha: !0
-			}));
+			});
+			De(t, n, s, p);
 		}
 	} finally {
 		c.bindFramebuffer(c.FRAMEBUFFER, null), c.deleteTexture(f.attachments[0]), c.deleteFramebuffer(f.framebuffer);
@@ -5357,7 +5370,7 @@ var Tl = {
 	weight: 400
 }, Ol = class {
 	constructor(e, t) {
-		this._prepareBitmap = e, this.fontRepository = "https://raw.githubusercontent.com/etiennepinchon/aframe-fonts/master/fonts/", this._fonts = new o([], JSON.stringify), this._metadataPromises = /* @__PURE__ */ new Map(), this._fontPromises = /* @__PURE__ */ new Map(), this._promises = [];
+		this._prepareBitmap = e, this.fontRepository = "https://raw.githubusercontent.com/etiennepinchon/aframe-fonts/master/fonts/", this._fonts = new x([], JSON.stringify), this._metadataPromises = /* @__PURE__ */ new Map(), this._fontPromises = /* @__PURE__ */ new Map(), this._promises = [];
 		let n = t && e?.(t);
 		this._defaultFontEntry = {
 			metrics: fc(Tl),
@@ -5431,7 +5444,7 @@ function kl(e, t, n) {
 	};
 }
 function Al(e) {
-	if (g(e)) {
+	if (C(e)) {
 		let t = El[e.toLowerCase()];
 		if (!t) throw Error("Unknown font weight: " + e);
 		return t;