@genome-spy/app 0.89.0 → 0.90.0

package/dist/{viewSelectors-BlvzvG-z.js → viewSelectors-DYz-PhTO.js}

@@ -1,12 +1,12 @@
-import { Dn as e, Ft as t, It as n, Mt as r, Nt as i, V as a, b as o, bn as s, ft as c, gn as l, k as u, o as d, pt as f, t as p, u as m, un as ee, xn as te, yn as h, zt as g } from "./clipOptions-8BPf0WMZ.js";
-import { a as _, n as ne, r as re, t as v } from "./viewError-BiR9VCgL.js";
-import { U as ie, m as y, y as b } from "./vega-scale-BWBFykuI.js";
-import { t as ae } from "./warning-CpIIpk8e.js";
+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";
 //#region ../core/src/view/layout/flexLayout.js
-function oe(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {}) {
+function ce(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {}) {
 	n ||= 0, i ||= 0;
-	let o = he(e, t, n), s = 0, c = 0;
-	for (let t = 0; t < e.length; t++) s += o[t], C(e[t]) || c++;
+	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) => {
 		let t = d;
 		if (!t) return;
@@ -18,13 +18,13 @@ function oe(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {
 		});
 		m += r, d = 0;
 	}, m = a ? Math.max(t, l) : 0 + i;
-	if (e.length == 1 && C(e[0])) return [{
+	if (e.length == 1 && S(e[0])) return [{
 		location: m,
 		size: 0
 	}];
 	for (let t = 0; t < e.length; t++) {
 		let r = e[t];
-		if (C(r)) d++;
+		if (S(r)) d++;
 		else {
 			p(f.length > 0);
 			let e = o[t];
@@ -36,34 +36,34 @@ function oe(e, t, { spacing: n, devicePixelRatio: r, offset: i, reverse: a } = {
 	}
 	return m += a ? n : -n, p(!1), f;
 }
-function se(e, { spacing: t } = { spacing: 0 }) {
+function le(e, { spacing: t } = { spacing: 0 }) {
 	let n = 0;
-	for (let r of e) n += E(r) + (C(r) ? 0 : t);
+	for (let r of e) n += E(r) + (S(r) ? 0 : t);
 	return Math.max(0, n - t);
 }
-function ce(e, t, { spacing: n = 0 } = {}) {
+function ue(e, t, { spacing: n = 0 } = {}) {
 	let r = [], i = [], a = 0, o = 0;
 	for (let [s, c] of e.entries()) {
-		let e = E(c), l = !C(c), u = o && l ? n : 0;
+		let e = E(c), l = !S(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 le(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, E(o));
 		let e = D(o);
 		e === void 0 ? a = !1 : i = i === void 0 ? e : Math.max(i, e);
 	}
-	return A({
+	return O({
 		px: t,
 		grow: n,
 		minPx: r,
 		maxPx: a ? i : void 0
 	});
 }
-function ue(e) {
+function fe(e) {
 	let t = {
 		px: 0,
 		grow: 0,
@@ -71,13 +71,13 @@ function ue(e) {
 		maxPx: 0
 	}, n = !0;
 	for (let r of e) {
-		t.px += w(r.px), t.grow += w(r.grow), t.minPx += E(r);
+		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, A(t);
+	return n || delete t.maxPx, O(t);
 }
-var x = class e {
+var y = class e {
 	constructor(e, t) {
 		this.width = e, this.height = t;
 	}
@@ -88,31 +88,31 @@ var x = class e {
 		return this.#e(-e.width, -e.height);
 	}
 	#e(t, n) {
-		return new e(k(this.width, t), k(this.height, n));
+		return new e(ye(this.width, t), ye(this.height, n));
 	}
 	isGrowing() {
 		return !!(this.width.grow || this.height.grow);
 	}
-}, S = Object.freeze({
+}, b = Object.freeze({
 	px: 0,
 	grow: 0
-}), de = new x(S, S);
-function C(e) {
+}), x = new y(b, b);
+function S(e) {
 	return !e.px && !e.grow && !e.minPx;
 }
-function fe(e, t) {
+function pe(e, t) {
 	return !e || !t ? !1 : e.px === t.px && e.grow === t.grow && e.minPx === t.minPx && e.maxPx === t.maxPx;
 }
-function w(e) {
+function C(e) {
 	return e || 0;
 }
-function pe(e) {
-	return e && (h(e.px) || h(e.grow) || h(e.minPx) || h(e.maxPx));
-}
 function me(e) {
+	return e && (s(e.px) || s(e.grow) || s(e.minPx) || s(e.maxPx));
+}
+function he(e) {
 	if (J(e)) throw Error("parseSizeDef does not accept step-based sizes.");
-	if (pe(e)) return _e(e), A(e);
-	if (h(e)) return {
+	if (me(e)) return w(e), O(e);
+	if (s(e)) return {
 		px: e,
 		grow: 0
 	};
@@ -122,28 +122,28 @@ function me(e) {
 	};
 	throw Error(`Invalid sizeDef: ${e}`);
 }
-function he(e, t, n) {
+function ge(e, t, n) {
 	let r = !1;
-	for (let t of e) _e(t), r ||= O(t);
-	if (!r) return ge(e, t, n);
+	for (let t of e) w(t), r ||= ve(t);
+	if (!r) return _e(e, t, n);
 	let i = Array(e.length).fill(0), a = [];
-	for (let t = 0; t < e.length; t++) C(e[t]) || a.push(t);
+	for (let t = 0; t < e.length; t++) S(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];
-		w(n.grow) || (i[t] = T(w(n.px), n), c.add(t));
+		C(n.grow) || (i[t] = T(C(n.px), n), c.add(t));
 	}
 	for (;;) {
 		let t = 0, n = 0, r = 0;
-		for (let o of a) c.has(o) ? r += i[o] : (t += w(e[o].px), n += w(e[o].grow));
+		for (let o of a) c.has(o) ? r += i[o] : (t += C(e[o].px), n += C(e[o].grow));
 		if (!n) {
-			for (let t of a) c.has(t) || (i[t] = T(w(e[t].px), e[t]), c.add(t));
+			for (let t of a) c.has(t) || (i[t] = T(C(e[t].px), e[t]), c.add(t));
 			break;
 		}
 		let o = Math.max(0, s - r - t), l = 0, u = [], d = [];
 		for (let t of a) {
 			if (c.has(t)) continue;
-			let r = e[t], a = w(r.px) + w(r.grow) / n * o, s = T(a, r);
+			let r = e[t], a = C(r.px) + C(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);
@@ -155,47 +155,47 @@ function he(e, t, n) {
 	}
 	return i;
 }
-function ge(e, t, n) {
+function _e(e, t, n) {
 	let r = 0, i = 0;
-	for (let t of e) r += w(t.px) + (C(t) ? 0 : n), i += w(t.grow);
+	for (let t of e) r += C(t.px) + (S(t) ? 0 : n), i += C(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] = C(n) ? 0 : w(n.px) + (i ? w(n.grow) / i * a : 0);
+		o[t] = S(n) ? 0 : C(n.px) + (i ? C(n.grow) / i * a : 0);
 	}
 	return o;
 }
-function _e(e) {
+function w(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(w(e.px), e);
+	return T(C(e.px), e);
 }
 function D(e) {
-	return e.maxPx ?? (w(e.grow) ? void 0 : E(e));
+	return e.maxPx ?? (C(e.grow) ? void 0 : E(e));
 }
-function O(e) {
+function ve(e) {
 	return e.minPx !== void 0 || e.maxPx !== void 0;
 }
-function k(e, t) {
-	return A({
+function ye(e, t) {
+	return O({
 		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 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;
+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;
 }
 //#endregion
 //#region ../core/src/view/layout/padding.js
-var j = class e {
+var k = class e {
 	constructor(e, t, n, r) {
 		this.top = e || 0, this.right = t || 0, this.bottom = n || 0, this.left = r || 0;
 	}
@@ -230,56 +230,57 @@ var j = class e {
 		return this.top + this.bottom;
 	}
 	static createFromConfig(e) {
-		return typeof e == "number" ? this.createUniformPadding(e) : e ? this.createFromRecord(e) : M;
+		return typeof e == "number" ? this.createUniformPadding(e) : e ? this.createFromRecord(e) : A;
 	}
 	static createFromRecord(t) {
 		return new e(t.top, t.right, t.bottom, t.left);
 	}
 	static zero() {
-		return M;
+		return A;
 	}
 	static createUniformPadding(t) {
 		return new e(t, t, t, t);
 	}
 };
-function ve(e, t) {
-	return t ? new j(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 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;
 }
-var M = j.createUniformPadding(0);
-Object.freeze(M);
+var A = k.createUniformPadding(0);
+Object.freeze(A);
 //#endregion
 //#region ../core/src/utils/url.js
-var ye = /^([A-Za-z]+:)?\/\//;
-function N(e, t) {
-	if (t && ye.test(t)) return t;
+var xe = /^([A-Za-z]+:)?\/\//;
+function j(e, t) {
+	if (t && xe.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 P(n) + t;
+	return M(n) + t;
 }
-function be(e, t, n = xe()) {
+function Se(e, t, n = Ce()) {
 	let r = typeof e == "function" ? e() : e;
 	if (!t) return r;
 	try {
 		if (r) {
 			let e = n ? new URL(r, n).href : new URL(r).href;
 			return new URL(t, e).href;
-		} else if (n) return new URL(t, n).href;
+		}
+		if (n) return new URL(t, n).href;
 	} catch {}
-	return N(r, t);
+	return j(r, t);
 }
-function P(e) {
+function M(e) {
 	let t = e.replace(/[^/]*$/, "");
 	return t === "" ? void 0 : t.endsWith("://") ? e + "/" : t;
 }
-function xe() {
+function Ce() {
 	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 F = class {
+var N = 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;
@@ -303,7 +304,7 @@ var F = class {
 		if (r > 0) {
 			let n = e[r], i = t[r], a = 0, o = r >> 1;
 			for (; a < o;) {
-				let n = (a << 1) + 1, o = n + 1, s = n + (o < r & +(t[o] < t[n]));
+				let n = (a << 1) + 1, o = n + 1, s = n + (+(o < r) & t[o] < t[n]);
 				if (t[s] >= i) break;
 				e[a] = e[s], t[a] = t[s], a = s;
 			}
@@ -320,11 +321,11 @@ var F = class {
 	shrink() {
 		Array.isArray(this.ids) && (this.ids.length = this.length), Array.isArray(this.values) && (this.values.length = this.length);
 	}
-}, I = Symbol("runtimeNode"), Se = 1e6;
-function Ce(e) {
+}, P = Symbol("runtimeNode"), F = 1e6;
+function we(e) {
 	return e ? (t, n) => e.addDisposer(t, n) : () => () => void 0;
 }
-function we(e, t, n = !0) {
+function I(e, t, n = !0) {
 	let r = {
 		id: e.id,
 		name: e.name,
@@ -339,7 +340,7 @@ function we(e, t, n = !0) {
 			};
 		}
 	};
-	return Object.defineProperty(r, I, {
+	return Object.defineProperty(r, P, {
 		enumerable: !1,
 		configurable: !1,
 		writable: !1,
@@ -349,7 +350,7 @@ function we(e, t, n = !0) {
 	} }) : r;
 }
 function Te(e) {
-	let t = e[I];
+	let t = e[P];
 	if (!t) throw Error("ParamRef is not bound to this graph runtime. Expected runtime-created ref.");
 	return t;
 }
@@ -373,12 +374,12 @@ var Oe = class {
 	#u = /* @__PURE__ */ new Map();
 	#d = /* @__PURE__ */ new Set();
 	#f = /* @__PURE__ */ new Set();
-	#p = new F();
-	#m = new F();
+	#p = new N();
+	#m = new N();
 	#h = /* @__PURE__ */ new Set();
 	#g;
 	constructor(e = {}) {
-		this.#g = Ce(e.lifecycleRegistry);
+		this.#g = we(e.lifecycleRegistry);
 	}
 	createWritable(e, t, n, r, i = {}) {
 		let a = "n" + this.#e++, o = i.notify ?? !0, s = {
@@ -400,7 +401,7 @@ var Oe = class {
 		}, l = () => {
 			s.disposed = !0, s.listeners.clear(), u();
 		}, u = this.#g(e, l);
-		return Object.assign(we(s, c, o), { dispose: l });
+		return Object.assign(I(s, c, o), { dispose: l });
 	}
 	computed(e, t, n, r, i = {}) {
 		return this.#_(e, t, n, r, i);
@@ -435,12 +436,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(we(s), {
+		return Object.assign(I(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[I];
+					let n = e[P];
 					if (n === s) throw Error("Reactive dependency cycle: " + t);
 					if (!r.has(n)) {
 						r.add(n);
@@ -589,8 +590,8 @@ var Oe = class {
 		this.#f.add(e), this.#m.push(e, this.#C(e.rank)), this.#w();
 	}
 	#C(e) {
-		let t = this.#t % Se;
-		return this.#t += 1, e * Se + t;
+		let t = this.#t % F;
+		return this.#t += 1, e * F + t;
 	}
 	#w() {
 		this.#r > 0 || this.#a || this.#o || (this.#a = !0, queueMicrotask(() => {
@@ -658,50 +659,50 @@ var Oe = class {
 		if (!t) throw Error("Unknown scope: " + e);
 		t.params.clear(), t.initializers.clear();
 	}
-	registerInitializer(e, t, n) {
-		g(t);
-		let r = this.#t.get(e);
-		if (!r) throw Error("Unknown scope: " + e);
-		if (r.params.has(t) || r.initializers.has(t)) throw Error(`Parameter "${t}" already exists in scope ${e}`);
-		r.initializers.set(t, {
-			initialize: n,
+	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
 		});
 	}
-	register(e, t, n) {
-		g(t);
-		let r = this.#t.get(e);
-		if (!r) throw Error("Unknown scope: " + e);
-		if (r.params.has(t) || r.initializers.get(t)?.initializing === !1) throw Error("Parameter \"" + t + "\" already exists in scope " + e);
-		return r.params.set(t, n), n;
-	}
-	resolve(e, t) {
-		g(t);
-		let n = e;
-		for (; n;) {
-			let e = this.#t.get(n);
-			if (!e) throw Error("Unknown scope: " + n);
-			let r = e.initializers.get(t);
-			if (r) {
-				if (r.initializing) throw Error(`Parameter dependency cycle while initializing "${t}" in ${n}.`);
-				r.initializing = !0;
+	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 (r.initialize(), !e.params.has(t)) throw Error(`Initializer did not register parameter "${t}".`);
-					e.initializers.delete(t);
+					if (t.initialize(), !e.params.has(n)) throw Error(`Initializer did not register parameter "${n}".`);
+					e.initializers.delete(n);
 				} finally {
-					r.initializing = !1;
+					t.initializing = !1;
 				}
 			}
-			let i = e.params.get(t);
+			let i = e.params.get(n);
 			if (i) return i;
-			n = e.parentScope;
+			r = e.parentScope;
 		}
 	}
 };
 //#endregion
 //#region ../core/src/paramRuntime/expressionCompiler.js
 function je(e, t = {}, n = {}) {
-	return f(e, t, n);
+	return p(e, t, n);
 }
 //#endregion
 //#region ../core/src/paramRuntime/expressionRef.js
@@ -940,28 +941,28 @@ var Be = class {
 	}
 	#g(e) {
 		if (!("select" in e)) return;
-		let t = a(e.select), n = t.type === "interval" ? "interval" : t.toggle ? "multi" : "single", r = t.type === "interval" ? Array.from(new Set(t.encodings)).sort() : [], i = e.push === "outer" ? this.findRuntimeForParam(e.name) : this, o = {
+		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,
 			source: this.#s
-		}, s = i.#c.get(e.name) ?? /* @__PURE__ */ new Set(), c = s.values().next().value;
+		}, 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}".`);
-		s.add(o), i.#c.set(e.name, s), this.#e.addScopeDisposer(this.#t, () => {
+		s.add(o), a.#c.set(e.name, s), this.#e.addScopeDisposer(this.#t, () => {
 			s.delete(o);
 		});
 	}
 	get #_() {
 		return { resolveScaleResolution: this.#f };
 	}
-	registerParam(e, t = {}) {
-		let n = e.name;
-		if (g(n), this.#i.has(n) || this.#a.has(n)) throw Error("Parameter \"" + n + "\" already registered in this scope.");
-		if (He(e), t.defer) {
+	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, n, () => {
+			return this.#e.registerInitializer(this.#t, r, () => {
 				this.#v(e);
-			}), this.#i.set(n, e), () => {
-				throw Error("Cannot set derived parameter \"" + n + "\".");
+			}), this.#i.set(r, e), () => {
+				throw Error("Cannot set derived parameter \"" + r + "\".");
 			};
 		}
 		return this.#v(e);
@@ -988,17 +989,17 @@ var Be = class {
 		});
 	}
 	#v(e) {
-		let t = e.name, n, i;
+		let t = e.name, n, r;
 		if (e.push == "outer") {
-			let a = this.findRuntimeForParam(t);
-			if (!a) throw Error(`Parameter "${t}" not found in outer scope!`);
-			let o = a.paramConfigs.get(t);
-			if (!o) throw Error(`Outer parameter "${t}" exists as a value but has no registered config.`);
-			if ("expr" in o || "select" in o || "ruler" in o) throw Error(`The outer parameter "${t}" must not have expr, select, or ruler properties!`);
+			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) => {
-				a.setValue(t, e);
-			}, this.#n.set(t, n), "ruler" in e && (i = r(e, this), n(i));
-		} else if ("value" in e) i = r(e, this), n = "transition" in e ? this.#b(t, i, e.transition) : this.#y(t, i);
+				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);
@@ -1009,43 +1010,43 @@ var Be = class {
 			n = () => {
 				throw Error("Cannot set derived parameter \"" + t + "\".");
 			};
-		} else i = r(e, this), n = this.#y(t, i);
+		} else r = h(e, this), n = this.#y(t, r);
 		if ("select" in e) {
-			if (i ??= r(e, this), !this.#n.has(t)) {
-				let e = this.#e.registerSelection(this.#t, t, i);
+			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();
 				}), n = this.#n.get(t);
 			}
-			n(i);
+			n(r);
 		}
 		return this.#i.set(t, e), this.#g(e), n;
 	}
-	allocateSetter(e, t, n = !1) {
-		if (g(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) {
-		g(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.has(e) && this.hasLocalParam(e) && this.#e.resolve(this.#t, e), this.#r.get(e)?.get();
 	}
 	getParamRef(e) {
-		g(e);
-		let t = this.findRuntimeForParam(e);
-		if (t) return t.#r.has(e) || t.#e.resolve(t.#t, e), t.#r.get(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);
 	}
 	getTargetValue(e) {
-		return g(e), this.#l.get(e)?.target ?? this.#u.get(e)?.target ?? this.getValue(e);
+		return t(e), this.#l.get(e)?.target ?? this.#u.get(e)?.target ?? this.getValue(e);
 	}
 	subscribe(e, t) {
 		let n = this.getParamRef(e);
@@ -1062,16 +1063,16 @@ var Be = class {
 		return this.#i;
 	}
 	hasLocalParam(e) {
-		g(e);
-		let t = this.#i.get(e);
-		return this.#r.has(e) || this.#a.has(e) || t !== void 0 && "expr" in t;
+		t(e);
+		let n = this.#i.get(e);
+		return this.#r.has(e) || this.#a.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 g(e), this.#i.has(e) ? !0 : this.#d()?.hasConfiguredParamInScopeChain(e) ?? !1;
+		return t(e), this.#i.has(e) ? !0 : this.#d()?.hasConfiguredParamInScopeChain(e) ?? !1;
 	}
 	findRuntimeForParam(e) {
 		return this.hasLocalParam(e) ? this : this.#d()?.findRuntimeForParam(e);
@@ -1218,7 +1219,7 @@ var Be = class {
 		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 (t(e)) {
+		for (let e of this.#i.values()) if (ne(e)) {
 			let t = e.select;
 			if (te(t)) {
 				if (t == "point") return !0;
@@ -1265,7 +1266,7 @@ function Ge(e) {
 //#endregion
 //#region ../core/src/config/mergeConfig.js
 function L(e) {
-	return s(e) && !Array.isArray(e);
+	return d(e) && !Array.isArray(e);
 }
 function Ke(e) {
 	let t = {};
@@ -1405,7 +1406,7 @@ var Ze = class {
 	#f = [];
 	#p = "none";
 	#m = /* @__PURE__ */ new Map();
-	facetCoords = new ee([], JSON.stringify);
+	facetCoords = new e([], 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 Qe(this), r && e.theme !== void 0) throw Error("\"theme\" is only supported at the root specification. Use \"config\" and \"style\" for subtree customization.");
@@ -1414,14 +1415,14 @@ var Ze = class {
 			scale: {},
 			axis: {},
 			legend: {}
-		}, re(this), this.options = {
+		}, ie(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, { settleTemporalUpdatesImmediately: !0 }), this.paramRuntime.setSelectionSource(this), "mark" in e && this.paramRuntime.registerLazyExpression("zoomLevel", "zoomLevel()", () => ae("The automatic zoomLevel parameter is deprecated. Use zoomLevel() or an explicit channel such as zoomLevel(\"x\") instead."));
+		}, this.paramRuntime = new Be(() => this.dataParent?.paramRuntime, (e) => this.getScaleResolution(e), t.animator, { settleTemporalUpdatesImmediately: !0 }), 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) {
 			if ("expr" in e) {
@@ -1458,11 +1459,11 @@ var Ze = class {
 	}
 	getCursor() {
 		let e = this.getCursorSpec();
-		return i(e) ? this.paramRuntime.evaluateAndGet(e.expr) : e;
+		return n(e) ? this.paramRuntime.evaluateAndGet(e.expr) : e;
 	}
 	watchCursor(e, t) {
-		let n = this.getCursorSpec();
-		i(n) && this.paramRuntime.watchExpression(n.expr, e, {
+		let r = this.getCursorSpec();
+		n(r) && this.paramRuntime.watchExpression(r.expr, e, {
 			scopeOwned: !1,
 			registerDisposer: t
 		});
@@ -1474,53 +1475,55 @@ var Ze = class {
 		return this.facetCoords.values().next().value;
 	}
 	getPadding() {
-		return this._cache("size/padding", () => j.createFromConfig(this.spec.padding));
+		return this._cache("size/padding", () => k.createFromConfig(this.spec.padding));
 	}
 	getOverhang() {
-		return j.zero();
+		return k.zero();
 	}
 	isScrollable() {
 		return this.spec.viewportWidth != null || this.spec.viewportHeight != null;
 	}
 	getSize() {
-		return this._cache("size/size", () => this.isConfiguredVisible() ? new x(this.#g("width"), this.#g("height")) : de);
+		return this._cache("size/size", () => this.isConfiguredVisible() ? new y(this.#g("width"), this.#g("height")) : x);
 	}
 	getViewportSize() {
 		if (!this.isScrollable()) return this.getSize();
-		if (!this.isConfiguredVisible()) return de;
+		if (!this.isConfiguredVisible()) return x;
 		let e = this.getSize();
-		return new x(this.#g("viewportWidth") ?? e.width, this.#g("viewportHeight") ?? e.height);
+		return new y(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 v(`Cannot use step-based size with "${e}"!`, this);
+			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 n;
-				if (b(i.type)) n = i.domain().length;
+				if (v(i.type)) n = i.domain().length;
 				else if (["locus", "index"].includes(i.type)) {
 					let e = i.domain();
-					n = m(e) - e[0];
-				} else throw new v(`Cannot use step-based size with "${i.type}" scale!`, this);
+					n = ee(e) - e[0];
+				} else throw new _(`Cannot use step-based size with "${i.type}" scale!`, this);
 				let a = i;
-				n = y(n, a.paddingInner(), a.paddingOuter());
-				let o = e == "width" ? "xOffset" : "yOffset", s = this.getScaleResolution(o)?.getScale(), c = r.for ?? (s && b(s.type) ? "offset" : "position"), l = t;
+				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 || !b(s.type)) throw new v(`Cannot use ${e}.step.for = "offset" without a discrete ${o} scale!`, this);
-					let t = s, n = y(s.domain().length, t.paddingInner(), t.paddingOuter());
+					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());
 				}
 				return {
 					px: n * l,
 					grow: 0
 				};
-			} else if (n) return {
+			}
+			if (n) return {
 				px: t,
 				grow: 0
 			};
-			else throw new v(`Cannot use step-based size with "${e}"!`, this);
-		} else return (r && me(r)) ?? (a ? void 0 : {
+			throw new _(`Cannot use step-based size with "${e}"!`, this);
+		}
+		return (r && he(r)) ?? (a ? void 0 : {
 			px: 0,
 			grow: 1
 		});
@@ -1540,13 +1543,13 @@ var Ze = class {
 		let t = this.getConfig().view;
 		if (!t) return;
 		let n = e == "width" ? "x" : "y", r = this.getScaleResolution(n)?.getResolvedScaleType();
-		return r && !b(r) ? e == "width" ? t.continuousWidth : t.continuousHeight : (e == "width" ? t.discreteWidth : t.discreteHeight) ?? (t.step === void 0 ? void 0 : { step: t.step });
+		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 });
 	}
 	resolveSizeValue(e, t) {
-		if (!i(t)) return t;
-		let n = this.#C(e)();
-		if (it(n) || n === "container") return n;
-		throw new v(`"${e}" ExprRef must resolve to a finite number or "container"!`, this);
+		if (!n(t)) return t;
+		let r = this.#C(e)();
+		if (it(r) || r === "container") return r;
+		throw new _(`"${e}" ExprRef must resolve to a finite number or "container"!`, this);
 	}
 	registerSizeInvalidation() {
 		this.#y("width", "x"), this.#y("height", "y"), this.#b("width"), this.#b("height"), this.#b("viewportWidth"), this.#b("viewportHeight");
@@ -1557,27 +1560,27 @@ var Ze = class {
 		let i = this.getScaleResolution(t);
 		if (!i) {
 			if (r) return;
-			throw new v("Cannot use 'step' size without a scale!", this);
+			throw new _("Cannot use 'step' size without a scale!", this);
 		}
 		let a = () => {
 			let t = this.getSize()[e];
 			this.invalidateSizeCache();
 			let n = this.getSize()[e];
-			fe(t, n) || this.context.requestLayoutReflow();
+			pe(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 && b(n.getResolvedScaleType()) && (n.addEventListener("domain", a), this.registerDisposer(() => n.removeEventListener("domain", a)));
+			n && v(n.getResolvedScaleType()) && (n.addEventListener("domain", a), this.registerDisposer(() => n.removeEventListener("domain", a)));
 		}
 	}
 	#b(e) {
 		let { value: t } = this.#_(e);
-		i(t) ? this.#S(e, t.expr) : J(t) && i(t.step) && this.#S(e + ".step", t.step.expr);
+		n(t) ? this.#S(e, t.expr) : J(t) && n(t.step) && this.#S(e + ".step", t.step.expr);
 	}
 	#x(e, t) {
-		let n = i(t.step) ? this.#C(e + ".step")() : t.step;
-		if (it(n)) return n;
-		throw new v(`"${e}.step" ExprRef must resolve to a finite number!`, this);
+		let r = n(t.step) ? this.#C(e + ".step")() : t.step;
+		if (it(r)) return r;
+		throw new _(`"${e}.step" ExprRef must resolve to a finite number!`, this);
 	}
 	#S(e, t) {
 		if (!this.#m.has(e)) {
@@ -1589,7 +1592,7 @@ var Ze = class {
 	}
 	#C(e) {
 		let t = this.#m.get(e);
-		if (!t) throw new v(`"${e}" ExprRef was not registered before layout!`, this);
+		if (!t) throw new _(`"${e}" ExprRef was not registered before layout!`, this);
 		return t;
 	}
 	isConfiguredVisible() {
@@ -1720,8 +1723,8 @@ var Ze = class {
 		return this.#s;
 	}
 	arrange(e, t, n = {}) {
-		if (n.firstFacet && this.facetCoords.clear(), this.facetCoords.set(n.facetId, p(t, d(n))), this.#a || this.#o) {
-			let e = this.getOverhang(), n = this.layoutParent ? j.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 ? k.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,47 +1778,44 @@ var Ze = class {
 		return "independent";
 	}
 	getBaseUrl() {
-		return N(() => this.dataParent?.getBaseUrl(), Ge(this.spec.baseUrl));
+		return j(() => this.dataParent?.getBaseUrl(), Ge(this.spec.baseUrl));
 	}
 	isPickingSupported() {
 		return !0;
 	}
 	getTitleText() {
 		let e = this.spec.title;
-		if (e) return te(e) ? e : i(e.text) ? this.paramRuntime.evaluateAndGet(e.text.expr) : e.text;
+		if (e) return te(e) ? e : n(e.text) ? this.paramRuntime.evaluateAndGet(e.text.expr) : e.text;
 	}
 	_cache(e, t) {
-		return ne(this, e, t);
+		return re(this, e, t);
 	}
 	_invalidateCacheByPrefix(e, t = "self") {
 		switch (t) {
 			case "self":
-				_(this, e);
+				g(this, e);
 				break;
 			case "ancestors":
-				for (let t of this.getLayoutAncestors()) _(t, e);
+				for (let t of this.getLayoutAncestors()) g(t, e);
 				break;
-			case "progeny":
-				this.visit((t) => _(t, e));
-				break;
-			default:
+			case "progeny": this.visit((t) => g(t, e));
 		}
 	}
 	invalidateSizeCache() {
-		_(this, "size"), this._invalidateCacheByPrefix("size", "ancestors");
+		g(this, "size"), this._invalidateCacheByPrefix("size", "ancestors");
 	}
 	propagateInteraction(e) {}
 };
 function et(e) {
 	return "unitsPerPixel" in e;
 }
-function tt(t) {
-	let n = "opacity" in t.spec ? t.spec.opacity : void 0;
-	if (n !== void 0) {
-		if (h(n)) return (e) => e * n;
-		if (et(n)) {
-			let r = (e) => {
-				let n = t.getScaleResolution(e), r = n?.getScale();
+function tt(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) => {
+				let n = e.getScaleResolution(t), r = n?.getScale();
 				if ([
 					"linear",
 					"index",
@@ -1824,48 +1824,50 @@ function tt(t) {
 					scale: r,
 					scaleResolution: n
 				};
-			}, a = rt(n.values, "opacity.values", t);
-			if (!l(n.unitsPerPixel)) throw new v("\"opacity.unitsPerPixel\" must be an array.", t);
+			}, 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 e = nt(rt(s.map((e) => e()), "opacity.unitsPerPixel", t), a, t), n = ie().domain(e.unitsPerPixel).range(e.values).clamp(!0);
+				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);
 			};
-			s = n.unitsPerPixel.map((e) => {
-				if (i(e)) {
-					let n = t.paramRuntime.watchExpression(e.expr, () => {
-						c(), t.context.animator.requestRender();
+			s = t.unitsPerPixel.map((t) => {
+				if (n(t)) {
+					let n = e.paramRuntime.watchExpression(t.expr, () => {
+						c(), e.context.animator.requestRender();
 					});
 					return () => n(null);
-				} else return () => e;
+				}
+				return () => t;
 			}), c();
-			let u = (t) => {
-				let n = t.scaleResolution.getAxisLength() || 1e3;
-				return e(t.scale.domain()) / n;
+			let u = (e) => {
+				let t = e.scaleResolution.getAxisLength() || 1e3;
+				return l(e.scale.domain()) / t;
 			}, d;
-			if (n.channel === "auto") {
-				let e = r("x"), n = r("y");
-				if (e && n) d = () => (u(e) + u(n)) / 2;
-				else if (e) d = () => u(e);
+			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);
-				else throw new v("Cannot find a resolved quantitative x or y scale for dynamic opacity!", t);
+				else throw new _("Cannot find a resolved quantitative x or y scale for dynamic opacity!", e);
 			} else {
-				let e = n.channel ? r(n.channel) : r("x") ?? r("y");
-				if (!e) throw new v("Cannot find a resolved quantitative scale for dynamic opacity!", t);
-				d = () => u(e);
+				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);
 			}
 			return (e) => o(d()) * e;
-		} else if (i(n)) {
-			let e = t.paramRuntime.watchExpression(n.expr, () => t.context.animator.requestRender());
-			return (t) => e(null) * t;
+		}
+		if (n(t)) {
+			let n = e.paramRuntime.watchExpression(t.expr, () => e.context.animator.requestRender());
+			return (e) => n(null) * e;
 		}
 	}
 	return q;
 }
 function nt(e, t, n) {
-	if (!e.length) throw new v("\"opacity.unitsPerPixel\" must contain at least one stop.", n);
-	if (e.length !== t.length) throw new v("\"opacity.unitsPerPixel\" and \"opacity.values\" must have the same length.", 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) => {
-		if (e <= 0) throw new v("Invalid opacity.unitsPerPixel value at index " + t + ". Stop values must be positive.", n);
+		if (e <= 0) throw new _("Invalid opacity.unitsPerPixel value at index " + t + ". Stop values must be positive.", n);
 	});
 	let r = e.map((e, n) => ({
 		stop: e,
@@ -1873,16 +1875,16 @@ function nt(e, t, n) {
 	}));
 	r.sort((e, t) => t.stop - e.stop);
 	let i = r.map((e) => e.stop), a = r.map((e) => e.value);
-	for (let t = 1; t < e.length; t++) if (i[t - 1] <= i[t]) throw new v("\"opacity.unitsPerPixel\" must be strictly decreasing.", n);
+	for (let t = 1; t < e.length; t++) if (i[t - 1] <= i[t]) throw new _("\"opacity.unitsPerPixel\" must be strictly decreasing.", n);
 	return {
 		unitsPerPixel: i,
 		values: a
 	};
 }
 function rt(e, t, n) {
-	if (!l(e)) throw new v("\"" + t + "\" must evaluate to an array.", n);
+	if (!a(e)) throw new _("\"" + t + "\" must evaluate to an array.", n);
 	return e.map((e, r) => {
-		if (!h(e) || !Number.isFinite(e)) throw new v("Invalid " + t + " value at index " + r + ". Expected a finite number.", n);
+		if (!s(e) || !Number.isFinite(e)) throw new _("Invalid " + t + " value at index " + r + ". Expected a finite number.", n);
 		return e;
 	});
 }
@@ -2008,7 +2010,7 @@ function Ct(e) {
 	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 : t(e) ? !0 : n(e) ? !!e.bind : !1;
+	return e.persist === !1 ? !1 : ne(e) ? !0 : r(e) ? !!e.bind : !1;
 }
 function wt(e) {
 	let t = /* @__PURE__ */ new Set([e]);
@@ -2049,7 +2051,7 @@ function Ot(e, t, n) {
 	let a = /* @__PURE__ */ new Map();
 	for (let e of i) {
 		let t = Y.get(e), n = t ? t.name : void 0;
-		typeof n != "string" || !n.length || a.set(n, (a.get(n) ?? 0) + 1);
+		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) + ".",
@@ -2061,7 +2063,7 @@ function kt(e, t) {
 	return $(e, t, (e) => {
 		if (Z(e).length !== t.length + 1) return;
 		let r = Y.get(e);
-		!r || typeof r.name != "string" || n.push(e);
+		r && typeof r.name == "string" && n.push(e);
 	}, { includeNamedImportRoots: !0 }), n;
 }
 function At(e) {
@@ -2081,7 +2083,7 @@ function jt(e, t) {
 		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 (n && n.name === i && Z(e).length === r.length + 1) {
 				if (t) return a = !0, K;
 				t = e;
 			}
@@ -2112,4 +2114,4 @@ function Pt(e, t) {
 	return !0;
 }
 //#endregion
-export { P as A, oe as B, We as C, Fe as D, Re as E, S as F, ue as H, le as I, se as L, j as M, ve as N, F as O, x as P, D as R, B as S, Le as T, ce as U, me 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, be as j, N 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 { 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 };