@genome-spy/app 1.1.1 → 1.2.0

package/dist/{viewSelectors-j-F9XwsE.js → viewSelectors-CbmkSQRT.js}

@@ -1,83 +1,87 @@
-import { $t as e, Ot as t, St as n, Tt as r, V as i, an as a, b as o, cn as s, ft as c, gn as l, k as u, ln as d, o as f, pt as p, t as m, u as ee, un as te, wt as ne, xt as h } from "./clipOptions-Cba4I0AO.js";
-import { a as g, n as re, r as ie, t as _ } from "./viewError-BiR9VCgL.js";
-import { H as ae, m as oe, y as v } from "./vega-scale-Byaw1K8O.js";
-import { t as se } from "./warning-CpIIpk8e.js";
+import { At as e, B as t, Bt as n, Dt as r, It as i, Lt as a, Nt as o, O as s, On as c, Pt as l, Sn as u, _n as d, bn as f, dn as p, ft as m, l as ee, o as te, pt as ne, t as re, xn as ie, y as h } from "./clipOptions-D_wBNhzs.js";
+import { a as g, n as ae, r as oe, t as _ } from "./viewError-IYqyluc7.js";
+import { H as se, m as v, y } from "./vega-scale-BoGHANI7.js";
+import { t as ce } from "./warning-CpIIpk8e.js";
 //#region ../core/src/view/layout/flexLayout.js
