@genome-spy/app 0.86.0 → 0.87.0

package/dist/{viewSelectors-D_imtq5Z.js → viewSelectors-DYYlOt91.js}

@@ -1,5 +1,5 @@
-import { I as e, J as t, Jt as n, L as r, Mt as i, Nt as a, Ot as o, f as s, h as c, jt as l, l as u, o as d, p as f, rt as p, t as m, u as h, zt as ee } from "./clipOptions-taFzEljc.js";
-import { E as te, at as ne, m as g, y as _ } from "./vega-scale-D46-iCaL.js";
+import { C as e, E as t, Ht as n, J as r, S as i, Ut as a, Wt as o, Xt as s, an as c, at as l, b as u, mt as d, o as f, q as p, t as m, y as h, zt as g } from "./clipOptions-H68pJyEZ.js";
+import { E as ee, it as te, m as ne, y as _ } from "./vega-scale-BGC53c22.js";
 import { a as v, n as re, r as ie, t as y } from "./viewError-BiR9VCgL.js";
 //#region ../../node_modules/flatqueue/index.js
 var b = class {
@@ -43,13 +43,11 @@ var b = class {
 	shrink() {
 		Array.isArray(this.ids) && (this.ids.length = this.length), Array.isArray(this.values) && (this.values.length = this.length);
 	}
-}, x = Symbol("runtimeNode"), ae = 1e6;
-function oe(e) {
-	return e ? (t, n) => {
-		e.addDisposer(t, n);
-	} : () => void 0;
+}, x = Symbol("runtimeNode"), S = 1e6;
+function ae(e) {
+	return e ? (t, n) => e.addDisposer(t, n) : () => () => void 0;
 }
-function se(e, t) {
+function C(e, t) {
 	let n = {
 		id: e.id,
 		name: e.name,
@@ -72,31 +70,37 @@ function se(e, t) {
 		t(e);
 	} }) : n;
 }
-function ce(e) {
+function oe(e) {
 	let t = e[x];
 	if (!t) throw Error("ParamRef is not bound to this graph runtime. Expected runtime-created ref.");
 	return t;
 }
-function le(e) {
-	return typeof e.rank == "number" ? e.rank : ce(e).rank;
+function se(e) {
+	return typeof e.rank == "number" ? e.rank : oe(e).rank;
 }
-function ue(e) {
+function ce(e) {
 	for (let t of e) t();
 }
-var de = class {
+var le = class {
 	#e = 1;
 	#t = 1;
 	#n = 0;
-	#r = !1;
+	#r = 0;
 	#i = !1;
-	#a = /* @__PURE__ */ new Set();
-	#o = /* @__PURE__ */ new Set();
-	#s = new b();
-	#c = new b();
-	#l = /* @__PURE__ */ new Set();
-	#u;
+	#a = !1;
+	#o = !1;
+	#s = 0;
+	#c = !1;
+	#l = /* @__PURE__ */ new Map();
+	#u = /* @__PURE__ */ new Map();
+	#d = /* @__PURE__ */ new Set();
+	#f = /* @__PURE__ */ new Set();
+	#p = new b();
+	#m = new b();
+	#h = /* @__PURE__ */ new Set();
+	#g;
 	constructor(e = {}) {
-		this.#u = oe(e.lifecycleRegistry);
+		this.#g = ae(e.lifecycleRegistry);
 	}
 	createWritable(e, t, n, r, i = {}) {
 		let a = "n" + this.#e++, o = i.notify ?? !0, s = {
@@ -112,121 +116,219 @@ var de = class {
 					s.listeners.delete(e);
 				};
 			}
-		};
-		return this.#u(e, () => {
-			s.disposed = !0, s.listeners.clear();
-		}), se(s, (e) => {
+		}, c = (e) => {
 			if (s.disposed) throw Error("Cannot set disposed parameter \"" + t + "\" (" + a + ").");
-			e !== s.value && (s.value = e, o && ue(s.listeners));
-		});
+			e !== s.value && (s.value = e, o && this.#v(s.listeners));
+		}, l = () => {
+			s.disposed = !0, s.listeners.clear(), u();
+		}, u = this.#g(e, l);
+		return Object.assign(C(s, c), { dispose: l });
 	}
-	computed(e, t, n, r) {
-		let i = n.reduce((e, t) => Math.max(e, le(t)), 0), a = {
+	computed(e, t, n, r, i = {}) {
+		return this.#_(e, t, n, r, i);
+	}
+	operation(e, t, n, r, i, a = {}) {
+		return this.#_(e, t, n, r, a, i);
+	}
+	#_(e, t, n, r, i, a) {
+		let o = this.#b(() => s.dependencies), s = {
 			id: "n" + this.#e++,
 			name: t,
 			kind: "derived",
-			rank: i + 1,
+			get rank() {
+				return o();
+			},
+			dependencies: n,
 			value: r(),
 			disposed: !1,
 			listeners: /* @__PURE__ */ new Set(),
 			fn: r,
+			apply: a,
+			equals: i.equals ?? ((e, t) => e === t),
 			subscribe(e) {
-				return a.listeners.add(e), () => {
-					a.listeners.delete(e);
+				return s.listeners.add(e), () => {
+					s.listeners.delete(e);
 				};
 			}
-		}, o = n.map((e) => e.subscribe(() => {
-			a.disposed || (this.#d(a), e.propagation === "sync" && this.flushNow());
-		}));
-		return this.#u(e, () => {
-			a.disposed || (a.disposed = !0, o.forEach((e) => e()), a.listeners.clear(), this.#a.delete(a));
-		}), se(a);
+		};
+		a?.(s.value);
+		let c = () => s.dependencies.map((e) => e.subscribe(() => {
+			s.disposed || (this.#x(s), e.propagation === "sync" && this.flushNow());
+		})), 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(C(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[x];
+					if (n === s) throw Error("Reactive dependency cycle: " + t);
+					if (!r.has(n)) {
+						r.add(n);
+						for (let e of n?.dependencies ?? []) i(e);
+					}
+				};
+				e.forEach(i), l.forEach((e) => e()), s.dependencies = e, s.fn = n, this.#n++, l = c(), this.#x(s), this.#p.clear();
+				for (let e of this.#d) this.#p.push(e, this.#C(e.rank));
+				this.#m.clear();
+				for (let e of this.#f) this.#m.push(e, this.#C(e.rank));
+			}
+		});
 	}
 	effect(e, t, n) {
-		let r = t.reduce((e, t) => Math.max(e, le(t)), 0), i = {
+		let r = this.#b(() => t), i = {
 			id: "n" + this.#e++,
-			rank: r + 1,
+			get rank() {
+				return r();
+			},
 			disposed: !1,
 			fn: n
-		}, a = () => {
-			i.disposed || this.#f(i);
-		}, o = t.map((e) => e.subscribe(a)), s = () => {
-			i.disposed || (i.disposed = !0, o.forEach((e) => e()), this.#o.delete(i));
-		};
-		return this.#u(e, s), s;
+		}, a = t.map((e) => e.subscribe(() => {
+			i.disposed || (this.#S(i), e.propagation === "sync" && this.flushNow());
+		})), o = () => {
+			i.disposed || (i.disposed = !0, s(), a.forEach((e) => e()), this.#f.delete(i));
+		}, s = this.#g(e, o);
+		return o;
 	}
 	runInTransaction(e) {
-		this.#n += 1;
+		this.#r += 1;
 		try {
 			return e();
 		} finally {
-			--this.#n, this.#n === 0 && this.#m();
+			--this.#r, this.#r === 0 && (this.#i ? (this.#i = !1, this.flushNow()) : this.#w());
 		}
 	}
-	flushNow() {
-		if (!(this.#n > 0 || this.#i)) {
-			this.#r = !1, this.#i = !0;
-			try {
-				let e = !0;
-				for (; e;) {
-					for (e = !1; this.#s.length > 0;) {
-						e = !0;
-						let t = this.#s.pop();
-						if (this.#a.delete(t), t.disposed) continue;
-						let n = t.value, r = t.fn();
-						r !== n && (t.value = r, ue(t.listeners));
+	flushNow({ afterTransaction: e = !1 } = {}) {
+		if (e && this.#r > 0 && (this.#i = !0), this.#s > 0) {
+			this.#c = !0;
+			return;
+		}
+		if (this.#r > 0 || this.#o) return;
+		this.#a = !1, this.#o = !0;
+		let t;
+		try {
+			for (; this.#p.length || this.#l.size || this.#m.length;) {
+				for (; this.#p.length;) {
+					let e = this.#p.pop();
+					if (this.#d.delete(e), e.disposed) continue;
+					this.#y(e, e.name);
+					let t, n;
+					try {
+						t = e.fn(), n = !e.equals(t, e.value), n && e.apply?.(t);
+					} catch (t) {
+						throw this.#x(e), t;
 					}
-					for (; this.#c.length > 0;) {
-						e = !0;
-						let t = this.#c.pop();
-						this.#o.delete(t), !t.disposed && t.fn();
+					n && (e.value = t, this.#v(e.listeners));
+				}
+				if (this.#l.size) {
+					let e = Infinity, n;
+					for (let [t, { rank: r }] of this.#l) r < e && (n = t, e = r);
+					let r = /* @__PURE__ */ new Set();
+					for (;;) {
+						if (r.has(n)) throw Error("Cyclic streaming publication dependencies");
+						r.add(n);
+						let e;
+						for (let t of this.#l.get(n).prerequisites?.() ?? []) if (this.#l.has(t)) {
+							e = t;
+							break;
+						}
+						if (!e) break;
+						n = e;
 					}
+					t = this.#l.get(n).onError, this.#l.delete(n), this.#y(n, "streaming update"), n(), t = void 0;
+				} else if (this.#m.length) {
+					let e = this.#m.pop();
+					this.#f.delete(e), e.disposed || (this.#y(e, "effect " + e.id), e.fn());
 				}
-			} finally {
-				this.#i = !1, this.#g();
 			}
+		} catch (e) {
+			let n = Array.from(this.#l.values());
+			this.#l.clear(), t?.(e);
+			for (let t of n) t.onError?.(e);
+			for (let t of this.#h) t.reject(e);
+			throw this.#h.clear(), e;
+		} finally {
+			this.#u.clear(), this.#o = !1, this.#E();
+		}
+	}
+	requestUpdate(e, t = 0, n, r) {
+		this.#l.set(e, {
+			rank: t,
+			onError: n,
+			prerequisites: r
+		}), this.#w();
+	}
+	cancelUpdate(e) {
+		this.#l.delete(e);
+	}
+	#v(e) {
+		this.#s++;
+		try {
+			ce(e);
+		} finally {
+			this.#s--, !this.#s && this.#c && (this.#c = !1, this.flushNow());
 		}
 	}
+	#y(e, t) {
+		let n = (this.#u.get(e) ?? 0) + 1;
+		if (n > 100) throw Error("Reactive propagation did not settle: " + t);
+		this.#u.set(e, n);
+	}
 	whenPropagated(e = {}) {
-		if (this.#h()) return Promise.resolve();
+		if (this.#T()) return Promise.resolve();
 		let { signal: t, timeoutMs: n } = e;
 		return t?.aborted ? Promise.reject(/* @__PURE__ */ Error("whenPropagated aborted")) : new Promise((e, r) => {
-			let i = {
-				resolve: e,
-				reject: r
-			};
-			t && (i.abortHandler = () => {
-				this.#l.delete(i), r(/* @__PURE__ */ Error("whenPropagated aborted"));
-			}, t.addEventListener("abort", i.abortHandler, { once: !0 })), n != null && (i.timeoutId = setTimeout(() => {
-				this.#l.delete(i), i.abortHandler && t?.removeEventListener("abort", i.abortHandler), r(/* @__PURE__ */ Error("whenPropagated timeout after " + n + " ms"));
-			}, n)), this.#l.add(i);
+			let i, a = () => {
+				this.#h.delete(o), t?.removeEventListener("abort", s), i !== void 0 && clearTimeout(i);
+			}, o = {
+				resolve: () => {
+					a(), e();
+				},
+				reject: (e) => {
+					a(), r(e);
+				}
+			}, s = () => o.reject(/* @__PURE__ */ Error("whenPropagated aborted"));
+			t?.addEventListener("abort", s, { once: !0 }), n != null && (i = setTimeout(() => o.reject(/* @__PURE__ */ Error("whenPropagated timeout after " + n + " ms")), n)), this.#h.add(o);
 		});
 	}
-	#d(e) {
-		this.#a.has(e) || (this.#a.add(e), this.#s.push(e, this.#p(e.rank)), this.#m());
+	#b(e) {
+		let t = -1, n = 0;
+		return () => (t !== this.#n && (n = 1 + e().reduce((e, t) => Math.max(e, se(t)), 0), t = this.#n), n);
+	}
+	#x(e) {
+		if (this.#d.has(e)) {
+			this.#w();
+			return;
+		}
+		this.#d.add(e), this.#p.push(e, this.#C(e.rank)), this.#w();
 	}
-	#f(e) {
-		this.#o.has(e) || (this.#o.add(e), this.#c.push(e, this.#p(e.rank)), this.#m());
+	#S(e) {
+		if (this.#f.has(e)) {
+			this.#w();
+			return;
+		}
+		this.#f.add(e), this.#m.push(e, this.#C(e.rank)), this.#w();
 	}
-	#p(e) {
-		let t = this.#t % ae;
-		return this.#t += 1, e * ae + t;
+	#C(e) {
+		let t = this.#t % S;
+		return this.#t += 1, e * S + t;
 	}
-	#m() {
-		this.#n > 0 || this.#r || this.#i || (this.#r = !0, queueMicrotask(() => {
-			this.flushNow();
+	#w() {
+		this.#r > 0 || this.#a || this.#o || (this.#a = !0, queueMicrotask(() => {
+			this.#a && this.flushNow();
 		}));
 	}
-	#h() {
-		return this.#n === 0 && !this.#r && !this.#i && this.#s.length === 0 && this.#c.length === 0 && this.#a.size === 0 && this.#o.size === 0;
+	#T() {
+		return this.#r === 0 && !this.#a && !this.#o && this.#p.length === 0 && this.#m.length === 0 && this.#d.size === 0 && this.#f.size === 0 && this.#l.size === 0;
 	}
-	#g() {
-		if (this.#h()) {
-			for (let e of this.#l) e.timeoutId && clearTimeout(e.timeoutId), e.resolve();
-			this.#l.clear();
+	#E() {
+		if (this.#T()) {
+			for (let e of this.#h) e.resolve();
+			this.#h.clear();
 		}
 	}
-}, fe = class {
+}, ue = class {
 	#e = 1;
 	#t = /* @__PURE__ */ new Map();
 	createOwner(e, t) {
@@ -236,7 +338,9 @@ var de = class {
 	addDisposer(e, t) {
 		let n = this.#t.get(e);
 		if (!n) throw Error("Unknown owner: " + e);
-		n.add(t);
+		return n.add(t), () => {
+			n.delete(t);
+		};
 	}
 	disposeOwner(e) {
 		let t = this.#t.get(e);
@@ -245,13 +349,14 @@ var de = class {
 			t.clear(), this.#t.delete(e);
 		}
 	}
-}, pe = class {
+}, de = class {
 	#e = 1;
 	#t = /* @__PURE__ */ new Map();
 	createRootScope(e) {
 		let t = "scope:" + this.#e++;
 		return this.#t.set(t, {
 			params: /* @__PURE__ */ new Map(),
+			initializers: /* @__PURE__ */ new Map(),
 			ownerId: e
 		}), t;
 	}
@@ -261,6 +366,7 @@ var de = class {
 		return this.#t.set(n, {
 			parentScope: t,
 			params: /* @__PURE__ */ new Map(),
+			initializers: /* @__PURE__ */ new Map(),
 			ownerId: e
 		}), n;
 	}
@@ -272,36 +378,57 @@ var de = class {
 	clearScope(e) {
 		let t = this.#t.get(e);
 		if (!t) throw Error("Unknown scope: " + e);
-		t.params.clear();
-	}
-	register(e, t, n) {
-		c(t);
-		let r = this.#t.get(e);
-		if (!r) throw Error("Unknown scope: " + e);
-		if (r.params.has(t)) throw Error("Parameter \"" + t + "\" already exists in scope " + e);
-		return r.params.set(t, n), n;
+		t.params.clear(), t.initializers.clear();
+	}
+	registerInitializer(e, n, r) {
+		t(n);
+		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, {
+			initialize: r,
+			initializing: !1
+		});
 	}
-	resolve(e, t) {
-		c(t);
-		let n = e;
-		for (; n;) {
-			let e = this.#t.get(n);
-			if (!e) throw Error("Unknown scope: " + n);
-			let r = e.params.get(t);
-			if (r) return r;
-			n = e.parentScope;
+	register(e, n, r) {
+		t(n);
+		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;
+	}
+	resolve(e, n) {
+		t(n);
+		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;
+				try {
+					if (t.initialize(), !e.params.has(n)) throw Error(`Initializer did not register parameter "${n}".`);
+					e.initializers.delete(n);
+				} finally {
+					t.initializing = !1;
+				}
+			}
+			let i = e.params.get(n);
+			if (i) return i;
+			r = e.parentScope;
 		}
 	}
 };
 //#endregion
 //#region ../core/src/paramRuntime/expressionCompiler.js
-function me(e, t = {}, n = {}) {
+function fe(e, t = {}, n = {}) {
 	return r(e, t, n);
 }
 //#endregion
 //#region ../core/src/paramRuntime/expressionRef.js
-function he(e, t, n = {}) {
-	let r = {}, i = me(e, r, n), a = /* @__PURE__ */ new Map();
+function pe(e, t, n = {}) {
+	let r = {}, i = fe(e, r, n), a = /* @__PURE__ */ new Map();
 	for (let n of i.globals) {
 		if (a.has(n)) continue;
 		let i = t(n);
@@ -325,17 +452,17 @@ function he(e, t, n = {}) {
 	}, i.invalidate = () => {
 		for (let e of o) e();
 		o.clear();
-	}, i.identifier = () => i.code + "|" + Array.from(a.values()).map((e) => e.id).concat((i.scaleDependencies ?? []).map((e) => e.id)).join(","), {
+	}, 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: Array.from(a.values()).concat(i.scaleDependencies ?? [])
+		dependencies: i.dependencies
 	};
 }
 //#endregion
 //#region ../core/src/paramRuntime/paramRuntime.js
-var ge = class {
-	#e = new fe();
-	#t = new de({ lifecycleRegistry: this.#e });
-	#n = new pe();
+var me = class {
+	#e = new ue();
+	#t = new le({ lifecycleRegistry: this.#e });
+	#n = new de();
 	createScope(e) {
 		let t = this.#e.createOwner("scope", e ?? "root");
 		return e ? this.#n.createChildScope(t, e) : this.#n.createRootScope(t);
@@ -348,6 +475,9 @@ var ge = class {
 		let n = this.#n.getOwnerId(e);
 		this.#e.addDisposer(n, t);
 	}
+	registerInitializer(e, t, n) {
+		this.#n.registerInitializer(e, t, n);
+	}
 	registerBase(e, t, n, r) {
 		let i = this.#n.getOwnerId(e), a = this.#t.createWritable(i, t, "base", n, r);
 		return this.#n.register(e, t, a);
@@ -357,30 +487,48 @@ var ge = class {
 		return this.#n.register(e, t, a);
 	}
 	registerDerived(e, t, n, r) {
-		let { expression: i, dependencies: a } = he(n, (t) => this.resolve(e, t), r), o = this.#n.getOwnerId(e), s = this.#t.computed(o, t, a, () => i(null));
+		let { expression: i, dependencies: a } = pe(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 } = he(t, (t) => this.resolve(e, t), n);
+		let { expression: r } = pe(t, (t) => this.resolve(e, t), n);
 		return r;
 	}
 	resolve(e, t) {
 		return this.#n.resolve(e, t);
 	}
+	signal(e, t, n) {
+		return this.#t.createWritable(this.#n.getOwnerId(e), t, "base", n);
+	}
+	computed(e, t, n, r, i) {
+		return this.#t.computed(this.#n.getOwnerId(e), t, n, r, i);
+	}
+	operation(e, t, n, r, i, a) {
+		return this.#t.operation(this.#n.getOwnerId(e), t, n, r, i, a);
+	}
+	effect(e, t, n) {
+		return this.#t.effect(this.#n.getOwnerId(e), t, n);
+	}
+	requestUpdate(e, t = 0, n, r) {
+		this.#t.requestUpdate(e, t, n, r);
+	}
+	cancelUpdate(e) {
+		this.#t.cancelUpdate(e);
+	}
 	runInTransaction(e) {
 		return this.#t.runInTransaction(e);
 	}
-	flushNow() {
-		this.#t.flushNow();
+	flushNow(e) {
+		this.#t.flushNow(e);
 	}
 	whenPropagated(e) {
 		return this.#t.whenPropagated(e);
 	}
-}, _e = (e) => new Promise((t) => setTimeout(t, e));
-function ve() {
+}, he = (e) => new Promise((t) => setTimeout(t, e));
+function ge() {
 	return { canceled: !1 };
 }
-function ye(e) {
+function _e(e) {
 	let t = e.requestAnimationFrame || window.requestAnimationFrame, n = e.signal, r = e.cancelToken, i = () => new Promise((i, a) => {
 		if (r?.canceled) return i();
 		if (n?.aborted) return a("aborted");
@@ -393,11 +541,11 @@ function ye(e) {
 		};
 		t(m);
 	});
-	return e.delay ? r?.canceled ? Promise.resolve() : n?.aborted ? Promise.reject("aborted") : _e(e.delay).then(i) : i();
+	return e.delay ? r?.canceled ? Promise.resolve() : n?.aborted ? Promise.reject("aborted") : he(e.delay).then(i) : i();
 }
 //#endregion
 //#region ../core/src/utils/animator.js
-var be = class {
+var ve = class {
 	constructor(e) {
 		this._renderCallback = e, this._renderRequested = !1, this._finalized = !1, this._warn = !1, this._animationFrameRequest = void 0, this.transitions = [], this.transitionsEnabled = !0;
 	}
@@ -423,13 +571,13 @@ var be = class {
 		this._finalized = !0, this._renderRequested = !1, this.transitions = [], this._animationFrameRequest !== void 0 && (window.cancelAnimationFrame(this._animationFrameRequest), this._animationFrameRequest = void 0);
 	}
 	transition(e) {
-		return ye({
+		return _e({
 			requestAnimationFrame: (e) => this.requestTransition(e),
 			...e
 		});
 	}
 };
-function xe(e, t, n, r, i) {
+function w(e, t, n, r, i) {
 	let a = 0, o = !0, s = !1, c = structuredClone(i), l = c;
 	function u(e, t, n, r) {
 		return t + (e - t) * 2 ** (-n / r);
@@ -448,7 +596,7 @@ function xe(e, t, n, r, i) {
 		s || (s = !0, e.requestTransition(d));
 	}
 	function p(n) {
-		l = n, e.transitionsEnabled === !1 ? (c = l, o = !0, s = !1, e.cancelTransition(d), t(c)) : o && (o = !1, a = Se(), d(a));
+		l = n, e.transitionsEnabled === !1 ? (c = l, o = !0, s = !1, e.cancelTransition(d), t(c)) : o && (o = !1, a = ye(), d(a));
 	}
 	return p.stop = () => {
 		o = !0, s = !1, e.cancelTransition(d);
@@ -456,13 +604,13 @@ function xe(e, t, n, r, i) {
 		l = e, c = e, p.stop(), t(c);
 	}, p;
 }
-function Se() {
+function ye() {
 	let e = globalThis.document?.timeline?.currentTime;
 	return typeof e == "number" ? e : performance.now();
 }
 //#endregion
 //#region ../core/src/paramRuntime/viewParamRuntime.js
-var S = class {
+var be = class {
 	#e;
 	#t;
 	#n = /* @__PURE__ */ new Map();
@@ -477,13 +625,37 @@ var S = class {
 	constructor(e, t, n, r = {}) {
 		this.#o = e ?? (() => void 0), this.#s = t ?? (() => void 0), this.#c = n, this.#l = r.snapTransitionedUpdates ?? !1;
 		let i = this.#o();
-		i ? (this.#e = i.#e, this.#t = this.#e.createScope(i.#t)) : (this.#e = new ge(), this.#t = this.#e.createScope());
+		i ? (this.#e = i.#e, this.#t = this.#e.createScope(i.#t)) : (this.#e = new me(), this.#t = this.#e.createScope());
+	}
+	registerParam(e, n = {}) {
+		let r = e.name;
+		if (t(r), this.#i.has(r)) throw Error("Parameter \"" + r + "\" already registered in this scope.");
+		if (Se(e), n.defer) {
+			if (!("expr" in e)) throw Error("Only expression parameters can be deferred.");
+			return this.#e.registerInitializer(this.#t, r, () => {
+				this.#d(e);
+			}), this.#i.set(r, e), () => {
+				throw Error("Cannot set derived parameter \"" + r + "\".");
+			};
+		}
+		return this.#d(e);
+	}
+	registerScopedExpression(e, t, n) {
+		if (this.#e !== n.#e) throw Error("Scoped expressions must share a parameter runtime.");
+		if (this.#i.has(e)) throw Error("Parameter \"" + e + "\" already registered in this scope.");
+		this.#e.registerInitializer(this.#t, e, () => {
+			let r = this.#e.registerDerived(this.#t, e, t, {
+				expressionScope: n.#t,
+				resolveScaleResolution: n.#s
+			});
+			this.#r.set(e, r);
+		}), this.#i.set(e, {
+			name: e,
+			expr: t
+		});
 	}
-	registerParam(e) {
-		let t = e.name;
-		if (c(t), this.#i.has(t)) throw Error("Parameter \"" + t + "\" already registered in this scope.");
-		we(e);
-		let n, r;
+	#d(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!`);
@@ -492,10 +664,10 @@ var S = class {
 			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 = u(e, this), n(r));
-		} else if ("value" in e) r = u(e, this), n = "transition" in e ? this.#f(t, r, e.transition) : this.#d(t, r);
+			}, 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.#p(t, r, e.transition) : this.#f(t, r);
 		else if ("expr" in e) {
-			if ("transition" in e) this.#p(t, e.expr, e.transition);
+			if ("transition" in e) this.#m(t, e.expr, e.transition);
 			else {
 				let n = this.#e.registerDerived(this.#t, t, e.expr, { resolveScaleResolution: this.#s });
 				this.#r.set(t, n);
@@ -503,9 +675,9 @@ var S = class {
 			n = () => {
 				throw Error("Cannot set derived parameter \"" + t + "\".");
 			};
-		} else r = u(e, this), n = this.#d(t, r);
+		} else r = h(e, this), n = this.#f(t, r);
 		if ("select" in e) {
-			if (r ??= u(e, this), !this.#n.has(t)) {
+			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) => {
 					e.set(t), this.#e.flushNow();
@@ -515,34 +687,34 @@ var S = class {
 		}
 		return this.#i.set(t, e), n;
 	}
-	allocateSetter(e, t, n = !1) {
-		if (c(e), this.#n.has(e)) throw Error("Setter already allocated for parameter: " + e);
-		let r = this.#e.registerBase(this.#t, e, t, { notify: !n });
-		this.#r.set(e, r);
-		let i = (e) => {
-			r.set(e), this.#e.flushNow();
+	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 });
+		this.#r.set(e, i);
+		let a = (e) => {
+			i.set(e), this.#e.flushNow();
 		};
-		return this.#n.set(e, i), i;
+		return this.#n.set(e, a), a;
 	}
-	setValue(e, t, n) {
-		c(e);
-		let r = this.#n.get(e);
-		if (!r) throw Error("Writable parameter not found in this scope: " + e);
-		r(t, n);
+	setValue(e, n, r) {
+		t(e);
+		let i = this.#n.get(e);
+		if (!i) throw Error("Writable parameter not found in this scope: " + e);
+		i(n, r);
 	}
 	getValue(e) {
-		return this.#r.get(e)?.get();
+		return !this.#r.has(e) && this.hasLocalParam(e) && this.#e.resolve(this.#t, e), this.#r.get(e)?.get();
 	}
 	getTargetValue(e) {
-		return c(e), this.#a.get(e)?.target ?? this.getValue(e);
+		return t(e), this.#a.get(e)?.target ?? this.getValue(e);
 	}
-	subscribe(e, t) {
-		c(e);
-		let n = this.findRuntimeForParam(e);
-		if (!n) throw Error("Parameter not found: " + e);
-		let r = n.#r.get(e);
-		if (!r) throw Error("Parameter found without local reference: " + e);
-		return r.subscribe(t);
+	subscribe(e, n) {
+		t(e);
+		let r = this.findRuntimeForParam(e);
+		if (!r) throw Error("Parameter not found: " + e);
+		let i = r.#e.resolve(r.#t, e);
+		if (!i) throw Error("Parameter found without local reference: " + e);
+		return i.subscribe(n);
 	}
 	findValue(e) {
 		return this.findRuntimeForParam(e)?.getValue(e);
@@ -554,13 +726,19 @@ var S = class {
 		return this.#i;
 	}
 	hasLocalParam(e) {
-		return c(e), this.#r.has(e);
+		t(e);
+		let n = this.#i.get(e);
+		return this.#r.has(e) || n !== void 0 && "expr" in n;
+	}
+	isPendingParam(e) {
+		let t = this.findRuntimeForParam(e);
+		return t !== void 0 && !t.#r.has(e);
 	}
 	hasConfiguredParamInScopeChain(e) {
-		return c(e), this.#i.has(e) ? !0 : this.#o()?.hasConfiguredParamInScopeChain(e) ?? !1;
+		return t(e), this.#i.has(e) ? !0 : this.#o()?.hasConfiguredParamInScopeChain(e) ?? !1;
 	}
 	findRuntimeForParam(e) {
-		return this.#r.has(e) ? this : this.#o()?.findRuntimeForParam(e);
+		return this.hasLocalParam(e) ? this : this.#o()?.findRuntimeForParam(e);
 	}
 	getDebugState() {
 		let e = [];
@@ -568,7 +746,7 @@ var S = class {
 			let r = this.#i.get(t);
 			e.push({
 				name: t,
-				kind: Ce(r),
+				kind: xe(r),
 				value: n.get(),
 				writable: this.#n.has(t),
 				configured: !!r,
@@ -589,7 +767,28 @@ var S = class {
 		let r = this.createExpression(e), i = r.subscribe(t);
 		return (n.scopeOwned ?? !0) && this.#e.addScopeDisposer(this.#t, i), n.registerDisposer?.(i), r;
 	}
-	#d(e, t) {
+	signal(e, t) {
+		return this.#e.signal(this.#t, e, t);
+	}
+	computed(e, t, n, r) {
+		return this.#e.computed(this.#t, e, t, n, r);
+	}
+	operation(e, t, n, r, i) {
+		return this.#e.operation(this.#t, e, t, n, r, i);
+	}
+	effect(e, t) {
+		return this.#e.effect(this.#t, e, t);
+	}
+	get updateScheduler() {
+		return this.#e;
+	}
+	requestUpdate(e, t = 0, n, r) {
+		this.#e.requestUpdate(e, t, n, r);
+	}
+	cancelUpdate(e) {
+		this.#e.cancelUpdate(e);
+	}
+	#f(e, t) {
 		let n = this.#e.registerBase(this.#t, e, t);
 		this.#r.set(e, n);
 		let r = (e) => {
@@ -597,24 +796,24 @@ var S = class {
 		};
 		return this.#n.set(e, r), r;
 	}
-	#f(e, t, n) {
-		let r = this.#m(e, t, n), i = (t, n) => {
-			this.#h(e, r, t, n);
+	#p(e, t, n) {
+		let r = this.#h(e, t, n), i = (t, n) => {
+			this.#g(e, r, t, n);
 		};
 		return this.#n.set(e, i), i;
 	}
-	#p(e, t, n) {
-		let r = this.createExpression(t), i = this.#m(e, r(null), n), a = r.subscribe(() => {
-			this.#h(e, i, r(null), { animate: !this.#l });
+	#m(e, t, n) {
+		let r = this.createExpression(t), i = this.#h(e, r(null), n), a = r.subscribe(() => {
+			this.#g(e, i, r(null), { animate: !this.#l });
 		});
 		this.#e.addScopeDisposer(this.#t, a);
 	}
-	#m(e, t, n) {
-		let r = C(e, t), i = this.#e.registerBase(this.#t, e, r);
+	#h(e, t, n) {
+		let r = Ce(e, t), i = this.#e.registerBase(this.#t, e, r);
 		this.#r.set(e, i);
 		let a = this.#c;
 		if (!a) throw Error(`The parameter "${e}" uses transition but no animator is available.`);
-		let o = xe(a, ({ value: e }) => {
+		let o = w(a, ({ value: e }) => {
 			i.set(e), this.#e.flushNow();
 		}, n.halfLife ?? 80, n.epsilon ?? .01, { value: i.get() }), s = {
 			target: i.get(),
@@ -625,8 +824,8 @@ var S = class {
 		};
 		return this.#a.set(e, s), this.#e.addScopeDisposer(this.#t, s.dispose), s;
 	}
-	#h(e, t, n, r = {}) {
-		let i = C(e, n);
+	#g(e, t, n, r = {}) {
+		let i = Ce(e, n);
 		t.target = i, r.animate === !1 ? t.smoother.snap({ value: i }) : t.smoother({ value: i });
 	}
 	evaluateAndGet(e) {
@@ -635,8 +834,8 @@ var S = class {
 	runInTransaction(e) {
 		return this.#e.runInTransaction(e);
 	}
-	flushNow() {
-		this.#e.flushNow();
+	flushNow(e) {
+		this.#e.flushNow(e);
 	}
 	whenPropagated(e) {
 		return this.#e.whenPropagated(e);
@@ -648,19 +847,19 @@ var S = class {
 		this.#u || (this.#u = !0, this.#e.disposeScope(this.#t), this.#n.clear(), this.#r.clear(), this.#i.clear(), this.#a.clear());
 	}
 	hasPointSelections() {
-		for (let e of this.#i.values()) if (s(e)) {
+		for (let e of this.#i.values()) if (i(e)) {
 			let t = e.select;
-			if (a(t)) {
+			if (o(t)) {
 				if (t == "point") return !0;
 			} else if (t.type == "point") return !0;
 		}
 		return !1;
 	}
 };
-function Ce(e) {
+function xe(e) {
 	return e ? e.push === "outer" ? "push" : "select" in e ? "selection" : "ruler" in e ? "ruler" : "expr" in e ? "derived" : "base" : "auto";
 }
-function we(e) {
+function Se(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!`);
@@ -673,13 +872,13 @@ function we(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 C(e, t) {
+function Ce(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/view/layout/flexLayout.js
-function Te(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {}) {
+function we(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {}) {
 	n ||= 0, i ||= 0;
 	let o = Ne(e, t, n), s = 0, c = 0;
 	for (let t = 0; t < e.length; t++) s += o[t], D(e[t]) || c++;
@@ -712,12 +911,12 @@ function Te(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {
 	}
 	return m += a ? n : -n, p(!1), f;
 }
-function Ee(e, { spacing: t } = { spacing: 0 }) {
+function Te(e, { spacing: t } = { spacing: 0 }) {
 	let n = 0;
 	for (let r of e) n += A(r) + (D(r) ? 0 : t);
 	return Math.max(0, n - t);
 }
-function De(e, t, { spacing: n = 0 } = {}) {
+function Ee(e, t, { spacing: n = 0 } = {}) {
 	let r = [], i = [], a = 0, o = 0;
 	for (let [s, c] of e.entries()) {
 		let e = A(c), l = !D(c), u = o && l ? n : 0;
@@ -725,21 +924,21 @@ function De(e, t, { spacing: n = 0 } = {}) {
 	}
 	return i.length && r.push(i), r;
 }
-function Oe(e) {
+function De(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, A(o));
 		let e = j(o);
 		e === void 0 ? a = !1 : i = i === void 0 ? e : Math.max(i, e);
 	}
-	return M({
+	return N({
 		px: t,
 		grow: n,
 		minPx: r,
 		maxPx: a ? i : void 0
 	});
 }
-function ke(e) {
+function Oe(e) {
 	let t = {
 		px: 0,
 		grow: 0,
@@ -751,9 +950,9 @@ function ke(e) {
 		let e = j(r);
 		e === void 0 ? n = !1 : t.maxPx += e;
 	}
-	return n || delete t.maxPx, M(t);
+	return n || delete t.maxPx, N(t);
 }
-var w = class e {
+var T = class e {
 	constructor(e, t) {
 		this.width = e, this.height = t;
 	}
@@ -764,15 +963,15 @@ var w = class e {
 		return this.#e(-e.width, -e.height);
 	}
 	#e(t, n) {
-		return new e(Le(this.width, t), Le(this.height, n));
+		return new e(M(this.width, t), M(this.height, n));
 	}
 	isGrowing() {
 		return !!(this.width.grow || this.height.grow);
 	}
-}, T = Object.freeze({
+}, E = Object.freeze({
 	px: 0,
 	grow: 0
-}), E = new w(T, T);
+}), ke = new T(E, E);
 function D(e) {
 	return !e.px && !e.grow && !e.minPx;
 }
@@ -783,12 +982,12 @@ function O(e) {
 	return e || 0;
 }
 function je(e) {
-	return e && (l(e.px) || l(e.grow) || l(e.minPx) || l(e.maxPx));
+	return e && (n(e.px) || n(e.grow) || n(e.minPx) || n(e.maxPx));
 }
 function Me(e) {
-	if (q(e)) throw Error("parseSizeDef does not accept step-based sizes.");
-	if (je(e)) return Fe(e), M(e);
-	if (l(e)) return {
+	if (J(e)) throw Error("parseSizeDef does not accept step-based sizes.");
+	if (je(e)) return Fe(e), N(e);
+	if (n(e)) return {
 		px: e,
 		grow: 0
 	};
@@ -857,21 +1056,21 @@ function j(e) {
 function Ie(e) {
 	return e.minPx !== void 0 || e.maxPx !== void 0;
 }
-function Le(e, t) {
-	return M({
+function M(e, t) {
+	return N({
 		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 M(e) {
+function N(e) {
 	let t = {}, n = e.px !== void 0, r = e.grow !== void 0, i = Ie(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 > O(e.px) && (t.minPx = e.minPx), e.maxPx !== void 0 && (O(t.grow) || e.maxPx < O(e.px)) && (t.maxPx = e.maxPx), t;
 }
 //#endregion
 //#region ../core/src/view/layout/padding.js
-var N = class e {
+var P = class e {
 	constructor(e, t, n, r) {
 		this.top = e || 0, this.right = t || 0, this.bottom = n || 0, this.left = r || 0;
 	}
@@ -906,35 +1105,35 @@ var N = class e {
 		return this.top + this.bottom;
 	}
 	static createFromConfig(e) {
-		return typeof e == "number" ? this.createUniformPadding(e) : e ? this.createFromRecord(e) : P;
+		return typeof e == "number" ? this.createUniformPadding(e) : e ? this.createFromRecord(e) : F;
 	}
 	static createFromRecord(t) {
 		return new e(t.top, t.right, t.bottom, t.left);
 	}
 	static zero() {
-		return P;
+		return F;
 	}
 	static createUniformPadding(t) {
 		return new e(t, t, t, t);
 	}
 };
-function Re(e, t) {
-	return t ? new N(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 Le(e, t) {
+	return t ? new P(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;
 }
-var P = N.createUniformPadding(0);
-Object.freeze(P);
+var F = P.createUniformPadding(0);
+Object.freeze(F);
 //#endregion
 //#region ../core/src/utils/url.js
-var ze = /^([A-Za-z]+:)?\/\//;
-function F(e, t) {
-	if (t && ze.test(t)) return t;
+var Re = /^([A-Za-z]+:)?\/\//;
+function I(e, t) {
+	if (t && Re.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 I(n) + t;
+	return Be(n) + t;
 }
-function Be(e, t, n = Ve()) {
+function ze(e, t, n = Ve()) {
 	let r = typeof e == "function" ? e() : e;
 	if (!t) return r;
 	try {
@@ -943,9 +1142,9 @@ function Be(e, t, n = Ve()) {
 			return new URL(t, e).href;
 		} else if (n) return new URL(t, n).href;
 	} catch {}
-	return F(r, t);
+	return I(r, t);
 }
-function I(e) {
+function Be(e) {
 	let t = e.replace(/[^/]*$/, "");
 	return t === "" ? void 0 : t.endsWith("://") ? e + "/" : t;
 }
@@ -966,7 +1165,7 @@ function Ue(e) {
 //#endregion
 //#region ../core/src/config/mergeConfig.js
 function L(e) {
-	return i(e) && !Array.isArray(e);
+	return a(e) && !Array.isArray(e);
 }
 function We(e) {
 	let t = {};
@@ -1012,16 +1211,16 @@ function U(e) {
 }
 //#endregion
 //#region ../core/src/view/postScaleParams.js
-var qe = /* @__PURE__ */ new WeakMap();
-function Je(e, t) {
-	qe.set(e, t);
+var W = /* @__PURE__ */ new WeakMap();
+function qe(e, t) {
+	W.set(e, t);
 }
-function Ye(e) {
-	return qe.get(e);
+function Je(e) {
+	return W.get(e);
 }
 //#endregion
 //#region ../core/src/data/namedDataScope.js
-var Xe = class {
+var Ye = class {
 	name;
 	owner;
 	getDefaultData;
@@ -1059,13 +1258,13 @@ var Xe = class {
 	dispose() {
 		this.#e = void 0, this.#t = !1, this.#n++, this.#r = !0;
 	}
-}, Ze = class {
+}, Xe = 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 Xe(t, e, () => n));
+		for (let [t, n] of Object.entries(e.spec.datasets ?? {})) this.#e.set(t, new Ye(t, e, () => n));
 	}
 	getLocalBinding(e) {
 		return this.#e.get(e);
@@ -1079,7 +1278,7 @@ var Xe = class {
 		let n = this.view.dataParent?.namedDataScope;
 		if (n) return n.resolve(e);
 		let r = this.#t.get(e);
-		return r || (r = new Xe(e, void 0, () => this.view.context.getNamedDataFromProvider(e)), this.#t.set(e, r)), r;
+		return r || (r = new Ye(e, void 0, () => this.view.context.getNamedDataFromProvider(e)), this.#t.set(e, r)), r;
 	}
 	dispose() {
 		for (let e of this.#e.values()) e.dispose();
@@ -1087,7 +1286,7 @@ var Xe = class {
 		for (let e of this.#t.values()) e.dispose();
 		this.#t.clear();
 	}
-}, W = "VISIT_SKIP", G = "VISIT_STOP", K = (e) => e, Qe = class {
+}, G = "VISIT_SKIP", K = "VISIT_STOP", q = (e) => e, Ze = class {
 	spec;
 	namedDataScope;
 	#e;
@@ -1102,38 +1301,37 @@ var Xe = class {
 	#l = void 0;
 	#u = !1;
 	#d = [];
-	opacityFunction = K;
+	opacityFunction = q;
 	#f = [];
 	#p = "none";
 	#m = /* @__PURE__ */ new Map();
-	facetCoords = new ne([], JSON.stringify);
-	constructor(t, n, r, i, a, o = {}) {
-		if (!t) throw Error("View spec must be defined!");
-		if (this.context = n, this.layoutParent = r, this.dataParent = i, this.#t = a, this.spec = t, this.namedDataScope = new Ze(this), i && t.theme !== void 0) throw Error("\"theme\" is only supported at the root specification. Use \"config\" and \"style\" for subtree customization.");
-		let s = i ? i.getConfigScopes() : [n.getBaseConfig()], c = t.config;
-		if (this.#e = [...s, c].filter((e) => !!e), this.resolutions = {
+	facetCoords = new te([], JSON.stringify);
+	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 Xe(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 = {
 			inheritEncoding: !1,
 			layoutSizeParams: "own",
-			...o
+			...a
 		}, this.flowHandle = void 0, this.needsAxes = {
 			x: !1,
 			y: !1
-		}, this.paramRuntime = new S(() => this.dataParent?.paramRuntime, (e) => this.getScaleResolution(e), n.animator, { snapTransitionedUpdates: !0 }), t.params) {
-			let n = /* @__PURE__ */ new Set();
-			for (let r of t.params) {
-				if ("expr" in r) {
-					let { usesScaleHelper: t, globals: i } = e(r.expr), a = i.some((e) => n.has(e));
-					if (t || a) {
-						n.add(r.name), this.#d.push(r);
-						continue;
-					}
+		}, this.paramRuntime = new be(() => this.dataParent?.paramRuntime, (e) => this.getScaleResolution(e), t.animator, { snapTransitionedUpdates: !0 });
+		let c = [...e.params ?? [], ...Je(e) ?? []];
+		for (let e of c) {
+			if ("expr" in e) {
+				let { usesScaleHelper: t, globals: n } = p(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;
 				}
-				this.paramRuntime.registerParam(r);
 			}
+			this.paramRuntime.registerParam(e);
 		}
 		this.options.layoutSizeParams !== "inherit" && (this.#a = this.#h("width"), this.#o = this.#h("height"));
 	}
@@ -1160,11 +1358,11 @@ var Xe = class {
 	}
 	getCursor() {
 		let e = this.getCursorSpec();
-		return h(e) ? this.paramRuntime.evaluateAndGet(e.expr) : e;
+		return u(e) ? this.paramRuntime.evaluateAndGet(e.expr) : e;
 	}
 	watchCursor(e, t) {
 		let n = this.getCursorSpec();
-		h(n) && this.paramRuntime.watchExpression(n.expr, e, {
+		u(n) && this.paramRuntime.watchExpression(n.expr, e, {
 			scopeOwned: !1,
 			registerDisposer: t
 		});
@@ -1176,53 +1374,53 @@ var Xe = class {
 		return this.facetCoords.values().next().value;
 	}
 	getPadding() {
-		return this._cache("size/padding", () => N.createFromConfig(this.spec.padding));
+		return this._cache("size/padding", () => P.createFromConfig(this.spec.padding));
 	}
 	getOverhang() {
-		return N.zero();
+		return P.zero();
 	}
 	isScrollable() {
 		return this.spec.viewportWidth != null || this.spec.viewportHeight != null;
 	}
 	getSize() {
-		return this._cache("size/size", () => this.isConfiguredVisible() ? new w(this.#g("width"), this.#g("height")) : E);
+		return this._cache("size/size", () => this.isConfiguredVisible() ? new T(this.#g("width"), this.#g("height")) : ke);
 	}
 	getViewportSize() {
 		if (!this.isScrollable()) return this.getSize();
-		if (!this.isConfiguredVisible()) return E;
+		if (!this.isConfiguredVisible()) return ke;
 		let e = this.getSize();
-		return new w(this.#g("viewportWidth") ?? e.width, this.#g("viewportHeight") ?? e.height);
+		return new T(this.#g("viewportWidth") ?? e.width, this.#g("viewportHeight") ?? e.height);
 	}
 	#g(e) {
-		let { value: t, implicit: r } = this.#_(e), i = this.resolveSizeValue(e, t), a = q(i), o = e == "viewportWidth" || e == "viewportHeight";
-		if (a) {
-			if (o) throw new y(`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 r;
-				if (_(a.type)) r = a.domain().length;
-				else if (["locus", "index"].includes(a.type)) {
-					let e = a.domain();
-					r = n(e) - e[0];
-				} else throw new y(`Cannot use step-based size with "${a.type}" scale!`, this);
-				let o = a;
-				r = g(r, o.paddingInner(), o.paddingOuter());
-				let s = e == "width" ? "xOffset" : "yOffset", c = this.getScaleResolution(s)?.getScale(), l = i.for ?? (c && _(c.type) ? "offset" : "position"), u = t;
+		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 y(`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 n;
+				if (_(i.type)) n = i.domain().length;
+				else if (["locus", "index"].includes(i.type)) {
+					let e = i.domain();
+					n = c(e) - e[0];
+				} else throw new y(`Cannot use step-based size with "${i.type}" scale!`, this);
+				let a = i;
+				n = ne(n, a.paddingInner(), a.paddingOuter());
+				let o = e == "width" ? "xOffset" : "yOffset", s = this.getScaleResolution(o)?.getScale(), l = r.for ?? (s && _(s.type) ? "offset" : "position"), u = t;
 				if (l == "offset") {
-					if (!c || !_(c.type)) throw new y(`Cannot use ${e}.step.for = "offset" without a discrete ${s} scale!`, this);
-					let t = c, n = g(c.domain().length, t.paddingInner(), t.paddingOuter());
-					u *= n / (1 - o.paddingInner());
+					if (!s || !_(s.type)) throw new y(`Cannot use ${e}.step.for = "offset" without a discrete ${o} scale!`, this);
+					let t = s, n = ne(s.domain().length, t.paddingInner(), t.paddingOuter());
+					u *= n / (1 - a.paddingInner());
 				}
 				return {
-					px: r * u,
+					px: n * u,
 					grow: 0
 				};
-			} else if (r) return {
+			} else if (n) return {
 				px: t,
 				grow: 0
 			};
 			else throw new y(`Cannot use step-based size with "${e}"!`, this);
-		} else return (i && Me(i)) ?? (o ? void 0 : {
+		} else return (r && Me(r)) ?? (a ? void 0 : {
 			px: 0,
 			grow: 1
 		});
@@ -1245,9 +1443,9 @@ var Xe = class {
 		return r && !_(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 (!h(t)) return t;
+		if (!u(t)) return t;
 		let n = this.#C(e)();
-		if (rt(n) || n === "container") return n;
+		if (nt(n) || n === "container") return n;
 		throw new y(`"${e}" ExprRef must resolve to a finite number or "container"!`, this);
 	}
 	registerSizeInvalidation() {
@@ -1255,7 +1453,7 @@ var Xe = class {
 	}
 	#y(e, t) {
 		let { value: n, implicit: r } = this.#_(e);
-		if (!q(n)) return;
+		if (!J(n)) return;
 		let i = this.getScaleResolution(t);
 		if (!i) {
 			if (r) return;
@@ -1274,11 +1472,11 @@ var Xe = class {
 	}
 	#b(e) {
 		let { value: t } = this.#_(e);
-		h(t) ? this.#S(e, t.expr) : q(t) && h(t.step) && this.#S(e + ".step", t.step.expr);
+		u(t) ? this.#S(e, t.expr) : J(t) && u(t.step) && this.#S(e + ".step", t.step.expr);
 	}
 	#x(e, t) {
-		let n = h(t.step) ? this.#C(e + ".step")() : t.step;
-		if (rt(n)) return n;
+		let n = u(t.step) ? this.#C(e + ".step")() : t.step;
+		if (nt(n)) return n;
 		throw new y(`"${e}.step" ExprRef must resolve to a finite number!`, this);
 	}
 	#S(e, t) {
@@ -1324,7 +1522,7 @@ var Xe = class {
 		return this.opacityFunction(1);
 	}
 	hasLocalOpacity() {
-		return this.opacityFunction !== K;
+		return this.opacityFunction !== q;
 	}
 	getPathString() {
 		return this.getLayoutAncestors().map((e) => e.name).reverse().join("/");
@@ -1400,17 +1598,17 @@ var Xe = class {
 		}, this.visit(e);
 	}
 	configurePostScaleParams() {
-		let e = [...this.#d, ...Ye(this.spec) ?? []];
+		let e = this.#d;
 		if (e.length && !this.#u) {
 			this.#u = !0, this.#l = !1;
-			for (let t of e) this.paramRuntime.registerParam(t);
+			for (let t of e) this.paramRuntime.getValue(t);
 			this.registerDisposer(this._addBroadcastHandler("subtreeDataReady", () => {
 				this.#l = !0, this.#T();
 			}));
 		}
 	}
 	configureViewOpacity() {
-		(!this.opacityFunction || this.opacityFunction === K) && (this.opacityFunction = et(this));
+		(!this.opacityFunction || this.opacityFunction === q) && (this.opacityFunction = $e(this));
 	}
 	finalizeParamRuntimeInitialization() {
 		this.#l === void 0 ? this.paramRuntime.finalizeInitialization() : this.#T();
@@ -1422,8 +1620,8 @@ var Xe = class {
 		return this.#s;
 	}
 	arrange(e, t, n = {}) {
-		if (n.firstFacet && this.facetCoords.clear(), this.facetCoords.set(n.facetId, m(t, d(n))), this.#a || this.#o) {
-			let e = this.getOverhang(), n = this.layoutParent ? N.zero() : this.getPadding();
+		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 ? P.zero() : this.getPadding();
 			this.#a?.(t.width - e.width - n.width), this.#o?.(t.height - e.height - n.height);
 		}
 		this.#c = !0, this.#T();
@@ -1444,7 +1642,7 @@ var Xe = class {
 	}
 	getFacetFields(e) {
 		let t = this.getEncoding().sample;
-		return p(t) ? [t.field] : this.options.inheritEncoding ? this.layoutParent?.getFacetFields(this) : [];
+		return d(t) ? [t.field] : this.options.inheritEncoding ? this.layoutParent?.getFacetFields(this) : [];
 	}
 	usesSampleFacetRendering() {
 		return this.layoutParent?.usesSampleFacetRendering() ?? !1;
@@ -1456,16 +1654,16 @@ var Xe = class {
 		};
 	}
 	getScaleResolution(e) {
-		let n = t(e);
-		return this.getDataAncestors().map((e) => e.resolutions.scale[n]).find((e) => e);
+		let t = l(e);
+		return this.getDataAncestors().map((e) => e.resolutions.scale[t]).find((e) => e);
 	}
 	getAxisResolution(e) {
-		let n = t(e);
-		return this.getDataAncestors().map((e) => e.resolutions.axis[n]).find((e) => e);
+		let t = l(e);
+		return this.getDataAncestors().map((e) => e.resolutions.axis[t]).find((e) => e);
 	}
 	getLegendResolution(e) {
-		let n = t(e);
-		return this.getDataAncestors().map((e) => e.resolutions.legend[n]).find((e) => e);
+		let t = l(e);
+		return this.getDataAncestors().map((e) => e.resolutions.legend[t]).find((e) => e);
 	}
 	getConfiguredResolution(e, t) {
 		return this.spec.resolve?.[t]?.[e];
@@ -1477,14 +1675,14 @@ var Xe = class {
 		return "independent";
 	}
 	getBaseUrl() {
-		return F(() => this.dataParent?.getBaseUrl(), Ue(this.spec.baseUrl));
+		return I(() => this.dataParent?.getBaseUrl(), Ue(this.spec.baseUrl));
 	}
 	isPickingSupported() {
 		return !0;
 	}
 	getTitleText() {
 		let e = this.spec.title;
-		if (e) return a(e) ? e : h(e.text) ? this.paramRuntime.evaluateAndGet(e.text.expr) : e.text;
+		if (e) return o(e) ? e : u(e.text) ? this.paramRuntime.evaluateAndGet(e.text.expr) : e.text;
 	}
 	_cache(e, t) {
 		return re(this, e, t);
@@ -1508,14 +1706,14 @@ var Xe = class {
 	}
 	propagateInteraction(e) {}
 };
-function $e(e) {
+function Qe(e) {
 	return "unitsPerPixel" in e;
 }
-function et(e) {
+function $e(e) {
 	let t = "opacity" in e.spec ? e.spec.opacity : void 0;
 	if (t !== void 0) {
-		if (l(t)) return (e) => e * t;
-		if ($e(t)) {
+		if (n(t)) return (e) => e * t;
+		if (Qe(t)) {
 			let n = (t) => {
 				let n = e.getScaleResolution(t), r = n?.getScale();
 				if ([
@@ -1526,23 +1724,23 @@ function et(e) {
 					scale: r,
 					scaleResolution: n
 				};
-			}, r = nt(t.values, "opacity.values", e);
-			if (!o(t.unitsPerPixel)) throw new y("\"opacity.unitsPerPixel\" must be an array.", e);
-			let i = () => 1, a = [], s = () => {
-				let t = tt(nt(a.map((e) => e()), "opacity.unitsPerPixel", e), r, e), n = te().domain(t.unitsPerPixel).range(t.values).clamp(!0);
+			}, r = tt(t.values, "opacity.values", e);
+			if (!g(t.unitsPerPixel)) throw new y("\"opacity.unitsPerPixel\" must be an array.", e);
+			let i = () => 1, a = [], o = () => {
+				let t = et(tt(a.map((e) => e()), "opacity.unitsPerPixel", e), r, e), n = ee().domain(t.unitsPerPixel).range(t.values).clamp(!0);
 				i = (e) => n(e);
 			};
 			a = t.unitsPerPixel.map((t) => {
-				if (h(t)) {
+				if (u(t)) {
 					let n = e.paramRuntime.watchExpression(t.expr, () => {
-						s(), e.context.animator.requestRender();
+						o(), e.context.animator.requestRender();
 					});
 					return () => n(null);
 				} else return () => t;
-			}), s();
+			}), o();
 			let c = (e) => {
 				let t = e.scaleResolution.getAxisLength() || 1e3;
-				return ee(e.scale.domain()) / t;
+				return s(e.scale.domain()) / t;
 			}, l;
 			if (t.channel === "auto") {
 				let t = n("x"), r = n("y");
@@ -1556,14 +1754,14 @@ function et(e) {
 				l = () => c(r);
 			}
 			return (e) => i(l()) * e;
-		} else if (h(t)) {
+		} else if (u(t)) {
 			let n = e.paramRuntime.watchExpression(t.expr, () => e.context.animator.requestRender());
 			return (e) => n(null) * e;
 		}
 	}
-	return K;
+	return q;
 }
-function tt(e, t, n) {
+function et(e, t, n) {
 	if (!e.length) throw new y("\"opacity.unitsPerPixel\" must contain at least one stop.", n);
 	if (e.length !== t.length) throw new y("\"opacity.unitsPerPixel\" and \"opacity.values\" must have the same length.", n);
 	e.forEach((e, t) => {
@@ -1581,155 +1779,155 @@ function tt(e, t, n) {
 		values: a
 	};
 }
-function nt(e, t, n) {
-	if (!o(e)) throw new y("\"" + t + "\" must evaluate to an array.", n);
-	return e.map((e, r) => {
-		if (!l(e) || !Number.isFinite(e)) throw new y("Invalid " + t + " value at index " + r + ". Expected a finite number.", n);
+function tt(e, t, r) {
+	if (!g(e)) throw new y("\"" + t + "\" must evaluate to an array.", r);
+	return e.map((e, i) => {
+		if (!n(e) || !Number.isFinite(e)) throw new y("Invalid " + t + " value at index " + i + ". Expected a finite number.", r);
 		return e;
 	});
 }
-var q = (e) => !!e && typeof e == "object" && "step" in e;
-function rt(e) {
+var J = (e) => !!e && typeof e == "object" && "step" in e;
+function nt(e) {
 	return typeof e == "number" && Number.isFinite(e);
 }
-var J = /* @__PURE__ */ new WeakMap(), Y = /* @__PURE__ */ new WeakMap();
-function it(e, t) {
-	ot(e, t, "Import");
+var Y = /* @__PURE__ */ new WeakMap(), X = /* @__PURE__ */ new WeakMap();
+function rt(e, t) {
+	at(e, t, "Import");
 }
-function at(e, t) {
-	ot(e, t, "View");
+function it(e, t) {
+	at(e, t, "View");
 }
-function ot(e, t, n) {
+function at(e, t, n) {
 	if (t !== null && typeof t != "string") throw Error(n + " scope name must be a string or null.");
-	J.set(e, { name: t });
+	Y.set(e, { name: t });
 }
-function st(e) {
-	return J.get(e);
+function ot(e) {
+	return Y.get(e);
 }
-function ct(e, t = {}) {
+function st(e, t = {}) {
 	let n = t.skipSubtree ?? !1 ? "excludeSubtree" : "exclude";
-	Y.set(e, n);
+	X.set(e, n);
 }
-function lt(e, t = {}) {
+function ct(e, t = {}) {
 	Ge(e, t.skipSubtree ?? !1 ? "excludeSubtree" : "exclude");
 }
-function ut(e) {
+function lt(e) {
 	return e.getLayoutAncestors().some(H);
 }
-function X(e) {
+function Z(e) {
 	let t = e.getDataAncestors(), n = [];
 	for (let e = t.length - 1; e >= 0; --e) {
-		let r = J.get(t[e]);
+		let r = Y.get(t[e]);
 		r && typeof r.name == "string" && n.push(r.name);
 	}
 	return n;
 }
-function dt(e) {
+function ut(e) {
 	let t = e.explicitName;
 	if (!t) throw Error("Cannot build a selector for a view without a name.");
 	return {
-		scope: X(e),
+		scope: Z(e),
 		view: t
 	};
 }
-function ft(e, t) {
+function dt(e, t) {
 	if (!t) throw Error("Cannot build a selector for a parameter without a name.");
 	return {
-		scope: X(e),
+		scope: Z(e),
 		param: t
 	};
 }
-function pt(e) {
-	return xt(e), "p:" + JSON.stringify({
+function ft(e) {
+	return bt(e), "p:" + JSON.stringify({
 		scope: e.scope,
 		param: e.param
 	});
 }
-function mt(e, t) {
+function pt(e, t) {
 	e.visit((e) => {
 		let n = Ke(e);
-		if (n === "excludeSubtree") return W;
+		if (n === "excludeSubtree") return G;
 		if (n !== "exclude") return t(e);
 	});
 }
-function ht(e, t) {
+function mt(e, t) {
 	e.visit((e) => {
-		let n = Y.get(e);
-		if (n === "excludeSubtree") return W;
+		let n = X.get(e);
+		if (n === "excludeSubtree") return G;
 		if (n !== "exclude") return t(e);
 	});
 }
-function gt(e, t) {
-	if (St(t), !kt(e, t.scope)) return;
+function ht(e, t) {
+	if (xt(t), !kt(e, t.scope)) return;
 	let n = [];
 	if ($(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 _t(e, t) {
-	if (xt(t), !kt(e, t.scope)) return;
+function gt(e, t) {
+	if (bt(t), !kt(e, t.scope)) return;
 	let n = [];
 	if ($(e, t.scope, (e) => {
-		for (let [r, i] of e.paramRuntime.paramConfigs) r === t.param && Z(i) && n.push({
+		for (let [r, i] of e.paramRuntime.paramConfigs) r === t.param && Q(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 vt(e, t) {
+function _t(e, t) {
 	e.visit((e) => {
-		let n = Y.get(e);
-		if (n === "excludeSubtree") return W;
-		if (n !== "exclude") for (let [n, r] of e.paramRuntime.paramConfigs) Z(r) && t({
+		let n = X.get(e);
+		if (n === "excludeSubtree") return G;
+		if (n !== "exclude") for (let [n, r] of e.paramRuntime.paramConfigs) Q(r) && t({
 			view: e,
 			param: r,
-			selector: ft(e, n)
+			selector: dt(e, n)
 		});
 	});
 }
-function yt(e) {
+function vt(e) {
 	let t = [];
-	return vt(e, (e) => t.push(e)), t;
+	return _t(e, (e) => t.push(e)), t;
 }
-function bt(e) {
+function yt(e) {
 	let t = [];
-	for (let n of Ct(e)) {
-		let r = wt(n);
+	for (let n of St(e)) {
+		let r = Ct(n);
 		Tt(e, r, t), Et(e, r, t);
 	}
 	return t;
 }
-function xt(e) {
+function bt(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 St(e) {
+function xt(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 Z(e) {
-	return e.persist === !1 ? !1 : s(e) ? !0 : f(e) ? !!e.bind : !1;
+function Q(t) {
+	return t.persist === !1 ? !1 : i(t) ? !0 : e(t) ? !!t.bind : !1;
 }
-function Ct(e) {
+function St(e) {
 	let t = /* @__PURE__ */ new Set([e]);
 	return e.visit((e) => {
-		let n = J.get(e);
+		let n = Y.get(e);
 		n && typeof n.name == "string" && t.add(e);
 	}), Array.from(t);
 }
-function wt(e) {
-	return X(e);
+function Ct(e) {
+	return Z(e);
 }
-function Q(e) {
+function wt(e) {
 	return e.length ? "import scope [" + e.join(" / ") + "]" : "import scope (root)";
 }
 function Tt(e, t, n) {
 	let r = /* @__PURE__ */ new Map();
 	$(e, t, (e) => {
 		for (let [t, n] of e.paramRuntime.paramConfigs) {
-			if (!Z(n)) continue;
+			if (!Q(n)) continue;
 			let i = r.get(t);
 			i ? i.push(e) : r.set(t, [e]);
 		}
@@ -1738,7 +1936,7 @@ function Tt(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 " + Q(t) + ". Found in: " + r + ".",
+			message: "Bookmarkable parameter \"" + e + "\" is not unique within " + wt(t) + ". Found in: " + r + ".",
 			scope: t
 		});
 	}
@@ -1750,29 +1948,29 @@ function Et(e, t, n) {
 	if (i.length <= 1) return;
 	let a = /* @__PURE__ */ new Map();
 	for (let e of i) {
-		let t = J.get(e), n = t ? t.name : void 0;
+		let t = Y.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 " + Q(t) + ".",
+		message: "Import instance name \"" + e + "\" is used multiple times for addressable instances in " + wt(t) + ".",
 		scope: t
 	});
 }
 function Dt(e, t) {
 	let n = [];
 	return $(e, t, (e) => {
-		if (X(e).length !== t.length + 1) return;
-		let r = J.get(e);
+		if (Z(e).length !== t.length + 1) return;
+		let r = Y.get(e);
 		!r || typeof r.name != "string" || n.push(e);
 	}, { includeNamedImportRoots: !0 }), n;
 }
 function Ot(e) {
 	let t = !1;
 	return e.visit((e) => {
-		let n = Y.get(e);
-		if (n === "excludeSubtree") return W;
+		let n = X.get(e);
+		if (n === "excludeSubtree") return G;
 		if (n !== "exclude") {
-			for (let n of e.paramRuntime.paramConfigs.values()) if (Z(n)) return t = !0, G;
+			for (let n of e.paramRuntime.paramConfigs.values()) if (Q(n)) return t = !0, K;
 		}
 	}), t;
 }
@@ -1782,9 +1980,9 @@ function kt(e, 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 = J.get(e);
-			if (!(!n || n.name !== i) && X(e).length === r.length + 1) {
-				if (t) return a = !0, G;
+			let n = Y.get(e);
+			if (!(!n || n.name !== i) && Z(e).length === r.length + 1) {
+				if (t) return a = !0, K;
 				t = e;
 			}
 		}, { includeNamedImportRoots: !0 }), a) throw Error("Multiple import instances named \"" + i + "\" in scope.");
@@ -1796,13 +1994,13 @@ function kt(e, t) {
 function $(e, t, n, r = {}) {
 	let i = r.includeNamedImportRoots ?? !1;
 	e.visit((e) => {
-		let r = J.get(e), a = Y.get(e);
-		if (a === "excludeSubtree") return W;
+		let r = Y.get(e), a = X.get(e);
+		if (a === "excludeSubtree") return G;
 		if (a !== "exclude" && At(e, t, r, i)) return n(e);
 	});
 }
 function At(e, t, n, r) {
-	let i = X(e);
+	let i = Z(e);
 	return jt(i, t) ? !0 : !r || !n || typeof n.name != "string" || i.length !== t.length + 1 ? !1 : Mt(t, i);
 }
 function jt(e, t) {
@@ -1814,4 +2012,4 @@ function Mt(e, t) {
 	return !0;
 }
 //#endregion
-export { w as A, S as B, B as C, Be as D, I as E, A as F, b as G, xe as H, Te as I, Me as L, Oe as M, Ee as N, N as O, j as P, ke as R, U as S, F as T, ve as U, be as V, ye as W, W as _, dt as a, Je as b, lt as c, at as d, _t as f, mt as g, ht as h, X as i, T as j, Re as k, ct as l, bt as m, st as n, ut as o, gt as p, ft as r, pt as s, yt as t, it as u, G as v, He as w, H as x, Qe as y, De as z };
+export { T as A, be as B, B as C, ze as D, Be as E, A as F, b as G, w as H, we as I, Me as L, De as M, Te as N, P as O, j as P, Oe as R, U as S, I as T, ge as U, ve as V, _e as W, G as _, ut as a, qe as b, ct as c, it as d, gt as f, pt as g, mt as h, Z as i, E as j, Le as k, st as l, yt as m, ot as n, lt as o, ht as p, dt as r, ft as s, vt as t, rt as u, K as v, He as w, H as x, Ze as y, Ee as z };