-function ce(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {}) {
-	n ||= 0, i ||= 0;
-	let o = ge(e, t, n), s = 0, c = 0;
-	for (let t = 0; t < e.length; t++) s += o[t], S(e[t]) || c++;
-	let l = s + Math.max(0, c - 1) * n, u = r === void 0 ? (e) => e : (e) => Math.round(e * r) / r, d = 0, f = [], p = (e) => {
+function le(e, t, n = {}) {
+	let { sizes: r } = ve(e, t, n.spacing || 0);
+	return b(e, r, t, n);
+}
+function b(e, t, n, { spacing: r, devicePixelRatio: i, offset: a, reverse: o } = {}) {
+	r ||= 0, a ||= 0;
+	let s = 0, c = 0;
+	for (let n = 0; n < e.length; n++) s += t[n], C(e[n]) || c++;
+	let l = s + Math.max(0, c - 1) * r, u = i === void 0 ? (e) => e : (e) => Math.round(e * i) / i, d = 0, f = [], p = (e) => {
 		let t = d;
 		if (!t) return;
-		let r = (e ? n : 0) * (a ? -1 : 1);
-		m -= r;
+		let n = (e ? r : 0) * (o ? -1 : 1);
+		m -= n;
 		for (let e = 0; e < t; e++) f.push({
-			location: m + (e + 1) / (t + 1) * r,
+			location: m + (e + 1) / (t + 1) * n,
 			size: 0
 		});
-		m += r, d = 0;
-	}, m = a ? Math.max(t, l) : 0 + i;
-	if (e.length == 1 && S(e[0])) return [{
+		m += n, d = 0;
+	}, m = o ? Math.max(n, l) : 0 + a;
+	if (e.length == 1 && C(e[0])) return [{
 		location: m,
 		size: 0
 	}];
-	for (let t = 0; t < e.length; t++) {
-		let r = e[t];
-		if (S(r)) d++;
+	for (let n = 0; n < e.length; n++) {
+		let i = e[n];
+		if (C(i)) d++;
 		else {
 			p(f.length > 0);
-			let e = o[t];
-			a && (m -= e), f.push({
+			let e = t[n];
+			o && (m -= e), f.push({
 				location: u(m),
 				size: u(e)
-			}), a ? m -= n : m += e + n;
+			}), o ? m -= r : m += e + r;
 		}
 	}
-	return m += a ? n : -n, p(!1), f;
+	return m += o ? r : -r, p(!1), f;
 }
-function le(e, { spacing: t } = { spacing: 0 }) {
+function ue(e, { spacing: t } = { spacing: 0 }) {
 	let n = 0;
-	for (let r of e) n += E(r) + (S(r) ? 0 : t);
+	for (let r of e) n += E(r) + (C(r) ? 0 : t);
 	return Math.max(0, n - t);
 }
-function ue(e, t, { spacing: n = 0 } = {}) {
+function de(e, t, { spacing: n = 0 } = {}) {
 	let r = [], i = [], a = 0, o = 0;
 	for (let [s, c] of e.entries()) {
-		let e = E(c), l = !S(c), u = o && l ? n : 0;
+		let e = E(c), l = !C(c), u = o && l ? n : 0;
 		i.length && a + u + e > t && (r.push(i), i = [], a = 0, o = 0), i.push(s), a += (o && l ? n : 0) + e, o += +!!l;
 	}
 	return i.length && r.push(i), r;
 }
-function de(e) {
+function fe(e) {
 	let t = 0, n = 0, r = 0, i, a = !0;
 	for (let o of e) {
 		t = Math.max(t, o.px ?? 0), n = Math.max(n, o.grow ?? 0), r = Math.max(r, E(o));
 		let e = D(o);
 		e === void 0 ? a = !1 : i = i === void 0 ? e : Math.max(i, e);
 	}
-	return O({
+	return A({
 		px: t,
 		grow: n,
 		minPx: r,
 		maxPx: a ? i : void 0
 	});
 }
-function fe(e) {
-	let t = {
-		px: 0,
-		grow: 0,
-		minPx: 0,
-		maxPx: 0
-	}, n = !0;
-	for (let r of e) {
-		t.px += C(r.px), t.grow += C(r.grow), t.minPx += E(r);
-		let e = D(r);
-		e === void 0 ? n = !1 : t.maxPx += e;
-	}
-	return n || delete t.maxPx, O(t);
-}
-var y = class e {
+function pe(e, t = 0, n = 0) {
+	let r = Math.max(0, e.length - 1) * t, i = {
+		px: r,
+		grow: e.length ? 0 : n,
+		minPx: r,
+		maxPx: r
+	}, a = e.length > 0;
+	for (let t of e) {
+		i.px += w(t.px), i.grow += w(t.grow), i.minPx += E(t);
+		let e = D(t);
+		e === void 0 ? a = !1 : i.maxPx += e;
+	}
+	return a || delete i.maxPx, A(i);
+}
+var x = class e {
 	constructor(e, t) {
 		this.width = e, this.height = t;
 	}
@@ -88,31 +92,31 @@ var y = class e {
 		return this.#e(-e.width, -e.height);
 	}
 	#e(t, n) {
-		return new e(ye(this.width, t), ye(this.height, n));
+		return new e(k(this.width, t), k(this.height, n));
 	}
 	isGrowing() {
 		return !!(this.width.grow || this.height.grow);
 	}
-}, b = Object.freeze({
+}, me = Object.freeze({
 	px: 0,
 	grow: 0
-}), x = new y(b, b);
-function S(e) {
+}), S = new x(me, me);
+function C(e) {
 	return !e.px && !e.grow && !e.minPx;
 }
-function pe(e, t) {
+function he(e, t) {
 	return !e || !t ? !1 : e.px === t.px && e.grow === t.grow && e.minPx === t.minPx && e.maxPx === t.maxPx;
 }
-function C(e) {
+function w(e) {
 	return e || 0;
 }
-function me(e) {
-	return e && (s(e.px) || s(e.grow) || s(e.minPx) || s(e.maxPx));
+function ge(e) {
+	return e && (f(e.px) || f(e.grow) || f(e.minPx) || f(e.maxPx));
 }
-function he(e) {
-	if (J(e)) throw Error("parseSizeDef does not accept step-based sizes.");
-	if (me(e)) return w(e), O(e);
-	if (s(e)) return {
+function _e(e) {
+	if (q(e)) throw Error("parseSizeDef does not accept step-based sizes.");
+	if (ge(e)) return be(e), A(e);
+	if (f(e)) return {
 		px: e,
 		grow: 0
 	};
@@ -122,80 +126,89 @@ function he(e) {
 	};
 	throw Error(`Invalid sizeDef: ${e}`);
 }
-function ge(e, t, n) {
+function ve(e, t, n = 0) {
 	let r = !1;
-	for (let t of e) w(t), r ||= ve(t);
-	if (!r) return _e(e, t, n);
+	for (let t of e) be(t), r ||= O(t);
+	if (!r) return ye(e, t, n);
 	let i = Array(e.length).fill(0), a = [];
-	for (let t = 0; t < e.length; t++) S(e[t]) || a.push(t);
+	for (let t = 0; t < e.length; t++) C(e[t]) || a.push(t);
 	let o = Math.max(0, a.length - 1) * n, s = Math.max(0, t - o), c = /* @__PURE__ */ new Set();
 	for (let t of a) {
 		let n = e[t];
-		C(n.grow) || (i[t] = T(C(n.px), n), c.add(t));
+		w(n.grow) || (i[t] = T(w(n.px), n), c.add(t));
 	}
+	let l = 0;
 	for (;;) {
 		let t = 0, n = 0, r = 0;
-		for (let o of a) c.has(o) ? r += i[o] : (t += C(e[o].px), n += C(e[o].grow));
+		for (let o of a) c.has(o) ? r += i[o] : (t += w(e[o].px), n += w(e[o].grow));
 		if (!n) {
-			for (let t of a) c.has(t) || (i[t] = T(C(e[t].px), e[t]), c.add(t));
+			for (let t of a) c.has(t) || (i[t] = T(w(e[t].px), e[t]), c.add(t));
 			break;
 		}
-		let o = Math.max(0, s - r - t), l = 0, u = [], d = [];
+		let o = Math.max(0, s - r - t);
+		l = o / n;
+		let u = 0, d = [], f = [];
 		for (let t of a) {
 			if (c.has(t)) continue;
-			let r = e[t], a = C(r.px) + C(r.grow) / n * o, s = T(a, r);
+			let r = e[t], a = w(r.px) + w(r.grow) / n * o, s = T(a, r);
 			i[t] = s;
-			let f = s - a;
-			l += f, f > 0 ? u.push(t) : f < 0 && d.push(t);
+			let l = s - a;
+			u += l, l > 0 ? d.push(t) : l < 0 && f.push(t);
 		}
-		if (!u.length && !d.length) break;
-		if (l > 0) for (let e of u) c.add(e);
-		else if (l < 0) for (let e of d) c.add(e);
+		if (!d.length && !f.length) break;
+		if (u > 0) for (let e of d) c.add(e);
+		else if (u < 0) for (let e of f) c.add(e);
 		else for (let e of a) c.add(e);
 	}
-	return i;
+	return {
+		sizes: i,
+		growth: l
+	};
 }
-function _e(e, t, n) {
+function ye(e, t, n) {
 	let r = 0, i = 0;
-	for (let t of e) r += C(t.px) + (S(t) ? 0 : n), i += C(t.grow);
+	for (let t of e) r += w(t.px) + (C(t) ? 0 : n), i += w(t.grow);
 	r -= n;
 	let a = Math.max(0, t - r), o = Array(e.length);
 	for (let t = 0; t < e.length; t++) {
 		let n = e[t];
-		o[t] = S(n) ? 0 : C(n.px) + (i ? C(n.grow) / i * a : 0);
+		o[t] = C(n) ? 0 : w(n.px) + (i ? w(n.grow) / i * a : 0);
 	}
-	return o;
+	return {
+		sizes: o,
+		growth: i ? a / i : 0
+	};
 }
-function w(e) {
+function be(e) {
 	if (e.minPx !== void 0 && e.maxPx !== void 0 && e.minPx > e.maxPx) throw Error("SizeDef minPx cannot be greater than maxPx.");
 }
 function T(e, t) {
 	return Math.min(Math.max(e, t.minPx ?? 0), t.maxPx ?? Infinity);
 }
 function E(e) {
-	return T(C(e.px), e);
+	return T(w(e.px), e);
 }
 function D(e) {
-	return e.maxPx ?? (C(e.grow) ? void 0 : E(e));
+	return e.maxPx ?? (w(e.grow) ? void 0 : E(e));
 }
-function ve(e) {
+function O(e) {
 	return e.minPx !== void 0 || e.maxPx !== void 0;
 }
-function ye(e, t) {
-	return O({
+function k(e, t) {
+	return A({
 		px: (e.px ?? 0) + t,
 		grow: e.grow,
 		minPx: e.minPx === void 0 ? void 0 : Math.max(0, e.minPx + t),
 		maxPx: e.maxPx === void 0 ? void 0 : Math.max(0, e.maxPx + t)
 	});
 }
-function O(e) {
-	let t = {}, n = e.px !== void 0, r = e.grow !== void 0, i = ve(e);
-	return e.px ? t.px = e.px : e.px === 0 && (t.px = 0), e.grow ? t.grow = e.grow : e.grow === 0 ? t.grow = 0 : !n && !r && i && (t.grow = 1), e.minPx && e.minPx > C(e.px) && (t.minPx = e.minPx), e.maxPx !== void 0 && (C(t.grow) || e.maxPx < C(e.px)) && (t.maxPx = e.maxPx), t;
+function A(e) {
+	let t = {}, n = e.px !== void 0, r = e.grow !== void 0, i = O(e);
+	return e.px ? t.px = e.px : e.px === 0 && (t.px = 0), e.grow ? t.grow = e.grow : e.grow === 0 ? t.grow = 0 : !n && !r && i && (t.grow = 1), e.minPx && e.minPx > w(e.px) && (t.minPx = e.minPx), e.maxPx !== void 0 && (w(t.grow) || e.maxPx < w(e.px)) && (t.maxPx = e.maxPx), t;
 }
 //#endregion
 //#region ../core/src/view/layout/padding.js
-var k = class e {
+var j = class e {
 	constructor(e, t, n, r) {
 		this.top = e || 0, this.right = t || 0, this.bottom = n || 0, this.left = r || 0;
 	}
@@ -230,35 +243,35 @@ var k = class e {
 		return this.top + this.bottom;
 	}
 	static createFromConfig(e) {
-		return typeof e == "number" ? this.createUniformPadding(e) : e ? this.createFromRecord(e) : A;
+		return typeof e == "number" ? this.createUniformPadding(e) : e ? this.createFromRecord(e) : M;
 	}
 	static createFromRecord(t) {
 		return new e(t.top, t.right, t.bottom, t.left);
 	}
 	static zero() {
-		return A;
+		return M;
 	}
 	static createUniformPadding(t) {
 		return new e(t, t, t, t);
 	}
 };
-function be(e, t) {
-	return t ? new k(t.top === !1 ? 0 : e.top, t.right === !1 ? 0 : e.right, t.bottom === !1 ? 0 : e.bottom, t.left === !1 ? 0 : e.left) : e;
+function xe(e, t, n = j.zero()) {
+	return t ? new j(t.top === !1 ? n.top : e.top, t.right === !1 ? n.right : e.right, t.bottom === !1 ? n.bottom : e.bottom, t.left === !1 ? n.left : e.left) : e;
 }
-var A = k.createUniformPadding(0);
-Object.freeze(A);
+var M = j.createUniformPadding(0);
+Object.freeze(M);
 //#endregion
 //#region ../core/src/utils/url.js
-var xe = /^([A-Za-z]+:)?\/\//;
-function j(e, t) {
-	if (t && xe.test(t)) return t;
+var Se = /^([A-Za-z]+:)?\/\//;
+function N(e, t) {
+	if (t && Se.test(t)) return t;
 	let n = typeof e == "function" ? e() : e;
 	if (!n) return t;
 	if (!t) return n;
 	if (/[#?]/.test(n)) throw Error(`Cannot append to a url with query or hash. Append: ${t}, base: ${n}`);
-	return M(n) + t;
+	return P(n) + t;
 }
-function Se(e, t, n = Ce()) {
+function Ce(e, t, n = we()) {
 	let r = typeof e == "function" ? e() : e;
 	if (!t) return r;
 	try {
@@ -268,19 +281,19 @@ function Se(e, t, n = Ce()) {
 		}
 		if (n) return new URL(t, n).href;
 	} catch {}
-	return j(r, t);
+	return N(r, t);
 }
-function M(e) {
+function P(e) {
 	let t = e.replace(/[^/]*$/, "");
 	return t === "" ? void 0 : t.endsWith("://") ? e + "/" : t;
 }
-function Ce() {
+function we() {
 	if (typeof document < "u" && document.baseURI) return document.baseURI;
 	if (typeof window < "u" && window.location?.href) return window.location.href;
 }
 //#endregion
 //#region ../../node_modules/flatqueue/index.js
-var N = class {
+var F = class {
 	constructor(e = Infinity, t = Float64Array, n = Uint32Array) {
 		let r = e !== Infinity;
 		this.ids = r ? new n(e) : [], this.values = r ? new t(e) : [], this.capacity = e, this.length = 0;
@@ -321,11 +334,11 @@ var N = class {
 	shrink() {
 		Array.isArray(this.ids) && (this.ids.length = this.length), Array.isArray(this.values) && (this.values.length = this.length);
 	}
-}, P = Symbol("runtimeNode"), F = 1e6;
-function we(e) {
+}, I = Symbol("runtimeNode"), L = 1e6;
+function Te(e) {
 	return e ? (t, n) => e.addDisposer(t, n) : () => () => void 0;
 }
-function I(e, t, n = !0) {
+function R(e, t, n = !0) {
 	let r = {
 		id: e.id,
 		name: e.name,
@@ -340,7 +353,7 @@ function I(e, t, n = !0) {
 			};
 		}
 	};
-	return Object.defineProperty(r, P, {
+	return Object.defineProperty(r, I, {
 		enumerable: !1,
 		configurable: !1,
 		writable: !1,
@@ -349,18 +362,18 @@ function I(e, t, n = !0) {
 		t(e);
 	} }) : r;
 }
-function Te(e) {
-	let t = e[P];
+function Ee(e) {
+	let t = e[I];
 	if (!t) throw Error("ParamRef is not bound to this graph runtime. Expected runtime-created ref.");
 	return t;
 }
-function Ee(e) {
-	return typeof e.rank == "number" ? e.rank : Te(e).rank;
-}
 function De(e) {
+	return typeof e.rank == "number" ? e.rank : Ee(e).rank;
+}
+function Oe(e) {
 	for (let t of e) t();
 }
-var Oe = class {
+var ke = class {
 	#e = 1;
 	#t = 1;
 	#n = 0;
@@ -374,13 +387,13 @@ var Oe = class {
 	#u = /* @__PURE__ */ new Map();
 	#d = /* @__PURE__ */ new Set();
 	#f = /* @__PURE__ */ new Set();
-	#p = new N();
-	#m = new N();
+	#p = new F();
+	#m = new F();
 	#h = /* @__PURE__ */ new Set();
 	#g;
 	#_;
 	constructor(e = {}) {
-		this.#g = we(e.lifecycleRegistry), this.#_ = e.onError;
+		this.#g = Te(e.lifecycleRegistry), this.#_ = e.onError;
 	}
 	createWritable(e, t, n, r, i = {}) {
 		let a = "n" + this.#e++, o = i.notify ?? !0, s = {
@@ -402,7 +415,7 @@ var Oe = class {
 		}, l = () => {
 			s.disposed = !0, s.listeners.clear(), u();
 		}, u = this.#g(e, l);
-		return Object.assign(I(s, c, o), { dispose: l });
+		return Object.assign(R(s, c, o), { dispose: l });
 	}
 	computed(e, t, n, r, i = {}) {
 		return this.#v(e, t, n, r, i);
@@ -437,12 +450,12 @@ var Oe = class {
 		})), l = c(), u = () => {
 			s.disposed || (s.disposed = !0, d(), l.forEach((e) => e()), s.listeners.clear(), this.#d.delete(s));
 		}, d = this.#g(e, u);
-		return Object.assign(I(s), {
+		return Object.assign(R(s), {
 			dispose: u,
 			rebind: (e, n) => {
 				if (s.disposed) throw Error("Cannot rebind disposed operation: " + t);
 				let r = /* @__PURE__ */ new Set(), i = (e) => {
-					let n = e[P];
+					let n = e[I];
 					if (n === s) throw Error("Reactive dependency cycle: " + t);
 					if (!r.has(n)) {
 						r.add(n);
@@ -543,7 +556,7 @@ var Oe = class {
 	#y(e) {
 		this.#s++;
 		try {
-			De(e);
+			Oe(e);
 		} catch (e) {
 			throw this.#c = !1, !this.#o && this.#s === 1 && this.#b(e), e;
 		} finally {
@@ -587,7 +600,7 @@ var Oe = class {
 	}
 	#S(e) {
 		let t = -1, n = 0;
-		return () => (t !== this.#n && (n = 1 + e().reduce((e, t) => Math.max(e, Ee(t)), 0), t = this.#n), n);
+		return () => (t !== this.#n && (n = 1 + e().reduce((e, t) => Math.max(e, De(t)), 0), t = this.#n), n);
 	}
 	#C(e) {
 		if (this.#d.has(e)) {
@@ -604,8 +617,8 @@ var Oe = class {
 		this.#f.add(e), this.#m.push(e, this.#T(e.rank)), this.#E();
 	}
 	#T(e) {
-		let t = this.#t % F;
-		return this.#t += 1, e * F + t;
+		let t = this.#t % L;
+		return this.#t += 1, e * L + t;
 	}
 	#E() {
 		this.#r > 0 || this.#a || this.#o || (this.#a = !0, queueMicrotask(() => {
@@ -621,7 +634,7 @@ var Oe = class {
 			this.#h.clear();
 		}
 	}
-}, ke = class {
+}, Ae = class {
 	#e = 1;
 	#t = /* @__PURE__ */ new Map();
 	createOwner(e, t) {
@@ -642,7 +655,7 @@ var Oe = class {
 			t.clear(), this.#t.delete(e);
 		}
 	}
-}, Ae = class {
+}, je = class {
 	#e = 1;
 	#t = /* @__PURE__ */ new Map();
 	createRootScope(e) {
@@ -673,41 +686,41 @@ var Oe = class {
 		if (!t) throw Error("Unknown scope: " + e);
 		t.params.clear(), t.initializers.clear();
 	}
-	registerInitializer(e, n, r) {
-		t(n);
+	registerInitializer(e, t, r) {
+		n(t);
 		let i = this.#t.get(e);
 		if (!i) throw Error("Unknown scope: " + e);
-		if (i.params.has(n) || i.initializers.has(n)) throw Error(`Parameter "${n}" already exists in scope ${e}`);
-		i.initializers.set(n, {
+		if (i.params.has(t) || i.initializers.has(t)) throw Error(`Parameter "${t}" already exists in scope ${e}`);
+		i.initializers.set(t, {
 			initialize: r,
 			initializing: !1
 		});
 	}
-	register(e, n, r) {
-		t(n);
+	register(e, t, r) {
+		n(t);
 		let i = this.#t.get(e);
 		if (!i) throw Error("Unknown scope: " + e);
-		if (i.params.has(n) || i.initializers.get(n)?.initializing === !1) throw Error("Parameter \"" + n + "\" already exists in scope " + e);
-		return i.params.set(n, r), r;
+		if (i.params.has(t) || i.initializers.get(t)?.initializing === !1) throw Error("Parameter \"" + t + "\" already exists in scope " + e);
+		return i.params.set(t, r), r;
 	}
-	resolve(e, n) {
-		t(n);
+	resolve(e, t) {
+		n(t);
 		let r = e;
 		for (; r;) {
 			let e = this.#t.get(r);
 			if (!e) throw Error("Unknown scope: " + r);
-			let t = e.initializers.get(n);
-			if (t) {
-				if (t.initializing) throw Error(`Parameter dependency cycle while initializing "${n}" in ${r}.`);
-				t.initializing = !0;
+			let n = e.initializers.get(t);
+			if (n) {
+				if (n.initializing) throw Error(`Parameter dependency cycle while initializing "${t}" in ${r}.`);
+				n.initializing = !0;
 				try {
-					if (t.initialize(), !e.params.has(n)) throw Error(`Initializer did not register parameter "${n}".`);
-					e.initializers.delete(n);
+					if (n.initialize(), !e.params.has(t)) throw Error(`Initializer did not register parameter "${t}".`);
+					e.initializers.delete(t);
 				} finally {
-					t.initializing = !1;
+					n.initializing = !1;
 				}
 			}
-			let i = e.params.get(n);
+			let i = e.params.get(t);
 			if (i) return i;
 			r = e.parentScope;
 		}
@@ -715,60 +728,64 @@ var Oe = class {
 };
 //#endregion
 //#region ../core/src/paramRuntime/expressionCompiler.js
-function je(e, t = {}, n = {}) {
-	return p(e, t, n);
+function Me(e, t = {}, n = {}) {
+	return ne(e, t, n);
 }
 //#endregion
 //#region ../core/src/paramRuntime/expressionRef.js
-function Me(e, t, n = {}) {
-	let r = {}, i = je(e, r, n), a = /* @__PURE__ */ new Map();
-	for (let n of i.globals) {
-		if (a.has(n)) continue;
-		let i = t(n);
-		if (!i) throw Error("Unknown variable \"" + n + "\" in expression: " + e);
-		a.set(n, i), Object.defineProperty(r, n, {
-			enumerable: !0,
-			get() {
-				return i.get();
-			}
-		});
+function z(t, n, r = {}) {
+	let i = {}, a = Me(t, i, r), o = /* @__PURE__ */ new Map();
+	try {
+		for (let e of a.globals) {
+			if (o.has(e)) continue;
+			let r = n(e);
+			if (!r) throw Error("Unknown variable \"" + e + "\" in expression: " + t);
+			o.set(e, r), Object.defineProperty(i, e, {
+				enumerable: !0,
+				get() {
+					return r.get();
+				}
+			});
+		}
+	} catch (t) {
+		throw e(t, r.specLocation);
 	}
-	let o = /* @__PURE__ */ new Set();
-	return i.subscribe = (e) => {
+	let s = /* @__PURE__ */ new Set();
+	return a.subscribe = (e) => {
 		let t = [];
-		for (let n of a.values()) t.push(n.subscribe(e));
-		for (let n of i.scaleDependencies ?? []) t.push(n.subscribe(e));
+		for (let n of o.values()) t.push(n.subscribe(e));
+		for (let n of a.scaleDependencies ?? []) t.push(n.subscribe(e));
 		let n = !0, r = () => {
-			n && (n = !1, o.delete(r), t.forEach((e) => e()));
+			n && (n = !1, s.delete(r), t.forEach((e) => e()));
 		};
-		return o.add(r), r;
-	}, i.invalidate = () => {
-		for (let e of o) e();
-		o.clear();
-	}, i.createSnapshotEvaluator = () => {
+		return s.add(r), r;
+	}, a.invalidate = () => {
+		for (let e of s) e();
+		s.clear();
+	}, a.createSnapshotEvaluator = () => {
 		let e = {};
-		for (let t of Object.keys(r)) a.has(t) || (e[t] = r[t]);
-		for (let [t, n] of a) n.batchStable || Object.defineProperty(e, t, {
+		for (let t of Object.keys(i)) o.has(t) || (e[t] = i[t]);
+		for (let [t, n] of o) n.batchStable || Object.defineProperty(e, t, {
 			enumerable: !0,
 			get: () => n.get()
 		});
-		let t = Object.assign(i.createEvaluator(e), { refresh() {
-			for (let [t, n] of a) n.batchStable && (e[t] = n.get());
+		let t = Object.assign(a.createEvaluator(e), { refresh() {
+			for (let [t, n] of o) n.batchStable && (e[t] = n.get());
 		} });
 		return t.refresh(), t;
-	}, i.identifier = () => i.code + "|" + Array.from(a.values()).map((e) => e.id).concat((i.scaleDependencies ?? []).map((e) => e.id)).join(","), i.dependencies = Array.from(a.values()).concat(i.scaleDependencies ?? []), {
-		expression: i,
-		dependencies: i.dependencies
+	}, a.identifier = () => a.code + "|" + Array.from(o.values()).map((e) => e.id).concat((a.scaleDependencies ?? []).map((e) => e.id)).join(","), a.dependencies = Array.from(o.values()).concat(a.scaleDependencies ?? []), {
+		expression: a,
+		dependencies: a.dependencies
 	};
 }
 //#endregion
 //#region ../core/src/paramRuntime/paramRuntime.js
 var Ne = class {
-	#e = new ke();
+	#e = new Ae();
 	#t;
-	#n = new Ae();
+	#n = new je();
 	constructor(e = {}) {
-		this.#t = new Oe({
+		this.#t = new ke({
 			lifecycleRegistry: this.#e,
 			onError: e.onError
 		});
@@ -797,11 +814,11 @@ var Ne = class {
 		return this.#n.register(e, t, a);
 	}
 	registerDerived(e, t, n, r) {
-		let { expression: i, dependencies: a } = Me(n, (t) => this.resolve(r?.expressionScope ?? e, t), r), o = this.#n.getOwnerId(e), s = this.#t.computed(o, t, a, () => i(null));
+		let { expression: i, dependencies: a } = z(n, (t) => this.resolve(r?.expressionScope ?? e, t), r), o = this.#n.getOwnerId(e), s = this.#t.computed(o, t, a, () => i(null));
 		return this.#n.register(e, t, s);
 	}
 	createExpression(e, t, n) {
-		let { expression: r } = Me(t, (t) => this.resolve(e, t), n);
+		let { expression: r } = z(t, (t) => this.resolve(e, t), n);
 		return r;
 	}
 	resolve(e, t) {
@@ -925,7 +942,7 @@ function ze() {
 }
 //#endregion
 //#region ../core/src/paramRuntime/viewParamRuntime.js
-var Be = class {
+var B = class {
 	#e;
 	#t;
 	#n = /* @__PURE__ */ new Map();
@@ -941,9 +958,10 @@ var Be = class {
 	#f;
 	#p;
 	#m;
-	#h = !1;
+	#h;
+	#g = !1;
 	constructor(e, t, n, r = {}) {
-		this.#d = e ?? (() => void 0), this.#f = t ?? (() => void 0), this.#p = n, this.#m = r.settleTemporalUpdatesImmediately ?? !1;
+		this.#d = e ?? (() => void 0), this.#f = t ?? (() => void 0), this.#p = n, this.#h = r.getSpecOrigin, this.#m = r.settleTemporalUpdatesImmediately ?? !1;
 		let i = this.#d();
 		i ? (this.#e = i.#e, this.#t = this.#e.createScope(i.#t)) : (this.#e = new Ne({ onError: r.onError }), this.#t = this.#e.createScope());
 	}
@@ -964,38 +982,46 @@ var Be = class {
 		if (o) throw Error(`Conflicting selection declarations for "${e}" in "${i.location}" and "${o.location}".`);
 		return i;
 	}
-	#g(e) {
+	#_(e) {
 		if (!("select" in e)) return;
-		let t = i(e.select), n = t.type === "interval" ? "interval" : t.toggle ? "multi" : "single", r = t.type === "interval" ? Array.from(new Set(t.encodings)).sort() : [], a = e.push === "outer" ? this.findRuntimeForParam(e.name) : this, o = {
-			kind: n,
-			components: r,
+		let n = t(e.select), r = n.type === "interval" ? "interval" : n.toggle ? "multi" : "single", i = n.type === "interval" ? Array.from(new Set(n.encodings)).sort() : [], a = e.push === "outer" ? this.findRuntimeForParam(e.name) : this, o = {
+			kind: r,
+			components: i,
 			source: this.#s
 		}, s = a.#c.get(e.name) ?? /* @__PURE__ */ new Set(), c = s.values().next().value;
-		if (c && (c.kind !== n || JSON.stringify(c.components) !== JSON.stringify(r))) throw Error(`Conflicting selection declarations for "${e.name}" in "${c.source?.name ?? e.name}" and "${this.#s?.name ?? e.name}".`);
+		if (c && (c.kind !== r || JSON.stringify(c.components) !== JSON.stringify(i))) throw Error(`Conflicting selection declarations for "${e.name}" in "${c.source?.name ?? e.name}" and "${this.#s?.name ?? e.name}".`);
 		s.add(o), a.#c.set(e.name, s), this.#e.addScopeDisposer(this.#t, () => {
 			s.delete(o);
 		});
 	}
-	get #_() {
-		return { resolveScaleResolution: this.#f };
-	}
-	registerParam(e, n = {}) {
-		let r = e.name;
-		if (t(r), this.#i.has(r) || this.#a.has(r)) throw Error("Parameter \"" + r + "\" already registered in this scope.");
-		if (He(e), n.defer) {
-			if (!("expr" in e)) throw Error("Only expression parameters can be deferred.");
-			return this.#e.registerInitializer(this.#t, r, () => {
-				this.#v(e);
-			}), this.#i.set(r, e), () => {
-				throw Error("Cannot set derived parameter \"" + r + "\".");
+	#v(e) {
+		return {
+			resolveScaleResolution: this.#f,
+			specLocation: this.getSpecLocation(e, ["expr"])
+		};
+	}
+	registerParam(t, r = {}) {
+		let i = t.name;
+		try {
+			n(i);
+		} catch (n) {
+			throw e(n, this.getSpecLocation(t, ["name"]));
+		}
+		if (this.#i.has(i) || this.#a.has(i)) throw e(/* @__PURE__ */ Error("Parameter \"" + i + "\" already registered in this scope."), this.getSpecLocation(t, ["name"]));
+		if (Ve(t), r.defer) {
+			if (!("expr" in t)) throw Error("Only expression parameters can be deferred.");
+			return this.#e.registerInitializer(this.#t, i, () => {
+				this.#y(t);
+			}), this.#i.set(i, t), () => {
+				throw Error("Cannot set derived parameter \"" + i + "\".");
 			};
 		}
-		return this.#v(e);
+		return this.#y(t);
 	}
 	registerLazyExpression(e, t, n) {
 		this.#e.registerInitializer(this.#t, e, () => {
 			n?.();
-			let r = this.#e.registerDerived(this.#t, e, t, this.#_);
+			let r = this.#e.registerDerived(this.#t, e, t, this.#v());
 			this.#r.set(e, r);
 		}), this.#a.add(e);
 	}
@@ -1005,7 +1031,7 @@ var Be = class {
 		this.#e.registerInitializer(this.#t, e, () => {
 			let r = this.#e.registerDerived(this.#t, e, t, {
 				expressionScope: n.#t,
-				...n.#_
+				...n.#v()
 			});
 			this.#r.set(e, r);
 		}), this.#i.set(e, {
@@ -1013,65 +1039,65 @@ var Be = class {
 			expr: t
 		});
 	}
-	#v(e) {
-		let t = e.name, n, r;
-		if (e.push == "outer") {
-			let i = this.findRuntimeForParam(t);
-			if (!i) throw Error(`Parameter "${t}" not found in outer scope!`);
-			let a = i.paramConfigs.get(t);
-			if (!a) throw Error(`Outer parameter "${t}" exists as a value but has no registered config.`);
-			if ("expr" in a || "select" in a || "ruler" in a) throw Error(`The outer parameter "${t}" must not have expr, select, or ruler properties!`);
-			n = (e) => {
-				i.setValue(t, e);
-			}, this.#n.set(t, n), "ruler" in e && (r = h(e, this), n(r));
-		} else if ("value" in e) r = h(e, this), n = "transition" in e ? this.#b(t, r, e.transition) : this.#y(t, r);
-		else if ("expr" in e) {
-			if ("transition" in e) this.#x(t, e.expr, e.transition);
-			else if ("debounce" in e) this.#S(t, e.expr, e.debounce);
+	#y(t) {
+		let n = t.name, r, i;
+		if (t.push == "outer") {
+			let a = this.findRuntimeForParam(n);
+			if (!a) throw e(/* @__PURE__ */ Error(`Parameter "${n}" not found in outer scope!`), this.getSpecLocation(t, ["name"]));
+			let s = a.paramConfigs.get(n);
+			if (!s) throw Error(`Outer parameter "${n}" exists as a value but has no registered config.`);
+			if ("expr" in s || "select" in s || "ruler" in s) throw Error(`The outer parameter "${n}" must not have expr, select, or ruler properties!`);
+			r = (e) => {
+				a.setValue(n, e);
+			}, this.#n.set(n, r), "ruler" in t && (i = o(t, this), r(i));
+		} else if ("value" in t) i = o(t, this), r = "transition" in t ? this.#x(n, i, t.transition) : this.#b(n, i);
+		else if (l(t)) {
+			if ("transition" in t) this.#S(n, t, t.transition);
+			else if ("debounce" in t) this.#C(n, t, t.debounce);
 			else {
-				let n = this.#e.registerDerived(this.#t, t, e.expr, this.#_);
-				this.#r.set(t, n);
+				let e = this.#e.registerDerived(this.#t, n, t.expr, this.#v(t));
+				this.#r.set(n, e);
 			}
-			n = () => {
-				throw Error("Cannot set derived parameter \"" + t + "\".");
+			r = () => {
+				throw Error("Cannot set derived parameter \"" + n + "\".");
 			};
-		} else r = h(e, this), n = this.#y(t, r);
-		if ("select" in e) {
-			if (r ??= h(e, this), !this.#n.has(t)) {
-				let e = this.#e.registerSelection(this.#t, t, r);
-				this.#r.set(t, e), this.#n.set(t, (t) => {
+		} else i = o(t, this), r = this.#b(n, i);
+		if ("select" in t) {
+			if (i ??= o(t, this), !this.#n.has(n)) {
+				let e = this.#e.registerSelection(this.#t, n, i);
+				this.#r.set(n, e), this.#n.set(n, (t) => {
 					e.set(t), this.#e.flushNow();
-				}), n = this.#n.get(t);
+				}), r = this.#n.get(n);
 			}
-			n(r);
+			r(i);
 		}
-		return this.#i.set(t, e), this.#g(e), n;
+		return this.#i.set(n, t), this.#_(t), r;
 	}
-	allocateSetter(e, n, r = !1) {
-		if (t(e), this.#n.has(e)) throw Error("Setter already allocated for parameter: " + e);
-		let i = this.#e.registerBase(this.#t, e, n, { notify: !r });
+	allocateSetter(e, t, r = !1) {
+		if (n(e), this.#n.has(e)) throw Error("Setter already allocated for parameter: " + e);
+		let i = this.#e.registerBase(this.#t, e, t, { notify: !r });
 		this.#r.set(e, i);
 		let a = (e) => {
 			i.set(e), this.#e.flushNow();
 		};
 		return this.#n.set(e, a), a;
 	}
-	setValue(e, n, r) {
-		t(e);
+	setValue(e, t, r) {
+		n(e);
 		let i = this.#n.get(e);
 		if (!i) throw Error("Writable parameter not found in this scope: " + e);
-		i(n, r);
+		i(t, r);
 	}
 	getValue(e) {
 		return !this.#r.has(e) && this.hasLocalParam(e) && this.#e.resolve(this.#t, e), this.#r.get(e)?.get();
 	}
 	getParamRef(e) {
-		t(e);
-		let n = this.findRuntimeForParam(e);
-		if (n) return n.#r.has(e) || n.#e.resolve(n.#t, e), n.#r.get(e);
+		n(e);
+		let t = this.findRuntimeForParam(e);
+		if (t) return t.#r.has(e) || t.#e.resolve(t.#t, e), t.#r.get(e);
 	}
 	getTargetValue(e) {
-		return t(e), this.#l.get(e)?.target ?? this.#u.get(e)?.target ?? this.getValue(e);
+		return n(e), this.#l.get(e)?.target ?? this.#u.get(e)?.target ?? this.getValue(e);
 	}
 	subscribe(e, t) {
 		let n = this.getParamRef(e);
@@ -1088,16 +1114,16 @@ var Be = class {
 		return this.#i;
 	}
 	hasLocalParam(e) {
-		t(e);
-		let n = this.#i.get(e);
-		return this.#r.has(e) || this.#a.has(e) || n !== void 0 && "expr" in n;
+		n(e);
+		let t = this.#i.get(e);
+		return this.#r.has(e) || this.#a.has(e) || t !== void 0 && "expr" in t;
 	}
 	isPendingParam(e) {
 		let t = this.findRuntimeForParam(e);
 		return t !== void 0 && !t.#r.has(e);
 	}
 	hasConfiguredParamInScopeChain(e) {
-		return t(e), this.#i.has(e) ? !0 : this.#d()?.hasConfiguredParamInScopeChain(e) ?? !1;
+		return n(e), this.#i.has(e) ? !0 : this.#d()?.hasConfiguredParamInScopeChain(e) ?? !1;
 	}
 	findRuntimeForParam(e) {
 		return this.hasLocalParam(e) ? this : this.#d()?.findRuntimeForParam(e);
@@ -1128,7 +1154,7 @@ var Be = class {
 			let r = this.#i.get(t);
 			e.push({
 				name: t,
-				kind: Ve(r),
+				kind: Be(r),
 				value: n.get(),
 				writable: this.#n.has(t),
 				configured: !!r,
@@ -1138,12 +1164,15 @@ var Be = class {
 		}
 		return {
 			scopeId: this.#t,
-			disposed: this.#h,
+			disposed: this.#g,
 			params: e
 		};
 	}
+	getSpecLocation(e, t) {
+		return ee(e, this.#h, t);
+	}
 	createExpression(e) {
-		return this.#e.createExpression(this.#t, e, this.#_);
+		return this.#e.createExpression(this.#t, typeof e == "string" ? e : e.expr, this.#v(typeof e == "string" ? void 0 : e));
 	}
 	watchExpression(e, t, n = {}) {
 		let r = this.createExpression(e), i = r.subscribe(t);
@@ -1170,7 +1199,7 @@ var Be = class {
 	cancelUpdate(e) {
 		this.#e.cancelUpdate(e);
 	}
-	#y(e, t) {
+	#b(e, t) {
 		let n = this.#e.registerBase(this.#t, e, t);
 		this.#r.set(e, n);
 		let r = (e) => {
@@ -1178,19 +1207,19 @@ var Be = class {
 		};
 		return this.#n.set(e, r), r;
 	}
-	#b(e, t, n) {
-		let r = this.#C(e, t, n), i = (t, n) => {
-			this.#w(e, r, t, n);
+	#x(e, t, n) {
+		let r = this.#w(e, t, n), i = (t, n) => {
+			this.#T(e, r, t, n);
 		};
 		return this.#n.set(e, i), i;
 	}
-	#x(e, t, n) {
-		let r = this.createExpression(t), i = this.#C(e, r(null), n), a = r.subscribe(() => {
-			this.#w(e, i, r(null), { animate: !this.#m });
+	#S(e, t, n) {
+		let r = this.createExpression(t), i = this.#w(e, r(null), n), a = r.subscribe(() => {
+			this.#T(e, i, r(null), { animate: !this.#m });
 		});
 		this.#e.addScopeDisposer(this.#t, a);
 	}
-	#S(e, t, n) {
+	#C(e, t, n) {
 		let r = this.createExpression(t), i = r(null), a = this.#e.registerBase(this.#t, e, i);
 		this.#r.set(e, a);
 		let o = {
@@ -1205,8 +1234,8 @@ var Be = class {
 			clearTimeout(o.timeout), c(), this.#u.delete(e);
 		});
 	}
-	#C(e, t, n) {
-		let r = Ue(e, t), i = this.#e.registerBase(this.#t, e, r);
+	#w(e, t, n) {
+		let r = He(e, t), i = this.#e.registerBase(this.#t, e, r);
 		this.#r.set(e, i);
 		let a = this.#p;
 		if (!a) throw Error(`The parameter "${e}" uses transition but no animator is available.`);
@@ -1221,8 +1250,8 @@ var Be = class {
 		};
 		return this.#l.set(e, s), this.#e.addScopeDisposer(this.#t, s.dispose), s;
 	}
-	#w(e, t, n, r = {}) {
-		let i = Ue(e, n);
+	#T(e, t, n, r = {}) {
+		let i = He(e, n);
 		t.target = i, r.animate === !1 ? t.smoother.snap({ value: i }) : t.smoother({ value: i });
 	}
 	evaluateAndGet(e) {
@@ -1241,22 +1270,17 @@ var Be = class {
 		this.#m = !1;
 	}
 	dispose() {
-		this.#h || (this.#h = !0, this.#e.disposeScope(this.#t), this.#n.clear(), this.#r.clear(), this.#i.clear(), this.#a.clear(), this.#o.clear(), this.#l.clear(), this.#u.clear());
-	}
-	hasPointSelections() {
-		for (let e of this.#i.values()) if (ne(e)) {
-			let t = e.select;
-			if (te(t)) {
-				if (t == "point") return !0;
-			} else if (t.type == "point") return !0;
-		}
+		this.#g || (this.#g = !0, this.#e.disposeScope(this.#t), this.#n.clear(), this.#r.clear(), this.#i.clear(), this.#a.clear(), this.#o.clear(), this.#l.clear(), this.#u.clear());
+	}
+	hasPointSelections({ inherited: e = !1 } = {}) {
+		for (let t = this; t; t = e ? t.#d() : void 0) for (let n of t.#i.values()) if (i(n) && (n.select === "point" || typeof n.select == "object" && n.select.type === "point") && (!e || this.findConfiguredParam(n.name).config === n)) return !0;
 		return !1;
 	}
 };
-function Ve(e) {
+function Be(e) {
 	return e ? e.push === "outer" ? "push" : "select" in e ? "selection" : "ruler" in e ? "ruler" : "expr" in e ? "derived" : "base" : "auto";
 }
-function He(e) {
+function Ve(e) {
 	let t = e.name;
 	if ("value" in e && "expr" in e) throw Error(`The parameter "${t}" must not have both value and expr properties!`);
 	if ("expr" in e && "bind" in e) throw Error(`The parameter "${t}" must not have both expr and bind properties!`);
@@ -1274,62 +1298,62 @@ function He(e) {
 	if (n.halfLife != null && (!Number.isFinite(n.halfLife) || n.halfLife <= 0)) throw Error(`The transition halfLife for parameter "${t}" must be a positive finite number.`);
 	if (n.epsilon != null && (!Number.isFinite(n.epsilon) || n.epsilon < 0)) throw Error(`The transition epsilon for parameter "${t}" must be a non-negative finite number.`);
 }
-function Ue(e, t) {
+function He(e, t) {
 	if (typeof t != "number" || !Number.isFinite(t)) throw Error(`Transitioned parameter "${e}" must have a finite numeric value.`);
 	return t;
 }
 //#endregion
 //#region ../core/src/utils/addBaseUrl.js
-function We(e, t) {
+function Ue(e, t) {
 	return !t || /^(data:|([A-Za-z]+:)?\/\/)/.test(e) || e.startsWith("/") ? e : (t.endsWith("/") || (t += "/"), t + e);
 }
-function Ge(e) {
+function We(e) {
 	if (!e) return e;
 	if (/[?#]/.test(e)) throw Error(`Invalid base URL: ${e} - cannot contain query or hash.`);
 	return e.endsWith("/") ? e : e + "/";
 }
 //#endregion
 //#region ../core/src/config/mergeConfig.js
-function L(e) {
-	return d(e) && !Array.isArray(e);
+function V(e) {
+	return ie(e) && !Array.isArray(e) && !("expr" in e && typeof e.expr == "string");
 }
-function Ke(e) {
+function Ge(e) {
 	let t = {};
-	for (let [n, r] of Object.entries(e)) t[n] = R(r);
+	for (let [n, r] of Object.entries(e)) t[n] = H(r);
 	return t;
 }
-function R(e) {
-	return Array.isArray(e) ? e.map(R) : L(e) ? Ke(e) : e;
+function H(e) {
+	return Array.isArray(e) ? e.map(H) : V(e) ? Ge(e) : e;
 }
-function z(e, t) {
+function Ke(e, t) {
 	for (let [n, r] of Object.entries(t)) {
 		if (r === void 0) continue;
 		let t = e[n];
-		L(r) && L(t) ? z(t, r) : e[n] = R(r);
+		V(r) && V(t) ? Ke(t, r) : e[n] = H(r);
 	}
 	return e;
 }
-function B(e) {
+function qe(e) {
 	let t = {};
-	for (let n of e) n && z(t, n);
+	for (let n of e) n && Ke(t, n);
 	return t;
 }
 //#endregion
 //#region ../core/src/view/viewChrome.js
-var V = /* @__PURE__ */ new WeakMap();
-function qe(e, t) {
-	V.set(e, t);
+var U = /* @__PURE__ */ new WeakMap();
+function Je(e, t) {
+	U.set(e, t);
 }
-function Je(e) {
-	return V.get(e);
+function Ye(e) {
+	return U.get(e);
 }
-function H(e) {
-	return V.has(e);
+function Xe(e) {
+	return U.has(e);
 }
-function U(e) {
+function Ze(e) {
 	let t = e;
 	for (; t;) {
-		let n = V.get(t);
+		let n = U.get(t);
 		if (n === "excludeSubtree" || t === e && n === "exclude") return !0;
 		t = t.layoutParent;
 	}
@@ -1337,16 +1361,16 @@ function U(e) {
 }
 //#endregion
 //#region ../core/src/view/postScaleParams.js
-var W = /* @__PURE__ */ new WeakMap();
-function Ye(e, t) {
-	W.set(e, t);
+var Qe = /* @__PURE__ */ new WeakMap();
+function $e(e, t) {
+	Qe.set(e, t);
 }
-function Xe(e) {
-	return W.get(e);
+function et(e) {
+	return Qe.get(e);
 }
 //#endregion
 //#region ../core/src/data/namedDataScope.js
-var Ze = class {
+var tt = class {
 	name;
 	owner;
 	getDefaultData;
@@ -1384,13 +1408,13 @@ var Ze = class {
 	dispose() {
 		this.#e = void 0, this.#t = !1, this.#n++, this.#r = !0;
 	}
-}, Qe = class {
+}, nt = class {
 	view;
 	#e = /* @__PURE__ */ new Map();
 	#t = /* @__PURE__ */ new Map();
 	constructor(e) {
 		this.view = e;
-		for (let [t, n] of Object.entries(e.spec.datasets ?? {})) this.#e.set(t, new Ze(t, e, () => n));
+		for (let [t, n] of Object.entries(e.spec.datasets ?? {})) this.#e.set(t, new tt(t, e, () => n));
 	}
 	getLocalBinding(e) {
 		return this.#e.get(e);
@@ -1404,7 +1428,7 @@ var Ze = class {
 		let n = this.view.dataParent?.namedDataScope;
 		if (n) return n.resolve(e);
 		let r = this.#t.get(e);
-		return r || (r = new Ze(e, void 0, () => this.view.context.getNamedDataFromProvider(e)), this.#t.set(e, r)), r;
+		return r || (r = new tt(e, void 0, () => this.view.context.getNamedDataFromProvider(e)), this.#t.set(e, r)), r;
 	}
 	dispose() {
 		for (let e of this.#e.values()) e.dispose();
@@ -1412,7 +1436,7 @@ var Ze = class {
 		for (let e of this.#t.values()) e.dispose();
 		this.#t.clear();
 	}
-}, G = "VISIT_SKIP", K = "VISIT_STOP", q = (e) => e, $e = class {
+}, W = "VISIT_SKIP", G = "VISIT_STOP", K = (e) => e, rt = class {
 	spec;
 	namedDataScope;
 	#e;
@@ -1427,34 +1451,36 @@ var Ze = class {
 	#l = void 0;
 	#u = !1;
 	#d = [];
-	opacityFunction = q;
+	opacityFunction = K;
 	#f = [];
 	#p = "none";
 	#m = /* @__PURE__ */ new Map();
-	facetCoords = new e([], JSON.stringify);
+	facetCoords = new p([], JSON.stringify);
+	layoutCoords;
 	constructor(e, t, n, r, i, a = {}) {
 		if (!e) throw Error("View spec must be defined!");
-		if (this.context = t, this.layoutParent = n, this.dataParent = r, this.#t = i, this.spec = e, this.namedDataScope = new Qe(this), r && e.theme !== void 0) throw Error("\"theme\" is only supported at the root specification. Use \"config\" and \"style\" for subtree customization.");
+		if (this.context = t, this.layoutParent = n, this.dataParent = r, a.chrome && Je(this, "excludeSubtree"), this.#t = i, this.spec = e, this.namedDataScope = new nt(this), r && e.theme !== void 0) throw Error("\"theme\" is only supported at the root specification. Use \"config\" and \"style\" for subtree customization.");
 		let o = r ? r.getConfigScopes() : [t.getBaseConfig()], s = e.config;
 		this.#e = [...o, s].filter((e) => !!e), this.resolutions = {
 			scale: {},
 			axis: {},
 			legend: {}
-		}, ie(this), this.options = {
+		}, oe(this), this.options = {
 			inheritEncoding: !1,
 			layoutSizeParams: "own",
 			...a
 		}, this.flowHandle = void 0, this.needsAxes = {
 			x: !1,
 			y: !1
-		}, this.paramRuntime = new Be(() => this.dataParent?.paramRuntime, (e) => this.getScaleResolution(e), t.animator, {
+		}, this.paramRuntime = new B(() => this.dataParent?.paramRuntime, (e) => this.getScaleResolution(e), t.animator, {
 			settleTemporalUpdatesImmediately: !0,
-			onError: t.reportError
-		}), this.paramRuntime.setSelectionSource(this), "mark" in e && this.paramRuntime.registerLazyExpression("zoomLevel", "zoomLevel()", () => se("The automatic zoomLevel parameter is deprecated. Use zoomLevel() or an explicit channel such as zoomLevel(\"x\") instead."));
-		let l = [...e.params ?? [], ...Xe(e) ?? []];
-		for (let e of l) {
+			onError: t.reportError,
+			getSpecOrigin: t.getSpecOrigin
+		}), this.paramRuntime.setSelectionSource(this), "mark" in e && this.paramRuntime.registerLazyExpression("zoomLevel", "zoomLevel()", () => ce("The automatic zoomLevel parameter is deprecated. Use zoomLevel() or an explicit channel such as zoomLevel(\"x\") instead."));
+		let c = [...e.params ?? [], ...et(e) ?? []];
+		for (let e of c) {
 			if ("expr" in e) {
-				let { usesScaleHelper: t, globals: n } = c(e.expr), r = n.some((e) => this.paramRuntime.isPendingParam(e));
+				let { usesScaleHelper: t, globals: n } = m(e.expr, this.paramRuntime.getSpecLocation(e, ["expr"])), r = n.some((e) => this.paramRuntime.isPendingParam(e));
 				if (t || r) {
 					this.paramRuntime.registerParam(e, { defer: !0 }), this.#d.push(e.name);
 					continue;
@@ -1480,18 +1506,18 @@ var Ze = class {
 		return this.#t;
 	}
 	getConfig() {
-		return B(this.#e);
+		return qe(this.#e);
 	}
 	getCursorSpec() {
 		return this.spec.cursor;
 	}
 	getCursor() {
 		let e = this.getCursorSpec();
-		return n(e) ? this.paramRuntime.evaluateAndGet(e.expr) : e;
+		return l(e) ? this.paramRuntime.evaluateAndGet(e) : e;
 	}
 	watchCursor(e, t) {
-		let r = this.getCursorSpec();
-		n(r) && this.paramRuntime.watchExpression(r.expr, e, {
+		let n = this.getCursorSpec();
+		l(n) && this.paramRuntime.watchExpression(n, e, {
 			scopeOwned: !1,
 			registerDisposer: t
 		});
@@ -1503,45 +1529,73 @@ var Ze = class {
 		return this.facetCoords.values().next().value;
 	}
 	getPadding() {
-		return this._cache("size/padding", () => k.createFromConfig(this.spec.padding));
+		return this._cache("size/padding", () => j.createFromConfig(this.spec.padding));
 	}
 	getOverhang() {
-		return k.zero();
+		return j.zero();
+	}
+	getStructuralOverhang() {
+		return j.zero();
+	}
+	getStructuralSizeDefs(e) {
+		let t = this.getStructuralOverhang();
+		return {
+			before: { px: t[e === "x" ? "left" : "top"] },
+			after: { px: t[e === "x" ? "right" : "bottom"] }
+		};
+	}
+	getAlignment(e) {
+		let t = e === "x" ? "width" : "height";
+		return {
+			size: this.getViewportSize().subtractPadding(this.getOverhang())[t],
+			before: 0,
+			after: 0
+		};
+	}
+	getAlignmentCoords(e) {
+		return this.coords.shrink(this.getOverhang());
+	}
+	getLayoutFootprints() {
+		return [{
+			view: this,
+			coords: this.coords.shrink(this.getOverhang()),
+			chrome: !1
+		}];
 	}
 	isScrollable() {
 		return this.spec.viewportWidth != null || this.spec.viewportHeight != null;
 	}
 	getSize() {
-		return this._cache("size/size", () => this.isConfiguredVisible() ? new y(this.#g("width"), this.#g("height")) : x);
+		return this._cache("size/size", () => this.isConfiguredVisible() ? new x(this.#g("width"), this.#g("height")) : S);
 	}
 	getViewportSize() {
 		if (!this.isScrollable()) return this.getSize();
-		if (!this.isConfiguredVisible()) return x;
+		if (!this.isConfiguredVisible()) return S;
 		let e = this.getSize();
-		return new y(this.#g("viewportWidth") ?? e.width, this.#g("viewportHeight") ?? e.height);
+		return new x(this.#g("viewportWidth") ?? e.width, this.#g("viewportHeight") ?? e.height);
 	}
 	#g(e) {
-		let { value: t, implicit: n } = this.#_(e), r = this.resolveSizeValue(e, t), i = J(r), a = e == "viewportWidth" || e == "viewportHeight";
-		if (i) {
-			if (a) throw new _(`Cannot use step-based size with "${e}"!`, this);
-			let t = this.#x(e, r), i = this.getScaleResolution(e == "width" ? "x" : "y")?.getScale();
-			if (i) {
+		let { value: t, implicit: n } = this.#_(e), i = this.resolveSizeValue(e, t), a = q(i), o = e == "viewportWidth" || e == "viewportHeight";
+		if (a) {
+			if (o) throw new _(`Cannot use step-based size with "${e}"!`, this);
+			let t = this.#x(e, i), a = this.getScaleResolution(e == "width" ? "x" : "y")?.getScale();
+			if (a) {
 				let n;
-				if (v(i.type)) n = i.domain().length;
-				else if (["locus", "index"].includes(i.type)) {
-					let e = i.domain();
-					n = ee(e) - e[0];
-				} else throw new _(`Cannot use step-based size with "${i.type}" scale!`, this);
-				let a = i;
-				n = oe(n, a.paddingInner(), a.paddingOuter());
-				let o = e == "width" ? "xOffset" : "yOffset", s = this.getScaleResolution(o)?.getScale(), c = r.for ?? (s && v(s.type) ? "offset" : "position"), l = t;
-				if (c == "offset") {
-					if (!s || !v(s.type)) throw new _(`Cannot use ${e}.step.for = "offset" without a discrete ${o} scale!`, this);
-					let t = s, n = oe(s.domain().length, t.paddingInner(), t.paddingOuter());
-					l *= n / (1 - a.paddingInner());
+				if (y(a.type)) n = a.domain().length;
+				else if (["locus", "index"].includes(a.type)) {
+					let e = a.domain();
+					n = r(e) - e[0];
+				} else throw new _(`Cannot use step-based size with "${a.type}" scale!`, this);
+				let o = a;
+				n = v(n, o.paddingInner(), o.paddingOuter());
+				let s = e == "width" ? "xOffset" : "yOffset", c = this.getScaleResolution(s)?.getScale(), l = i.for ?? (c && y(c.type) ? "offset" : "position"), u = t;
+				if (l == "offset") {
+					if (!c || !y(c.type)) throw new _(`Cannot use ${e}.step.for = "offset" without a discrete ${s} scale!`, this);
+					let t = c, n = v(c.domain().length, t.paddingInner(), t.paddingOuter());
+					u *= n / (1 - o.paddingInner());
 				}
 				return {
-					px: n * l,
+					px: n * u,
 					grow: 0
 				};
 			}
@@ -1551,7 +1605,7 @@ var Ze = class {
 			};
 			throw new _(`Cannot use step-based size with "${e}"!`, this);
 		}
-		return (r && he(r)) ?? (a ? void 0 : {
+		return (i && _e(i)) ?? (o ? void 0 : {
 			px: 0,
 			grow: 1
 		});
@@ -1567,16 +1621,16 @@ var Ze = class {
 		};
 	}
 	#v(e) {
-		if (U(this)) return;
+		if (Ze(this)) return;
 		let t = this.getConfig().view;
 		if (!t) return;
 		let n = e == "width" ? "x" : "y", r = this.getScaleResolution(n)?.getResolvedScaleType();
-		return r && !v(r) ? e == "width" ? t.continuousWidth : t.continuousHeight : (e == "width" ? t.discreteWidth : t.discreteHeight) ?? (t.step === void 0 ? void 0 : { step: t.step });
+		return r && !y(r) ? e == "width" ? t.continuousWidth : t.continuousHeight : (e == "width" ? t.discreteWidth : t.discreteHeight) ?? (t.step === void 0 ? void 0 : { step: t.step });
 	}
 	resolveSizeValue(e, t) {
-		if (!n(t)) return t;
-		let r = this.#C(e)();
-		if (it(r) || r === "container") return r;
+		if (!l(t)) return t;
+		let n = this.#C(e)();
+		if (ct(n) || n === "container") return n;
 		throw new _(`"${e}" ExprRef must resolve to a finite number or "container"!`, this);
 	}
 	registerSizeInvalidation() {
@@ -1584,7 +1638,7 @@ var Ze = class {
 	}
 	#y(e, t) {
 		let { value: n, implicit: r } = this.#_(e);
-		if (!J(n)) return;
+		if (!q(n)) return;
 		let i = this.getScaleResolution(t);
 		if (!i) {
 			if (r) return;
@@ -1594,20 +1648,20 @@ var Ze = class {
 			let t = this.getSize()[e];
 			this.invalidateSizeCache();
 			let n = this.getSize()[e];
-			pe(t, n) || this.context.requestLayoutReflow();
+			he(t, n) || this.context.requestLayoutReflow();
 		};
 		if (i.addEventListener("domain", a), this.registerDisposer(() => i.removeEventListener("domain", a)), n.for != "position") {
 			let t = e == "width" ? "xOffset" : "yOffset", n = this.getScaleResolution(t);
-			n && v(n.getResolvedScaleType()) && (n.addEventListener("domain", a), this.registerDisposer(() => n.removeEventListener("domain", a)));
+			n && y(n.getResolvedScaleType()) && (n.addEventListener("domain", a), this.registerDisposer(() => n.removeEventListener("domain", a)));
 		}
 	}
 	#b(e) {
 		let { value: t } = this.#_(e);
-		n(t) ? this.#S(e, t.expr) : J(t) && n(t.step) && this.#S(e + ".step", t.step.expr);
+		l(t) ? this.#S(e, t) : q(t) && l(t.step) && this.#S(e + ".step", t.step);
 	}
 	#x(e, t) {
-		let r = n(t.step) ? this.#C(e + ".step")() : t.step;
-		if (it(r)) return r;
+		let n = l(t.step) ? this.#C(e + ".step")() : t.step;
+		if (ct(n)) return n;
 		throw new _(`"${e}.step" ExprRef must resolve to a finite number!`, this);
 	}
 	#S(e, t) {
@@ -1653,7 +1707,7 @@ var Ze = class {
 		return this.opacityFunction(1);
 	}
 	hasLocalOpacity() {
-		return this.opacityFunction !== q;
+		return this.opacityFunction !== K;
 	}
 	getPathString() {
 		return this.getLayoutAncestors().map((e) => e.name).reverse().join("/");
@@ -1684,7 +1738,7 @@ var Ze = class {
 		};
 	}
 	handleInteraction(e, t) {
-		t && e.type === "mousemove" && e.pointedViews.add(this);
+		t && e.type === "mousemove" && e.pointedViews.set(this, e.facetId);
 		let n = t ? this.#r : this.#i;
 		for (let t of n[e.type] || []) t(e);
 	}
@@ -1717,7 +1771,7 @@ var Ze = class {
 		for (let e of this.#f) e();
 		this.#f.length = 0;
 		let e = this.flowHandle;
-		e?.collector && (this.context.dataFlow.pruneCollectorBranch(e.collector), this.context.dataFlow.removeCollector(e.collector)), e?.dataSource && e.dataSource.view === this && !e.dataSource.shareKey && this.context.dataFlow.removeDataSource(e.dataSource), this.paramRuntime.dispose(), this.namedDataScope.dispose(), this.context.dataFlow.loadingStatusRegistry.delete(this), this.flowHandle = void 0;
+		e?.collector && (this.context.dataFlow.pruneCollectorBranch(e.collector), this.context.dataFlow.removeCollector(e.collector)), e?.dataSource && e.dataSource.view === this && !e.dataSource.shareKey && this.context.dataFlow.removeDataSource(e.dataSource), this.paramRuntime.dispose(), this.namedDataScope.dispose(), this.flowHandle = void 0, this.context.dataFlow.loadingStatusRegistry.delete(this);
 	}
 	registerDisposer(e) {
 		this.#f.push(e);
@@ -1741,7 +1795,7 @@ var Ze = class {
 		}
 	}
 	configureViewOpacity() {
-		(!this.opacityFunction || this.opacityFunction === q) && (this.opacityFunction = tt(this));
+		(!this.opacityFunction || this.opacityFunction === K) && (this.opacityFunction = at(this));
 	}
 	finalizeParamRuntimeInitialization() {
 		this.#l === void 0 ? this.paramRuntime.finalizeInitialization() : this.#T();
@@ -1753,8 +1807,10 @@ var Ze = class {
 		return this.#s;
 	}
 	arrange(e, t, n = {}) {
-		if (n.firstFacet && this.facetCoords.clear(), this.facetCoords.set(n.facetId, m(t, f(n))), this.#a || this.#o) {
-			let e = this.getOverhang(), n = this.layoutParent ? k.zero() : this.getPadding();
+		if (this.layoutParent || this.visit((e) => {
+			e.layoutCoords = void 0;
+		}), this.layoutCoords = t, n.firstFacet && this.facetCoords.clear(), this.facetCoords.set(n.facetId, re(t, te(n))), this.#a || this.#o) {
+			let e = this.getOverhang(), n = this.layoutParent ? j.zero() : this.getPadding();
 			this.#a?.(t.width - e.width - n.width), this.#o?.(t.height - e.height - n.height);
 		}
 		this.#c = !0, this.#T();
@@ -1775,7 +1831,7 @@ var Ze = class {
 	}
 	getFacetFields(e) {
 		let t = this.getEncoding().sample;
-		return u(t) ? [t.field] : this.options.inheritEncoding ? this.layoutParent?.getFacetFields(this) : [];
+		return s(t) ? [t.field] : this.options.inheritEncoding ? this.layoutParent?.getFacetFields(this) : [];
 	}
 	usesSampleFacetRendering() {
 		return this.layoutParent?.usesSampleFacetRendering() ?? !1;
@@ -1787,15 +1843,23 @@ var Ze = class {
 		};
 	}
 	getScaleResolution(e) {
-		let t = o(e);
-		return this.getDataAncestors().map((e) => e.resolutions.scale[t]).find((e) => e);
+		return this.#E(e, "scale");
 	}
 	getAxisResolution(e) {
-		let t = o(e);
-		return this.getDataAncestors().map((e) => e.resolutions.axis[t]).find((e) => e);
+		return this.#E(e, "axis");
+	}
+	#E(e, t) {
+		let n = h(e);
+		for (let e of this.getDataAncestors()) {
+			let r = e.resolutions[t][n];
+			if (r || e.isResolutionBoundary(n)) return r;
+		}
+	}
+	isResolutionBoundary(e) {
+		return this.options.resolutionBoundaryChannels?.some((t) => t === h(e)) ?? !1;
 	}
 	getLegendResolution(e) {
-		let t = o(e);
+		let t = h(e);
 		return this.getDataAncestors().map((e) => e.resolutions.legend[t]).find((e) => e);
 	}
 	getConfiguredResolution(e, t) {
@@ -1808,17 +1872,17 @@ var Ze = class {
 		return "independent";
 	}
 	getBaseUrl() {
-		return j(() => this.dataParent?.getBaseUrl(), Ge(this.spec.baseUrl));
+		return N(() => this.dataParent?.getBaseUrl(), We(this.spec.baseUrl));
 	}
 	isPickingSupported() {
 		return !0;
 	}
 	getTitleText() {
 		let e = this.spec.title;
-		if (e) return te(e) ? e : n(e.text) ? this.paramRuntime.evaluateAndGet(e.text.expr) : e.text;
+		if (e) return u(e) ? e : l(e.text) ? this.paramRuntime.evaluateAndGet(e.text) : e.text;
 	}
 	_cache(e, t) {
-		return re(this, e, t);
+		return ae(this, e, t);
 	}
 	_invalidateCacheByPrefix(e, t = "self") {
 		switch (t) {
@@ -1836,15 +1900,15 @@ var Ze = class {
 	}
 	propagateInteraction(e) {}
 };
-function et(e) {
+function it(e) {
 	return "unitsPerPixel" in e;
 }
-function tt(e) {
+function at(e) {
 	let t = "opacity" in e.spec ? e.spec.opacity : void 0;
 	if (t !== void 0) {
-		if (s(t)) return (e) => e * t;
-		if (et(t)) {
-			let r = (t) => {
+		if (f(t)) return (e) => e * t;
+		if (it(t)) {
+			let n = (t) => {
 				let n = e.getScaleResolution(t), r = n?.getScale();
 				if ([
 					"linear",
@@ -1854,46 +1918,46 @@ function tt(e) {
 					scale: r,
 					scaleResolution: n
 				};
-			}, i = rt(t.values, "opacity.values", e);
-			if (!a(t.unitsPerPixel)) throw new _("\"opacity.unitsPerPixel\" must be an array.", e);
-			let o = () => 1, s = [], c = () => {
-				let t = nt(rt(s.map((e) => e()), "opacity.unitsPerPixel", e), i, e), n = ae().domain(t.unitsPerPixel).range(t.values).clamp(!0);
-				o = (e) => n(e);
+			}, r = st(t.values, "opacity.values", e);
+			if (!d(t.unitsPerPixel)) throw new _("\"opacity.unitsPerPixel\" must be an array.", e);
+			let i = () => 1, a = [], o = () => {
+				let t = ot(st(a.map((e) => e()), "opacity.unitsPerPixel", e), r, e), n = se().domain(t.unitsPerPixel).range(t.values).clamp(!0);
+				i = (e) => n(e);
 			};
-			s = t.unitsPerPixel.map((t) => {
-				if (n(t)) {
-					let n = e.paramRuntime.watchExpression(t.expr, () => {
-						c(), e.context.animator.requestRender();
+			a = t.unitsPerPixel.map((t) => {
+				if (l(t)) {
+					let n = e.paramRuntime.watchExpression(t, () => {
+						o(), e.context.animator.requestRender();
 					});
 					return () => n(null);
 				}
 				return () => t;
-			}), c();
-			let u = (e) => {
+			}), o();
+			let s = (e) => {
 				let t = e.scaleResolution.getAxisLength() || 1e3;
-				return l(e.scale.domain()) / t;
-			}, d;
+				return c(e.scale.domain()) / t;
+			}, u;
 			if (t.channel === "auto") {
-				let t = r("x"), n = r("y");
-				if (t && n) d = () => (u(t) + u(n)) / 2;
-				else if (t) d = () => u(t);
-				else if (n) d = () => u(n);
+				let t = n("x"), r = n("y");
+				if (t && r) u = () => (s(t) + s(r)) / 2;
+				else if (t) u = () => s(t);
+				else if (r) u = () => s(r);
 				else throw new _("Cannot find a resolved quantitative x or y scale for dynamic opacity!", e);
 			} else {
-				let n = t.channel ? r(t.channel) : r("x") ?? r("y");
-				if (!n) throw new _("Cannot find a resolved quantitative scale for dynamic opacity!", e);
-				d = () => u(n);
+				let r = t.channel ? n(t.channel) : n("x") ?? n("y");
+				if (!r) throw new _("Cannot find a resolved quantitative scale for dynamic opacity!", e);
+				u = () => s(r);
 			}
-			return (e) => o(d()) * e;
+			return (e) => i(u()) * e;
 		}
-		if (n(t)) {
-			let n = e.paramRuntime.watchExpression(t.expr, () => e.context.animator.requestRender());
+		if (l(t)) {
+			let n = e.paramRuntime.watchExpression(t, () => e.context.animator.requestRender());
 			return (e) => n(null) * e;
 		}
 	}
-	return q;
+	return K;
 }
-function nt(e, t, n) {
+function ot(e, t, n) {
 	if (!e.length) throw new _("\"opacity.unitsPerPixel\" must contain at least one stop.", n);
 	if (e.length !== t.length) throw new _("\"opacity.unitsPerPixel\" and \"opacity.values\" must have the same length.", n);
 	e.forEach((e, t) => {
@@ -1911,155 +1975,155 @@ function nt(e, t, n) {
 		values: a
 	};
 }
-function rt(e, t, n) {
-	if (!a(e)) throw new _("\"" + t + "\" must evaluate to an array.", n);
+function st(e, t, n) {
+	if (!d(e)) throw new _("\"" + t + "\" must evaluate to an array.", n);
 	return e.map((e, r) => {
-		if (!s(e) || !Number.isFinite(e)) throw new _("Invalid " + t + " value at index " + r + ". Expected a finite number.", n);
+		if (!f(e) || !Number.isFinite(e)) throw new _("Invalid " + t + " value at index " + r + ". Expected a finite number.", n);
 		return e;
 	});
 }
-var J = (e) => !!e && typeof e == "object" && "step" in e;
-function it(e) {
+var q = (e) => !!e && typeof e == "object" && "step" in e;
+function ct(e) {
 	return typeof e == "number" && Number.isFinite(e);
 }
-var Y = /* @__PURE__ */ new WeakMap(), X = /* @__PURE__ */ new WeakMap();
-function at(e, t) {
-	st(e, t, "Import");
+var J = /* @__PURE__ */ new WeakMap(), Y = /* @__PURE__ */ new WeakMap();
+function lt(e, t) {
+	dt(e, t, "Import");
 }
-function ot(e, t) {
-	st(e, t, "View");
+function ut(e, t) {
+	dt(e, t, "View");
 }
-function st(e, t, n) {
+function dt(e, t, n) {
 	if (t !== null && typeof t != "string") throw Error(n + " scope name must be a string or null.");
-	Y.set(e, { name: t });
+	J.set(e, { name: t });
 }
-function ct(e) {
-	return Y.get(e);
+function ft(e) {
+	return J.get(e);
 }
-function lt(e, t = {}) {
+function pt(e, t = {}) {
 	let n = t.skipSubtree ?? !1 ? "excludeSubtree" : "exclude";
-	X.set(e, n);
+	Y.set(e, n);
 }
-function ut(e, t = {}) {
-	qe(e, t.skipSubtree ?? !1 ? "excludeSubtree" : "exclude");
+function mt(e, t = {}) {
+	Je(e, t.skipSubtree ?? !1 ? "excludeSubtree" : "exclude");
 }
-function dt(e) {
-	return e.getLayoutAncestors().some(H);
+function ht(e) {
+	return e.getLayoutAncestors().some(Xe);
 }
-function Z(e) {
+function X(e) {
 	let t = e.getDataAncestors(), n = [];
 	for (let e = t.length - 1; e >= 0; --e) {
-		let r = Y.get(t[e]);
+		let r = J.get(t[e]);
 		r && typeof r.name == "string" && n.push(r.name);
 	}
 	return n;
 }
-function ft(e) {
+function gt(e) {
 	let t = e.explicitName;
 	if (!t) throw Error("Cannot build a selector for a view without a name.");
 	return {
-		scope: Z(e),
+		scope: X(e),
 		view: t
 	};
 }
-function pt(e, t) {
+function _t(e, t) {
 	if (!t) throw Error("Cannot build a selector for a parameter without a name.");
 	return {
-		scope: Z(e),
+		scope: X(e),
 		param: t
 	};
 }
-function mt(e) {
-	return St(e), "p:" + JSON.stringify({
+function vt(e) {
+	return Et(e), "p:" + JSON.stringify({
 		scope: e.scope,
 		param: e.param
 	});
 }
-function ht(e, t) {
+function yt(e, t) {
 	e.visit((e) => {
-		let n = Je(e);
-		if (n === "excludeSubtree") return G;
+		let n = Ye(e);
+		if (n === "excludeSubtree") return W;
 		if (n !== "exclude") return t(e);
 	});
 }
-function gt(e, t) {
+function bt(e, t) {
 	e.visit((e) => {
-		let n = X.get(e);
-		if (n === "excludeSubtree") return G;
+		let n = Y.get(e);
+		if (n === "excludeSubtree") return W;
 		if (n !== "exclude") return t(e);
 	});
 }
-function _t(e, t) {
-	if (Ct(t), !jt(e, t.scope)) return;
+function xt(e, t) {
+	if (Dt(t), !Ft(e, t.scope)) return;
 	let n = [];
-	if ($(e, t.scope, (e) => {
+	if (Q(e, t.scope, (e) => {
 		e.explicitName === t.view && n.push(e);
 	}, { includeNamedImportRoots: !0 }), n.length === 1) return n[0];
 	if (n.length !== 0) throw Error("View selector is ambiguous for view \"" + t.view + "\" in scope " + JSON.stringify(t.scope));
 }
-function vt(e, t) {
-	if (St(t), !jt(e, t.scope)) return;
+function St(e, t) {
+	if (Et(t), !Ft(e, t.scope)) return;
 	let n = [];
-	if ($(e, t.scope, (e) => {
-		for (let [r, i] of e.paramRuntime.paramConfigs) r === t.param && Q(i) && n.push({
+	if (Q(e, t.scope, (e) => {
+		for (let [r, i] of e.paramRuntime.paramConfigs) r === t.param && Z(i) && n.push({
 			view: e,
 			param: i
 		});
 	}), n.length === 1) return n[0];
 	if (n.length !== 0) throw Error("Param selector is ambiguous for param \"" + t.param + "\" in scope " + JSON.stringify(t.scope));
 }
-function yt(e, t) {
+function Ct(e, t) {
 	e.visit((e) => {
-		let n = X.get(e);
-		if (n === "excludeSubtree") return G;
-		if (n !== "exclude") for (let [n, r] of e.paramRuntime.paramConfigs) Q(r) && t({
+		let n = Y.get(e);
+		if (n === "excludeSubtree") return W;
+		if (n !== "exclude") for (let [n, r] of e.paramRuntime.paramConfigs) Z(r) && t({
 			view: e,
 			param: r,
-			selector: pt(e, n)
+			selector: _t(e, n)
 		});
 	});
 }
-function bt(e) {
+function wt(e) {
 	let t = [];
-	return yt(e, (e) => t.push(e)), t;
+	return Ct(e, (e) => t.push(e)), t;
 }
-function xt(e) {
+function Tt(e) {
 	let t = [];
-	for (let n of wt(e)) {
-		let r = Tt(n);
-		Dt(e, r, t), Ot(e, r, t);
+	for (let n of Ot(e)) {
+		let r = kt(n);
+		jt(e, r, t), Mt(e, r, t);
 	}
 	return t;
 }
-function St(e) {
+function Et(e) {
 	if (!e || !Array.isArray(e.scope)) throw Error("Param selector scope must be an array.");
 	if (typeof e.param != "string" || !e.param.length) throw Error("Param selector param must be a non-empty string.");
 }
-function Ct(e) {
+function Dt(e) {
 	if (!e || !Array.isArray(e.scope)) throw Error("View selector scope must be an array.");
 	if (typeof e.view != "string" || !e.view.length) throw Error("View selector view must be a non-empty string.");
 }
-function Q(e) {
-	return e.persist === !1 ? !1 : ne(e) ? !0 : r(e) ? !!e.bind : !1;
+function Z(e) {
+	return e.persist === !1 ? !1 : i(e) ? !0 : a(e) ? !!e.bind : !1;
 }
-function wt(e) {
+function Ot(e) {
 	let t = /* @__PURE__ */ new Set([e]);
 	return e.visit((e) => {
-		let n = Y.get(e);
+		let n = J.get(e);
 		n && typeof n.name == "string" && t.add(e);
 	}), Array.from(t);
 }
-function Tt(e) {
-	return Z(e);
+function kt(e) {
+	return X(e);
 }
-function Et(e) {
+function At(e) {
 	return e.length ? "import scope [" + e.join(" / ") + "]" : "import scope (root)";
 }
-function Dt(e, t, n) {
+function jt(e, t, n) {
 	let r = /* @__PURE__ */ new Map();
-	$(e, t, (e) => {
+	Q(e, t, (e) => {
 		for (let [t, n] of e.paramRuntime.paramConfigs) {
-			if (!Q(n)) continue;
+			if (!Z(n)) continue;
 			let i = r.get(t);
 			i ? i.push(e) : r.set(t, [e]);
 		}
@@ -2068,53 +2132,53 @@ function Dt(e, t, n) {
 		if (i.length <= 1) continue;
 		let r = i.map((e) => e.getPathString()).join(", ");
 		n.push({
-			message: "Bookmarkable parameter \"" + e + "\" is not unique within " + Et(t) + ". Found in: " + r + ".",
+			message: "Bookmarkable parameter \"" + e + "\" is not unique within " + At(t) + ". Found in: " + r + ".",
 			scope: t
 		});
 	}
 }
-function Ot(e, t, n) {
-	let r = kt(e, t);
+function Mt(e, t, n) {
+	let r = Nt(e, t);
 	if (!r.length) return;
-	let i = r.filter((e) => At(e));
+	let i = r.filter((e) => Pt(e));
 	if (i.length <= 1) return;
 	let a = /* @__PURE__ */ new Map();
 	for (let e of i) {
-		let t = Y.get(e), n = t ? t.name : void 0;
+		let t = J.get(e), n = t ? t.name : void 0;
 		typeof n == "string" && n.length && a.set(n, (a.get(n) ?? 0) + 1);
 	}
 	for (let [e, r] of a) r > 1 && n.push({
-		message: "Import instance name \"" + e + "\" is used multiple times for addressable instances in " + Et(t) + ".",
+		message: "Import instance name \"" + e + "\" is used multiple times for addressable instances in " + At(t) + ".",
 		scope: t
 	});
 }
-function kt(e, t) {
+function Nt(e, t) {
 	let n = [];
-	return $(e, t, (e) => {
-		if (Z(e).length !== t.length + 1) return;
-		let r = Y.get(e);
+	return Q(e, t, (e) => {
+		if (X(e).length !== t.length + 1) return;
+		let r = J.get(e);
 		r && typeof r.name == "string" && n.push(e);
 	}, { includeNamedImportRoots: !0 }), n;
 }
-function At(e) {
+function Pt(e) {
 	let t = !1;
 	return e.visit((e) => {
-		let n = X.get(e);
-		if (n === "excludeSubtree") return G;
+		let n = Y.get(e);
+		if (n === "excludeSubtree") return W;
 		if (n !== "exclude") {
-			for (let n of e.paramRuntime.paramConfigs.values()) if (Q(n)) return t = !0, K;
+			for (let n of e.paramRuntime.paramConfigs.values()) if (Z(n)) return t = !0, G;
 		}
 	}), t;
 }
-function jt(e, t) {
+function Ft(e, t) {
 	let n = e, r = [];
 	for (let i of t) {
 		if (typeof i != "string" || !i.length) throw Error("Scope names must be non-empty strings.");
 		let t, a = !1;
-		if ($(e, r, (e) => {
-			let n = Y.get(e);
-			if (n && n.name === i && Z(e).length === r.length + 1) {
-				if (t) return a = !0, K;
+		if (Q(e, r, (e) => {
+			let n = J.get(e);
+			if (n && n.name === i && X(e).length === r.length + 1) {
+				if (t) return a = !0, G;
 				t = e;
 			}
 		}, { includeNamedImportRoots: !0 }), a) throw Error("Multiple import instances named \"" + i + "\" in scope.");
@@ -2123,25 +2187,25 @@ function jt(e, t) {
 	}
 	return n;
 }
-function $(e, t, n, r = {}) {
+function Q(e, t, n, r = {}) {
 	let i = r.includeNamedImportRoots ?? !1;
 	e.visit((e) => {
-		let r = Y.get(e), a = X.get(e);
-		if (a === "excludeSubtree") return G;
-		if (a !== "exclude" && Mt(e, t, r, i)) return n(e);
+		let r = J.get(e), a = Y.get(e);
+		if (a === "excludeSubtree") return W;
+		if (a !== "exclude" && It(e, t, r, i)) return n(e);
 	});
 }
-function Mt(e, t, n, r) {
-	let i = Z(e);
-	return Nt(i, t) ? !0 : !r || !n || typeof n.name != "string" || i.length !== t.length + 1 ? !1 : Pt(t, i);
+function It(e, t, n, r) {
+	let i = X(e);
+	return Lt(i, t) ? !0 : !r || !n || typeof n.name != "string" || i.length !== t.length + 1 ? !1 : $(t, i);
 }
-function Nt(e, t) {
-	return e.length === t.length && Pt(e, t);
+function Lt(e, t) {
+	return e.length === t.length && $(e, t);
 }
-function Pt(e, t) {
+function $(e, t) {
 	if (e.length > t.length) return !1;
 	for (let n = 0; n < e.length; n++) if (e[n] !== t[n]) return !1;
 	return !0;
 }
 //#endregion
-export { M as A, ce as B, We as C, Fe as D, Re as E, b as F, fe as H, de as I, le as L, k as M, be as N, N as O, y as P, D as R, B as S, Le as T, ue as U, he as V, K as _, dt as a, H as b, lt as c, vt as d, _t as f, G as g, ht as h, ft as i, Se as j, j as k, at as l, gt as m, ct as n, mt as o, xt as p, Z as r, ut as s, bt as t, ot as u, $e as v, Be as w, U as x, Ye as y, E as z };
+export { P as A, D as B, Ue as C, Fe as D, Re as E, S as F, ve as G, le as H, k as I, pe as K, T as L, j as M, xe as N, F as O, x as P, fe as R, qe as S, Le as T, _e as U, E as V, b as W, G as _, ht as a, Xe as b, pt as c, St as d, xt as f, W as g, yt as h, gt as i, Ce as j, N as k, lt as l, bt as m, ft as n, vt as o, Tt as p, de as q, X as r, mt as s, wt as t, ut as u, rt as v, B as w, Ze as x, $e as y, ue as z };